[lucene-solr] branch branch_8x updated: SOLR-15526 Use new cluster for each LeaderTragicEvent test (#2531)

[md...@apache.org]

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

mdrob 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 1d87c69  SOLR-15526 Use new cluster for each LeaderTragicEvent test (#2531)
1d87c69 is described below

commit 1d87c6932591a300fbb3f876fa305d2b8a5846ee
Author: Mike Drob <md...@apache.org>
AuthorDate: Sat Jul 10 21:07:48 2021 -0700

    SOLR-15526 Use new cluster for each LeaderTragicEvent test (#2531)
---
 .../test/org/apache/solr/cloud/LeaderTragicEventTest.java  | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.java
index f15ad47..948888f 100644
--- a/solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.java
@@ -53,24 +53,22 @@ public class LeaderTragicEventTest extends SolrCloudTestCase {
 
   private String collection;
 
-  @BeforeClass
-  public static void setupCluster() throws Exception {
-    configureCluster(2)
-        .addConfig("config", TEST_PATH().resolve("configsets").resolve("cloud-minimal").resolve("conf"))
-        .configure();
-  }
-
   @Before
   public void setUp() throws Exception {
     super.setUp();
     collection = getSaferTestName();
+    // TODO Investigate why using same cluster for all tests in this class led to sporadic failure
+    configureCluster(2)
+        .addConfig("config", TEST_PATH().resolve("configsets").resolve("cloud-minimal").resolve("conf"))
+        .configure();
     cluster.getSolrClient().setDefaultCollection(collection);
   }
 
   @After
   public void tearDown() throws Exception {
-    super.tearDown();
     CollectionAdminRequest.deleteCollection(collection).process(cluster.getSolrClient());
+    cluster.shutdown();
+    super.tearDown();
   }
 
   @Test