This is an automated email from the ASF dual-hosted git repository. epugh pushed a commit to branch branch_9x in repository https://gitbox.apache.org/repos/asf/solr.git
commit 69256c39f2beaba3b480a446d46b634dc0e1f8d8 Author: Eric Pugh <[email protected]> AuthorDate: Tue Oct 8 10:05:57 2024 -0400 Fix backport of SOLR-17470 --- solr/core/src/java/org/apache/solr/cli/AssertTool.java | 9 +++------ solr/packaging/test/test_assert.bats | 14 -------------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/solr/core/src/java/org/apache/solr/cli/AssertTool.java b/solr/core/src/java/org/apache/solr/cli/AssertTool.java index b06fee91b24..640297de057 100644 --- a/solr/core/src/java/org/apache/solr/cli/AssertTool.java +++ b/solr/core/src/java/org/apache/solr/cli/AssertTool.java @@ -26,8 +26,8 @@ import java.nio.file.attribute.FileOwnerAttributeView; import java.util.List; import java.util.concurrent.TimeUnit; import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.DeprecatedAttributes; +import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.Option; import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrRequest; @@ -234,15 +234,12 @@ public class AssertTool extends ToolBase { } if (cli.hasOption("s") || cli.hasOption("started")) { ret += - assertSolrRunning( - SolrCLI.getOptionWithDeprecatedAndDefault(cli, "started", "s", null), - cli.getOptionValue(SolrCLI.OPTION_CREDENTIALS.getLongOpt())); + assertSolrRunning(SolrCLI.getOptionWithDeprecatedAndDefault(cli, "started", "s", null)); } if (cli.hasOption("S") || cli.hasOption("not-started")) { ret += assertSolrNotRunning( - SolrCLI.getOptionWithDeprecatedAndDefault(cli, "not-started", "S", null), - cli.getOptionValue(SolrCLI.OPTION_CREDENTIALS.getLongOpt())); + SolrCLI.getOptionWithDeprecatedAndDefault(cli, "not-started", "S", null)); } if (cli.hasOption("c")) { ret += assertSolrRunningInCloudMode(cli.getOptionValue("c")); diff --git a/solr/packaging/test/test_assert.bats b/solr/packaging/test/test_assert.bats index 56bad292f55..6d6fdb4c3a0 100644 --- a/solr/packaging/test/test_assert.bats +++ b/solr/packaging/test/test_assert.bats @@ -42,17 +42,3 @@ teardown() { run ! solr assert --cloud http://localhost:${SOLR_PORT} -e } - -@test "assert for cloud mode" { - run solr start -c - solr assert --started http://localhost:${SOLR_PORT} --timeout 5000 - - run solr assert --cloud http://localhost:${SOLR_PORT} - refute_output --partial "ERROR" - - run solr assert --not-cloud http://localhost:${SOLR_PORT}/solr - assert_output --partial "needn't include Solr's context-root" - assert_output --partial "ERROR: Solr is not running in standalone mode" - - run ! solr assert --not-cloud http://localhost:${SOLR_PORT} -e -}
