Apache Solr open-source search software
SOLR-16304 additional test failure cleanup
Mike Drob4198beef893b
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCollectionsAPIDistributedZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCollectionsAPIDistributedZkTestBase.javaindex 8cf85dc8505..1b7fd4693f7 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCollectionsAPIDistributedZkTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCollectionsAPIDistributedZkTestBase.java@@ -71,6 +71,7 @@ import org.apache.solr.core.SolrCore;import org.apache.solr.core.SolrInfoBean.Category;import org.apache.solr.util.TestInjection;import org.apache.solr.util.TimeOut;+import org.junit.After;import org.junit.BeforeClass;import org.junit.Test;import org.slf4j.Logger;@@ -95,6 +96,13 @@ public abstract class AbstractCollectionsAPIDistributedZkTestBase extends SolrClSystem.setProperty("solr.allowPaths", "*");}+ @Override+ @After+ public void tearDown() throws Exception {+ cluster.deleteAllCollections();+ super.tearDown();+ }+@Testpublic void testCreationAndDeletion() throws Exception {String collectionName = "created_and_deleted";diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.javaindex 1f77a2b0ba0..cdda36cbe9a 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java@@ -208,7 +208,7 @@ public abstract class AbstractIncrementalBackupTest extends SolrCloudTestCase {CollectionAdminRequest.backupCollection(backupCollectionName, backupName).setLocation(backupLocation).setRepositoryName(BACKUP_REPO_NAME)- .processAndWait(cluster.getSolrClient(), 10);+ .processAndWait(cluster.getSolrClient(), 20);assertEquals(RequestStatusState.COMPLETED, result);}final int secondBatchNumDocs = indexDocs(backupCollectionName, true);