Merge pull request #13861 from brwe/vagrant-install-groovy

install groovy plugin before running script test
This commit is contained in:
Britta Weber 2015-10-06 14:18:36 +02:00
commit ed7c051586
5 changed files with 10 additions and 4 deletions

View File

@ -31,6 +31,7 @@
# Load test utilities
load packaging_test_utils
load tar
load plugins
setup() {
skip_not_tar_gz
@ -91,12 +92,9 @@ setup() {
# starting Elasticsearch so we don't have to wait for elasticsearch to scan for
# them.
install_elasticsearch_test_scripts
ESPLUGIN_COMMAND_USER=elasticsearch install_and_check_plugin lang groovy
start_elasticsearch_service
run_elasticsearch_tests
stop_elasticsearch_service
rm -rf "/tmp/elasticsearch"
}

View File

@ -32,6 +32,7 @@
# Load test utilities
load packaging_test_utils
load os_package
load plugins
# Cleans everything for the 1st execution
setup() {
@ -85,6 +86,7 @@ setup() {
# starting Elasticsearch so we don't have to wait for elasticsearch to scan for
# them.
install_elasticsearch_test_scripts
ESPLUGIN_COMMAND_USER=root install_and_check_plugin lang groovy
start_elasticsearch_service
run_elasticsearch_tests
}

View File

@ -31,6 +31,7 @@
# Load test utilities
load packaging_test_utils
load os_package
load plugins
# Cleans everything for the 1st execution
setup() {
@ -80,6 +81,7 @@ setup() {
# starting Elasticsearch so we don't have to wait for elasticsearch to scan for
# them.
install_elasticsearch_test_scripts
ESPLUGIN_COMMAND_USER=root install_and_check_plugin lang groovy
start_elasticsearch_service
run_elasticsearch_tests
}

View File

@ -31,6 +31,7 @@
# Load test utilities
load packaging_test_utils
load os_package
load plugins
# Cleans everything for the 1st execution
setup() {
@ -67,6 +68,7 @@ setup() {
# starting Elasticsearch so we don't have to wait for elasticsearch to scan for
# them.
install_elasticsearch_test_scripts
ESPLUGIN_COMMAND_USER=root install_and_check_plugin lang groovy
systemctl start elasticsearch.service
wait_for_elasticsearch_status
assert_file_exist "/var/run/elasticsearch/elasticsearch.pid"

View File

@ -31,6 +31,7 @@
# Load test utilities
load packaging_test_utils
load os_package
load plugins
# Cleans everything for the 1st execution
setup() {
@ -69,6 +70,7 @@ setup() {
# Install scripts used to test script filters and search templates before
# starting Elasticsearch so we don't have to wait for elasticsearch to scan for
# them.
ESPLUGIN_COMMAND_USER=root install_and_check_plugin lang groovy
install_elasticsearch_test_scripts
service elasticsearch start
wait_for_elasticsearch_status