Account for rpm behavior difference on directories

This commit modifies the packaging tests to account for the fact that
rpm behaves differently with respect to preserving directories marked as
"CONFIG | NOREPLACE" on older versions versus newer versions. Older
versions will leave the directory as-is while newer versions will append
the suffix ".rpmsave" to the directory name.

Relates #18216
This commit is contained in:
Jason Tedor 2016-05-09 12:25:52 -04:00
parent 8c52e8814b
commit 3f3fa59406
1 changed files with 4 additions and 2 deletions

View File

@ -161,8 +161,10 @@ setup() {
assert_file_exist "/etc/elasticsearch/jvm.options.rpmsave"
assert_file_not_exist "/etc/elasticsearch/logging.yml"
assert_file_exist "/etc/elasticsearch/logging.yml.rpmsave"
assert_file_exist "/etc/elasticsearch/scripts.rpmsave"
assert_file_exist "/etc/elasticsearch/scripts.rpmsave/script"
# older versions of rpm behave differently and preserve the
# directory but do not append the ".rpmsave" suffix
test -e "/etc/elasticsearch/scripts" || test -e "/etc/elasticsearch/scripts.rpmsave"
test -e "/etc/elasticsearch/scripts/script" || test -e "/etc/elasticsearch/scripts.rpmsave/script"
assert_file_not_exist "/etc/init.d/elasticsearch"
assert_file_not_exist "/usr/lib/systemd/system/elasticsearch.service"