[lucene-solr] branch branch_8x updated: SOLR-15101: Fix IncrementalBackupTest bug

[ge...@apache.org]

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

gerlowskija pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/branch_8x by this push:
     new fd8a7df  SOLR-15101: Fix IncrementalBackupTest bug
fd8a7df is described below

commit fd8a7df4b326786d9a1575ddfa38eb6f0399d7eb
Author: Jason Gerlowski <ja...@lucidworks.com>
AuthorDate: Wed Feb 17 08:19:53 2021 -0500

    SOLR-15101: Fix IncrementalBackupTest bug
    
    Each test case in this class sets a "prefix" to ease distinguishing
    between backups and collections created by each test method.  But this
    prefix is set inconsistently - sometimes after resources have been
    created by a test.  This commit changes the prefix to occur at the very
    start of each test case.
---
 .../solr/cloud/api/collections/AbstractIncrementalBackupTest.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 067f324..6a6a833 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
@@ -128,11 +128,11 @@ public abstract class AbstractIncrementalBackupTest extends SolrCloudTestCase {
 
     @Test
     public void testSimple() throws Exception {
+        setTestSuffix("testbackupincsimple");
         final String backupCollectionName = getCollectionName();
         final String restoreCollectionName = backupCollectionName + "_restore";
         TrackingBackupRepository.clear();
 
-        setTestSuffix("testbackupincsimple");
         CloudSolrClient solrClient = cluster.getSolrClient();
 
         CollectionAdminRequest
@@ -182,8 +182,8 @@ public abstract class AbstractIncrementalBackupTest extends SolrCloudTestCase {
     @SuppressWarnings("rawtypes")
     public void testBackupIncremental() throws Exception {
         TrackingBackupRepository.clear();
-
         setTestSuffix("testbackupinc");
+
         randomizeReplicaTypes();
         CloudSolrClient solrClient = cluster.getSolrClient();