From 454cf6e2fd229237832eaa6967637ec0eff89ad1 Mon Sep 17 00:00:00 2001
From: Tanguy Leroux <tlrx.dev@gmail.com>
Date: Wed, 25 Apr 2018 18:52:37 +0200
Subject: [PATCH] [Test] Fix docs check for DEB package in packaging tests
 (#30126)

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 ++--
 .../src/test/resources/packaging/utils/packages.bash       | 7 ++++---
 qa/vagrant/src/test/resources/packaging/utils/utils.bash   | 1 +
 3 files changed, 7 insertions(+), 5 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..a214cd6940f63 100644
--- a/qa/vagrant/src/test/resources/packaging/utils/packages.bash
+++ b/qa/vagrant/src/test/resources/packaging/utils/packages.bash
@@ -116,9 +116,10 @@ verify_package_installation() {
         # Env file
         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
+        # 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
diff --git a/qa/vagrant/src/test/resources/packaging/utils/utils.bash b/qa/vagrant/src/test/resources/packaging/utils/utils.bash
index 98cad111de54b..8421fe571a5b9 100644
--- a/qa/vagrant/src/test/resources/packaging/utils/utils.bash
+++ b/qa/vagrant/src/test/resources/packaging/utils/utils.bash
@@ -249,6 +249,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" \