[solr] branch branch_9x updated: Make small improvements to integration tests (#1647)

[ho...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

houston pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/branch_9x by this push:
     new 846f9b6746a Make small improvements to integration tests (#1647)
846f9b6746a is described below

commit 846f9b6746a2cf7ac2e6de556676650d0326bb2a
Author: Houston Putman <ho...@apache.org>
AuthorDate: Wed May 17 09:32:06 2023 -0400

    Make small improvements to integration tests (#1647)
---
 solr/packaging/build.gradle                    | 2 +-
 solr/packaging/test/test_bats.bats             | 1 +
 solr/packaging/test/test_create.bats           | 1 -
 solr/packaging/test/test_example_noprompt.bats | 2 +-
 solr/packaging/test/test_placement_plugin.bats | 2 +-
 solr/packaging/test/test_start_solr.bats       | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/solr/packaging/build.gradle b/solr/packaging/build.gradle
index f06d9e48d70..310aa45049c 100644
--- a/solr/packaging/build.gradle
+++ b/solr/packaging/build.gradle
@@ -280,7 +280,7 @@ class BatsTask extends Exec {
 
     // Note: tests to run must be listed after all other arguments
     // Additional debugging output: -x, --verbose-run
-    setArgs(['--print-output-on-failure'] + (testFiles.empty ? testDir : testFiles))
+    setArgs(['-T', '--print-output-on-failure'] + (testFiles.empty ? testDir : testFiles))
 
     super.exec()
   }
diff --git a/solr/packaging/test/test_bats.bats b/solr/packaging/test/test_bats.bats
index 341758e5ff8..9d269a62d3f 100644
--- a/solr/packaging/test/test_bats.bats
+++ b/solr/packaging/test/test_bats.bats
@@ -30,6 +30,7 @@ setup_file() {
 teardown_file() {
   # set up paths, not preserved from setup
   common_setup
+  sleep 3
 
   # Conversely, on shutdown, we do need this to execute strictly
   # because using "run" will eat filing test exit codes
diff --git a/solr/packaging/test/test_create.bats b/solr/packaging/test/test_create.bats
index 96a57418e91..142c11c3d4b 100644
--- a/solr/packaging/test/test_create.bats
+++ b/solr/packaging/test/test_create.bats
@@ -25,7 +25,6 @@ teardown() {
   # save a snapshot of SOLR_HOME for failed tests
   save_home_on_failure
 
-  delete_all_collections
   solr stop -all >/dev/null 2>&1
 }
 
diff --git a/solr/packaging/test/test_example_noprompt.bats b/solr/packaging/test/test_example_noprompt.bats
index 39004a95182..959cdd9d5bc 100644
--- a/solr/packaging/test/test_example_noprompt.bats
+++ b/solr/packaging/test/test_example_noprompt.bats
@@ -28,7 +28,7 @@ teardown() {
   solr stop -all >/dev/null 2>&1
 }
 
-@test "SOLR16755 test works with noprompt" {
+@test "SOLR-16755 test works with noprompt" {
   solr start -e cloud -noprompt
   solr assert --started http://localhost:8983/solr --timeout 10000
 }
diff --git a/solr/packaging/test/test_placement_plugin.bats b/solr/packaging/test/test_placement_plugin.bats
index 4db7a28fae7..656c38e032d 100644
--- a/solr/packaging/test/test_placement_plugin.bats
+++ b/solr/packaging/test/test_placement_plugin.bats
@@ -37,7 +37,7 @@ teardown() {
   assert_file_contains "${SOLR_LOGS_DIR}/solr.log" 'Default replica placement plugin set in solr\.placementplugin\.default to affinity'
 }
 
-@test "Affinity placement plugin using ENV" {
+@test "Random placement plugin using ENV" {
   export SOLR_PLACEMENTPLUGIN_DEFAULT=random
   run solr start -c
   solr assert -c http://localhost:8983/solr -t 3000
diff --git a/solr/packaging/test/test_start_solr.bats b/solr/packaging/test/test_start_solr.bats
index 522324aabab..e0d7e5d981e 100644
--- a/solr/packaging/test/test_start_solr.bats
+++ b/solr/packaging/test/test_start_solr.bats
@@ -28,7 +28,7 @@ teardown() {
   solr stop -all >/dev/null 2>&1
 }
 
-@test "SOLR11740 check f" {
+@test "SOLR-11740 check 'solr stop' connection" {
   solr start
   solr start -p 7574
   solr assert --started http://localhost:8983/solr --timeout 5000