summaryrefslogtreecommitdiff
path: root/qa/vagrant
diff options
context:
space:
mode:
authorJason Tedor <jason@tedor.me>2016-11-02 13:07:26 -0400
committerGitHub <noreply@github.com>2016-11-02 13:07:26 -0400
commit83338686b9befea9785aeae296a5281052531826 (patch)
tree2f3ca28b2281b04556485e751ecd276cfe8bf80c /qa/vagrant
parent24d5f31a545599cf6a46cec7d86668c531313e50 (diff)
Remove stale install plugins assertion
When installing a plugin when the plugins directory does not exist, the install plugin command outputs a line saying that it is creating this directory. The packaging tests for the archive distributions accounted for this including an assertion that this line was output. The packages have since been updated to include an empty plugins folder, so this line will no longer be output. This commit removes this stale assertion from the packaging tests. Relates #21275
Diffstat (limited to 'qa/vagrant')
-rw-r--r--qa/vagrant/src/test/resources/packaging/scripts/module_and_plugin_test_cases.bash37
1 files changed, 10 insertions, 27 deletions
diff --git a/qa/vagrant/src/test/resources/packaging/scripts/module_and_plugin_test_cases.bash b/qa/vagrant/src/test/resources/packaging/scripts/module_and_plugin_test_cases.bash
index fbc0f4a887..b979f40e30 100644
--- a/qa/vagrant/src/test/resources/packaging/scripts/module_and_plugin_test_cases.bash
+++ b/qa/vagrant/src/test/resources/packaging/scripts/module_and_plugin_test_cases.bash
@@ -436,38 +436,21 @@ fi
sudo -E -u $ESPLUGIN_COMMAND_USER "$ESHOME/bin/elasticsearch-plugin" install "file://$relativePath" > /tmp/plugin-cli-output
# exclude progress line
local loglines=$(cat /tmp/plugin-cli-output | grep -v "^[[:cntrl:]]" | wc -l)
- if [ "$GROUP" == "TAR PLUGINS" ]; then
- # tar extraction does not create the plugins directory so the plugin tool will print an additional line that the directory will be created
- [ "$loglines" -eq "3" ] || {
- echo "Expected 3 lines excluding progress bar but the output had $loglines lines and was:"
- cat /tmp/plugin-cli-output
- false
- }
- else
- [ "$loglines" -eq "2" ] || {
- echo "Expected 2 lines excluding progress bar but the output had $loglines lines and was:"
- cat /tmp/plugin-cli-output
- false
- }
- fi
+ [ "$loglines" -eq "2" ] || {
+ echo "Expected 2 lines excluding progress bar but the output had $loglines lines and was:"
+ cat /tmp/plugin-cli-output
+ false
+ }
remove_jvm_example
local relativePath=${1:-$(readlink -m jvm-example-*.zip)}
sudo -E -u $ESPLUGIN_COMMAND_USER ES_JAVA_OPTS="-Des.logger.level=DEBUG" "$ESHOME/bin/elasticsearch-plugin" install "file://$relativePath" > /tmp/plugin-cli-output
local loglines=$(cat /tmp/plugin-cli-output | grep -v "^[[:cntrl:]]" | wc -l)
- if [ "$GROUP" == "TAR PLUGINS" ]; then
- [ "$loglines" -gt "3" ] || {
- echo "Expected more than 3 lines excluding progress bar but the output had $loglines lines and was:"
- cat /tmp/plugin-cli-output
- false
- }
- else
- [ "$loglines" -gt "2" ] || {
- echo "Expected more than 2 lines excluding progress bar but the output had $loglines lines and was:"
- cat /tmp/plugin-cli-output
- false
- }
- fi
+ [ "$loglines" -gt "2" ] || {
+ echo "Expected more than 2 lines excluding progress bar but the output had $loglines lines and was:"
+ cat /tmp/plugin-cli-output
+ false
+ }
remove_jvm_example
}