Skip to content

Commit df42358

Browse files
authored
[Test] Fix docs check for DEB package in packaging tests (elastic#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.
1 parent 5a9a1cd commit df42358

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

qa/vagrant/src/test/resources/packaging/tests/30_deb_package.bats

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ setup() {
191191

192192
assert_file_not_exist "/usr/share/elasticsearch"
193193

194-
assert_file_not_exist "/usr/share/doc/elasticsearch"
195-
assert_file_not_exist "/usr/share/doc/elasticsearch/copyright"
194+
assert_file_not_exist "/usr/share/doc/elasticsearch-oss"
195+
assert_file_not_exist "/usr/share/doc/elasticsearch-oss/copyright"
196196
}
197197

198198
@test "[DEB] package has been completly removed" {

qa/vagrant/src/test/resources/packaging/utils/packages.bash

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,10 @@ verify_package_installation() {
116116
# Env file
117117
assert_file "/etc/default/elasticsearch" f root elasticsearch 660
118118

119-
# Doc files
120-
assert_file "/usr/share/doc/elasticsearch" d root root 755
121-
assert_file "/usr/share/doc/elasticsearch/copyright" f root root 644
119+
# Machine-readable debian/copyright file
120+
local copyrightDir=$(readlink -f /usr/share/doc/$PACKAGE_NAME)
121+
assert_file $copyrightDir d root root 755
122+
assert_file "$copyrightDir/copyright" f root root 644
122123
fi
123124

124125
if is_rpm; then

qa/vagrant/src/test/resources/packaging/utils/utils.bash

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ clean_before_test() {
254254
"/etc/sysconfig/elasticsearch" \
255255
"/var/run/elasticsearch" \
256256
"/usr/share/doc/elasticsearch" \
257+
"/usr/share/doc/elasticsearch-oss" \
257258
"/tmp/elasticsearch" \
258259
"/usr/lib/systemd/system/elasticsearch.conf" \
259260
"/usr/lib/tmpfiles.d/elasticsearch.conf" \

0 commit comments

Comments
 (0)