This is an automated email from the ASF dual-hosted git repository.
janhoy 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 2c24e17 SOLR-15902 Bring back AwaitsFix annotation for this test
2c24e17 is described below
commit 2c24e17bfa582de5417e68743ac0e0de19dc868b
Author: Jan Høydahl <[email protected]>
AuthorDate: Wed Jan 12 20:47:55 2022 +0100
SOLR-15902 Bring back AwaitsFix annotation for this test
(cherry picked from commit 3545594bcf6da136db6caf9ed27b468e5c12e5c0)
---
.../src/test/org/apache/solr/cloud/PackageManagerCLITest.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git
a/solr/core/src/test/org/apache/solr/cloud/PackageManagerCLITest.java
b/solr/core/src/test/org/apache/solr/cloud/PackageManagerCLITest.java
index 38b66b6..9d5a07c 100644
--- a/solr/core/src/test/org/apache/solr/cloud/PackageManagerCLITest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/PackageManagerCLITest.java
@@ -20,6 +20,7 @@ package org.apache.solr.cloud;
import java.lang.invoke.MethodHandles;
import java.util.Arrays;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.core.TestSolrConfigHandler;
import org.apache.solr.util.LogLevel;
@@ -38,6 +39,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@LogLevel("org.apache=INFO")
[email protected](bugUrl =
"https://issues.apache.org/jira/browse/SOLR-15902")
public class PackageManagerCLITest extends SolrCloudTestCase {
// Note for those who want to modify the jar files used in the packages used
in this test:
@@ -71,7 +73,7 @@ public class PackageManagerCLITest extends SolrCloudTestCase {
@Test
public void testPackageManager() throws Exception {
PackageTool tool = new PackageTool();
-
+
String solrUrl = cluster.getJettySolrRunner(0).getBaseUrl().toString();
run(tool, new String[] {"-solrUrl", solrUrl, "list-installed"});
@@ -123,10 +125,10 @@ public class PackageManagerCLITest extends
SolrCloudTestCase {
}
assertPackageVersion("abc", "question-answer", "1.1.0", rhPath, "1.1.0");
}
-
+
log.info("Running undeploy...");
run(tool, new String[] {"-solrUrl", solrUrl, "undeploy",
"question-answer", "-collections", "abc"});
-
+
run(tool, new String[] {"-solrUrl", solrUrl, "list-deployed",
"question-answer"});
}