Browse Source

Centralize existence check for modules and plugins

Jason Tedor 9 years ago
parent
commit
6bd19cff67

+ 0 - 1
qa/vagrant/src/test/resources/packaging/scripts/modules.bash

@@ -43,7 +43,6 @@ assert_module_file() {
     local file=$1
     shift
 
-    assert_file_exist "$(readlink -m $file)"
     assert_module_or_plugin_file $file
 }
 

+ 2 - 0
qa/vagrant/src/test/resources/packaging/scripts/packaging_test_utils.bash

@@ -197,6 +197,8 @@ assert_module_or_plugin_file() {
     local file=$1
     shift
 
+    assert_file_exist "$(readlink -m $file)"
+
     # config files should not be executable and otherwise use the user
     # file-creation mask
     expected_file_privileges=$((0777 & ~$(sudo -E -u $ESPLUGIN_COMMAND_USER sh -c umask) & ~0111))

+ 0 - 1
qa/vagrant/src/test/resources/packaging/scripts/plugins.bash

@@ -148,7 +148,6 @@ assert_plugin_file() {
     local file=$1
     shift
 
-    assert_file_exist "$(readlink -m $file)"
     assert_module_or_plugin_file $file
 }