From 6470266cca7b9ad2a9a7eb886b242e1374aa9234 Mon Sep 17 00:00:00 2001 From: Tanguy Leroux Date: Wed, 25 Apr 2018 13:21:00 +0200 Subject: [PATCH 1/2] [Test] Fix packaging tests The packaging tests for Debian based distro is loooking for docs in /usr/share/elasticsearch, but it should be /usr/share/elasticsearch-oss for the oss package. --- .../src/test/resources/packaging/tests/30_deb_package.bats | 4 ++-- qa/vagrant/src/test/resources/packaging/utils/packages.bash | 5 +++-- qa/vagrant/src/test/resources/packaging/utils/utils.bash | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/qa/vagrant/src/test/resources/packaging/tests/30_deb_package.bats b/qa/vagrant/src/test/resources/packaging/tests/30_deb_package.bats index e4a56ccb14151..59aaa3e8a072f 100644 --- a/qa/vagrant/src/test/resources/packaging/tests/30_deb_package.bats +++ b/qa/vagrant/src/test/resources/packaging/tests/30_deb_package.bats @@ -191,8 +191,8 @@ setup() { assert_file_not_exist "/usr/share/elasticsearch" - assert_file_not_exist "/usr/share/doc/elasticsearch" - assert_file_not_exist "/usr/share/doc/elasticsearch/copyright" + assert_file_not_exist "/usr/share/doc/elasticsearch-oss" + assert_file_not_exist "/usr/share/doc/elasticsearch-oss/copyright" } @test "[DEB] package has been completly removed" { diff --git a/qa/vagrant/src/test/resources/packaging/utils/packages.bash b/qa/vagrant/src/test/resources/packaging/utils/packages.bash index cd8b25fad7940..843de807faa6e 100644 --- a/qa/vagrant/src/test/resources/packaging/utils/packages.bash +++ b/qa/vagrant/src/test/resources/packaging/utils/packages.bash @@ -117,8 +117,9 @@ verify_package_installation() { assert_file "/etc/default/elasticsearch" f root elasticsearch 660 # Doc files - assert_file "/usr/share/doc/elasticsearch" d root root 755 - assert_file "/usr/share/doc/elasticsearch/copyright" f root root 644 + local docs=$(readlink -f /usr/share/doc/elasticsearch*) + assert_file $docs d root root 755 + assert_file "$docs/copyright" f root root 644 fi if is_rpm; then diff --git a/qa/vagrant/src/test/resources/packaging/utils/utils.bash b/qa/vagrant/src/test/resources/packaging/utils/utils.bash index 413cecb4e62a2..4e3fdf5bd5560 100644 --- a/qa/vagrant/src/test/resources/packaging/utils/utils.bash +++ b/qa/vagrant/src/test/resources/packaging/utils/utils.bash @@ -254,6 +254,7 @@ clean_before_test() { "/etc/sysconfig/elasticsearch" \ "/var/run/elasticsearch" \ "/usr/share/doc/elasticsearch" \ + "/usr/share/doc/elasticsearch-oss" \ "/tmp/elasticsearch" \ "/usr/lib/systemd/system/elasticsearch.conf" \ "/usr/lib/tmpfiles.d/elasticsearch.conf" \ From 26a147816b30e6cb271c42fdf3a19cca379d8dc0 Mon Sep 17 00:00:00 2001 From: Tanguy Leroux Date: Wed, 25 Apr 2018 15:18:44 +0200 Subject: [PATCH 2/2] Apply feedback --- .../src/test/resources/packaging/utils/packages.bash | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qa/vagrant/src/test/resources/packaging/utils/packages.bash b/qa/vagrant/src/test/resources/packaging/utils/packages.bash index 843de807faa6e..a214cd6940f63 100644 --- a/qa/vagrant/src/test/resources/packaging/utils/packages.bash +++ b/qa/vagrant/src/test/resources/packaging/utils/packages.bash @@ -116,10 +116,10 @@ verify_package_installation() { # Env file assert_file "/etc/default/elasticsearch" f root elasticsearch 660 - # Doc files - local docs=$(readlink -f /usr/share/doc/elasticsearch*) - assert_file $docs d root root 755 - assert_file "$docs/copyright" f root root 644 + # Machine-readable debian/copyright file + local copyrightDir=$(readlink -f /usr/share/doc/$PACKAGE_NAME) + assert_file $copyrightDir d root root 755 + assert_file "$copyrightDir/copyright" f root root 644 fi if is_rpm; then