Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-15902 Bring back AwaitsFix annotation for this test

Jan Høydahl956bf4c25501
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 38b66b60f39..9d5a07c07be 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"});
}