[solr] branch main updated: SOLR-16304 additional test failure cleanup

[mdrob]

This is an automated email from the ASF dual-hosted git repository.

mdrob pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/main by this push:
     new 4198beef893 SOLR-16304 additional test failure cleanup
4198beef893 is described below

commit 4198beef893b799dbb926678cf3e88aeb2d19825
Author: Mike Drob <md...@apache.org>
AuthorDate: Fri Aug 5 13:09:09 2022 -0500

    SOLR-16304 additional test failure cleanup
---
 .../collections/AbstractCollectionsAPIDistributedZkTestBase.java  | 8 ++++++++
 .../solr/cloud/api/collections/AbstractIncrementalBackupTest.java | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

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.java
index 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 SolrCl
     System.setProperty("solr.allowPaths", "*");
   }
 
+  @Override
+  @After
+  public void tearDown() throws Exception {
+    cluster.deleteAllCollections();
+    super.tearDown();
+  }
+
   @Test
   public 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.java
index 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);