You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ge...@apache.org on 2024/06/28 18:33:45 UTC
(solr) branch branch_9x updated: Revert "remove trailing /solr unless.. (#2519)"
This is an automated email from the ASF dual-hosted git repository.
gerlowskija 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 b326f971f95 Revert "remove trailing /solr unless.. (#2519)"
b326f971f95 is described below
commit b326f971f95c93216919cbfc2bf25c5d0853aa90
Author: Jason Gerlowski <ge...@apache.org>
AuthorDate: Fri Jun 28 13:48:04 2024 -0400
Revert "remove trailing /solr unless.. (#2519)"
This reverts commit 39fe5098c0a1965b2d076f1d67f0797b8a261b03.
It probably should not have been backported to branch_9x and broke
several BATS tests as a result.
---
solr/packaging/test/test_auth.bats | 2 +-
solr/packaging/test/test_create_collection.bats | 2 +-
solr/packaging/test/test_example_noprompt.bats | 4 ++--
solr/packaging/test/test_placement_plugin.bats | 4 ++--
solr/packaging/test/test_prometheus.bats | 2 +-
solr/packaging/test/test_ssl.bats | 20 ++++++++++----------
solr/packaging/test/test_start_solr.bats | 12 ++++++------
solr/packaging/test/test_status.bats | 2 +-
8 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/solr/packaging/test/test_auth.bats b/solr/packaging/test/test_auth.bats
index 11fd6a7c44c..0de3786c35e 100644
--- a/solr/packaging/test/test_auth.bats
+++ b/solr/packaging/test/test_auth.bats
@@ -38,7 +38,7 @@ setup() {
@test "auth enable/disable lifecycle" {
solr start -c
solr auth enable -type basicAuth -credentials name:password
- solr assert --started http://localhost:${SOLR_PORT} --timeout 5000
+ solr assert --started http://localhost:${SOLR_PORT}/solr --timeout 5000
run curl -u name:password --basic "http://localhost:${SOLR_PORT}/solr/admin/collections?action=CREATE&collection.configName=_default&name=test&numShards=2&replicationFactor=1&router.name=compositeId&wt=json"
assert_output --partial '"status":0'
diff --git a/solr/packaging/test/test_create_collection.bats b/solr/packaging/test/test_create_collection.bats
index 0f61639d95e..04ff281aa3f 100644
--- a/solr/packaging/test/test_create_collection.bats
+++ b/solr/packaging/test/test_create_collection.bats
@@ -89,4 +89,4 @@ teardown() {
run -0 solr create_collection -c COLL_NAME -rf 2
assert_output --partial "Created collection 'COLL_NAME'"
assert_output --partial "2 replica(s)"
-}
+}
\ No newline at end of file
diff --git a/solr/packaging/test/test_example_noprompt.bats b/solr/packaging/test/test_example_noprompt.bats
index a688579a1e7..e683cb4f0a6 100644
--- a/solr/packaging/test/test_example_noprompt.bats
+++ b/solr/packaging/test/test_example_noprompt.bats
@@ -30,6 +30,6 @@ teardown() {
@test "SOLR-16755 test works with noprompt" {
solr start -e cloud -noprompt
- solr assert --started http://localhost:${SOLR_PORT} --timeout 10000
- solr assert --started http://localhost:${SOLR2_PORT} --timeout 10000
+ solr assert --started http://localhost:${SOLR_PORT}/solr --timeout 10000
+ solr assert --started http://localhost:${SOLR2_PORT}/solr --timeout 10000
}
diff --git a/solr/packaging/test/test_placement_plugin.bats b/solr/packaging/test/test_placement_plugin.bats
index c7fce207ea1..965e5e73283 100644
--- a/solr/packaging/test/test_placement_plugin.bats
+++ b/solr/packaging/test/test_placement_plugin.bats
@@ -31,7 +31,7 @@ teardown() {
@test "Affinity placement plugin using sysprop" {
run solr start -c -Dsolr.placementplugin.default=affinity
- solr assert -c http://localhost:${SOLR_PORT} -t 3000
+ solr assert -c http://localhost:${SOLR_PORT}/solr -t 3000
run solr create_collection -c COLL_NAME
collection_exists COLL_NAME
assert_file_contains "${SOLR_LOGS_DIR}/solr.log" 'Default replica placement plugin set in solr\.placementplugin\.default to affinity'
@@ -40,7 +40,7 @@ teardown() {
@test "Random placement plugin using ENV" {
export SOLR_PLACEMENTPLUGIN_DEFAULT=random
run solr start -c
- solr assert -c http://localhost:${SOLR_PORT} -t 3000
+ solr assert -c http://localhost:${SOLR_PORT}/solr -t 3000
run solr create_collection -c COLL_NAME
collection_exists COLL_NAME
assert_file_contains "${SOLR_LOGS_DIR}/solr.log" 'Default replica placement plugin set in solr\.placementplugin\.default to random'
diff --git a/solr/packaging/test/test_prometheus.bats b/solr/packaging/test/test_prometheus.bats
index 72dbb3b4690..25353a7e0ab 100644
--- a/solr/packaging/test/test_prometheus.bats
+++ b/solr/packaging/test/test_prometheus.bats
@@ -32,7 +32,7 @@ teardown() {
@test "should start solr prometheus exporter that scrapes solr for metrics" {
solr start
- solr assert --started http://localhost:${SOLR_PORT} --timeout 5000
+ solr assert --started http://localhost:${SOLR_PORT}/solr --timeout 5000
run solr create -c COLL_NAME
assert_output --partial "Created new core 'COLL_NAME'"
diff --git a/solr/packaging/test/test_ssl.bats b/solr/packaging/test/test_ssl.bats
index b36b18e49ba..3eb4dd2c75c 100644
--- a/solr/packaging/test/test_ssl.bats
+++ b/solr/packaging/test/test_ssl.bats
@@ -52,7 +52,7 @@ teardown() {
export SOLR_HOST=localhost
solr start -c
- solr assert --started https://localhost:${SOLR_PORT} --timeout 5000
+ solr assert --started https://localhost:${SOLR_PORT}/solr --timeout 5000
run solr create -c test -s 2
assert_output --partial "Created collection 'test'"
@@ -90,7 +90,7 @@ teardown() {
export SOLR_HOST=127.0.0.1
solr start -c
- solr assert --started https://localhost:${SOLR_PORT} --timeout 5000
+ solr assert --started https://localhost:${SOLR_PORT}/solr --timeout 5000
run solr create -c test -s 2
assert_output --partial "Created collection 'test'"
@@ -152,7 +152,7 @@ teardown() {
export SOLR_HOST=localhost
solr start -c
- solr assert --started https://localhost:${SOLR_PORT} --timeout 5000
+ solr assert --started https://localhost:${SOLR_PORT}/solr --timeout 5000
solr auth enable -type basicAuth -credentials name:password
run curl -u name:password --basic --cacert "$ssl_dir/solr-ssl.pem" "https://localhost:${SOLR_PORT}/solr/admin/collections?action=CREATE&collection.configName=_default&name=test&numShards=2&replicationFactor=1&router.name=compositeId&wt=json"
@@ -210,7 +210,7 @@ teardown() {
run solr start -c
- solr assert --started https://localhost:${SOLR_PORT} --timeout 5000
+ solr assert --started https://localhost:${SOLR_PORT}/solr --timeout 5000
export SOLR_SSL_KEY_STORE=
export SOLR_SSL_KEY_STORE_PASSWORD=
@@ -332,8 +332,8 @@ teardown() {
export SOLR_SSL_TRUST_STORE=
export SOLR_SSL_TRUST_STORE_PASSWORD=
- solr assert --started https://localhost:${SOLR_PORT} --timeout 5000
- solr assert --started https://localhost:${SOLR2_PORT} --timeout 5000
+ solr assert --started https://localhost:${SOLR_PORT}/solr --timeout 5000
+ solr assert --started https://localhost:${SOLR2_PORT}/solr --timeout 5000
run solr create -c test -s 2
assert_output --partial "Created collection 'test'"
@@ -469,8 +469,8 @@ teardown() {
export SOLR_SSL_TRUST_STORE=
export SOLR_SSL_TRUST_STORE_PASSWORD=
- solr assert --started https://localhost:${SOLR_PORT} --timeout 5000
- solr assert --started https://localhost:${SOLR2_PORT} --timeout 5000
+ solr assert --started https://localhost:${SOLR_PORT}/solr --timeout 5000
+ solr assert --started https://localhost:${SOLR2_PORT}/solr --timeout 5000
run solr create -c test -s 2
assert_output --partial "Created collection 'test'"
@@ -527,13 +527,13 @@ teardown() {
export SOLR_SSL_KEY_STORE=$ssl_dir/server1.keystore.p12
export SOLR_SSL_TRUST_STORE=$ssl_dir/server1.keystore.p12
solr start -c -a "-Dsolr.jetty.sslContext.reload.scanInterval=1 -DsocketTimeout=5000"
- solr assert --started https://localhost:${SOLR_PORT} --timeout 5000
+ solr assert --started https://localhost:${SOLR_PORT}/solr --timeout 5000
# server2 will run on $SOLR2_PORT and will use server2.keystore. Initially, this is the same as server1.keystore
export SOLR_SSL_KEY_STORE=$ssl_dir/server2.keystore.p12
export SOLR_SSL_TRUST_STORE=$ssl_dir/server2.keystore.p12
solr start -c -z localhost:${ZK_PORT} -p ${SOLR2_PORT} -a "-Dsolr.jetty.sslContext.reload.scanInterval=1 -DsocketTimeout=5000"
- solr assert --started https://localhost:${SOLR2_PORT} --timeout 5000
+ solr assert --started https://localhost:${SOLR2_PORT}/solr --timeout 5000
# "test" collection is two shards, meaning there must be communication between shards for queries (handled by http shard handler factory)
run solr create -c test -s 2
diff --git a/solr/packaging/test/test_start_solr.bats b/solr/packaging/test/test_start_solr.bats
index 6cafa120222..9b9e24a45aa 100644
--- a/solr/packaging/test/test_start_solr.bats
+++ b/solr/packaging/test/test_start_solr.bats
@@ -31,8 +31,8 @@ teardown() {
@test "SOLR-11740 check 'solr stop' connection" {
solr start
solr start -p ${SOLR2_PORT}
- solr assert --started http://localhost:${SOLR_PORT} --timeout 5000
- solr assert --started http://localhost:${SOLR2_PORT} --timeout 5000
+ solr assert --started http://localhost:${SOLR_PORT}/solr --timeout 5000
+ solr assert --started http://localhost:${SOLR2_PORT}/solr --timeout 5000
run bash -c 'solr stop -all 2>&1'
refute_output --partial 'forcefully killing'
}
@@ -41,11 +41,11 @@ teardown() {
solr start
solr start -p ${SOLR2_PORT}
- solr assert --started http://localhost:${SOLR_PORT} --timeout 5000
- solr assert --started http://localhost:${SOLR2_PORT} --timeout 5000
+ solr assert --started http://localhost:${SOLR_PORT}/solr --timeout 5000
+ solr assert --started http://localhost:${SOLR2_PORT}/solr --timeout 5000
run solr stop -p ${SOLR2_PORT}
- solr assert --not-started http://localhost:${SOLR2_PORT} --timeout 5000
- solr assert --started http://localhost:${SOLR_PORT} --timeout 5000
+ solr assert --not-started http://localhost:${SOLR2_PORT}/solr --timeout 5000
+ solr assert --started http://localhost:${SOLR_PORT}/solr --timeout 5000
}
diff --git a/solr/packaging/test/test_status.bats b/solr/packaging/test/test_status.bats
index 4ff6e0b8981..f5c15a066ca 100644
--- a/solr/packaging/test/test_status.bats
+++ b/solr/packaging/test/test_status.bats
@@ -41,6 +41,6 @@ teardown() {
}
@test "status does not expose cli parameters to end user" {
- run solr status -solr http://localhost:${SOLR_PORT}
+ run solr status -solr http://localhost:${SOLR_PORT}/solr
assert_output --partial "ERROR: Unrecognized or misplaced argument: -solr!"
}