[Backport 2.x] Fixes flaky integration tests (opensearch-project#4463)

Signed-off-by: Andrey Pleskach <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
DarshitChanpura · Jun 14, 2024 · b3b63dc · b3b63dc
1 parent ba22fed
commit b3b63dc
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 10 deletions.
diff --git a/src/integrationTest/java/org/opensearch/security/AbstractDefaultConfigurationTests.java b/src/integrationTest/java/org/opensearch/security/AbstractDefaultConfigurationTests.java
@@ -9,19 +9,15 @@
  */
 package org.opensearch.security;
 
-import java.io.IOException;
-import java.nio.file.Path;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
 import com.fasterxml.jackson.databind.JsonNode;
-import org.apache.commons.io.FileUtils;
 import org.apache.http.HttpStatus;
 import org.awaitility.Awaitility;
-import org.junit.AfterClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -42,7 +38,6 @@
 @RunWith(com.carrotsearch.randomizedtesting.RandomizedRunner.class)
 @ThreadLeakScope(ThreadLeakScope.Scope.NONE)
 public abstract class AbstractDefaultConfigurationTests {
-    public final static Path configurationFolder = ConfigurationFiles.createConfigurationDirectory();
     private static final TestSecurityConfig.User ADMIN_USER = new TestSecurityConfig.User("admin");
     private static final TestSecurityConfig.User NEW_USER = new TestSecurityConfig.User("new-user");
     private static final TestSecurityConfig.User LIMITED_USER = new TestSecurityConfig.User("limited-user");
@@ -53,11 +48,6 @@ protected AbstractDefaultConfigurationTests(LocalCluster cluster) {
         this.cluster = cluster;
     }
 
-    @AfterClass
-    public static void cleanConfigurationDirectory() throws IOException {
-        FileUtils.deleteDirectory(configurationFolder.toFile());
-    }
-
     @Test
     public void shouldLoadDefaultConfiguration() {
         try (TestRestClient client = cluster.getRestClient(NEW_USER)) {

diff --git a/...tegrationTest/java/org/opensearch/security/DefaultConfigurationMultiNodeClusterTests.java b/...tegrationTest/java/org/opensearch/security/DefaultConfigurationMultiNodeClusterTests.java
@@ -9,16 +9,22 @@
  */
 package org.opensearch.security;
 
+import java.io.IOException;
+import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.io.FileUtils;
+import org.junit.AfterClass;
 import org.junit.ClassRule;
 
 import org.opensearch.test.framework.cluster.ClusterManager;
 import org.opensearch.test.framework.cluster.LocalCluster;
 
 public class DefaultConfigurationMultiNodeClusterTests extends AbstractDefaultConfigurationTests {
 
+    static Path configurationFolder = ConfigurationFiles.createConfigurationDirectory();
+
     @ClassRule
     public static LocalCluster cluster = new LocalCluster.Builder().clusterManager(ClusterManager.THREE_CLUSTER_MANAGERS)
         .nodeSettings(
@@ -33,6 +39,11 @@ public class DefaultConfigurationMultiNodeClusterTests extends AbstractDefaultCo
         .loadConfigurationIntoIndex(false)
         .build();
 
+    @AfterClass
+    public static void cleanConfigurationDirectory() throws IOException {
+        FileUtils.deleteDirectory(configurationFolder.toFile());
+    }
+
     public DefaultConfigurationMultiNodeClusterTests() {
         super(cluster);
     }

diff --git a/...ava/org/opensearch/security/DefaultConfigurationMultiNodeClusterUseClusterStateTests.java b/...ava/org/opensearch/security/DefaultConfigurationMultiNodeClusterUseClusterStateTests.java
@@ -9,16 +9,22 @@
  */
 package org.opensearch.security;
 
+import java.io.IOException;
+import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.io.FileUtils;
+import org.junit.AfterClass;
 import org.junit.ClassRule;
 
 import org.opensearch.test.framework.cluster.ClusterManager;
 import org.opensearch.test.framework.cluster.LocalCluster;
 
 public class DefaultConfigurationMultiNodeClusterUseClusterStateTests extends AbstractDefaultConfigurationTests {
 
+    static Path configurationFolder = ConfigurationFiles.createConfigurationDirectory();
+
     @ClassRule
     public static LocalCluster cluster = new LocalCluster.Builder().clusterManager(ClusterManager.THREE_CLUSTER_MANAGERS)
         .nodeSettings(
@@ -35,6 +41,11 @@ public class DefaultConfigurationMultiNodeClusterUseClusterStateTests extends Ab
         .loadConfigurationIntoIndex(false)
         .build();
 
+    @AfterClass
+    public static void cleanConfigurationDirectory() throws IOException {
+        FileUtils.deleteDirectory(configurationFolder.toFile());
+    }
+
     public DefaultConfigurationMultiNodeClusterUseClusterStateTests() {
         super(cluster);
     }

diff --git a/...egrationTest/java/org/opensearch/security/DefaultConfigurationSingleNodeClusterTests.java b/...egrationTest/java/org/opensearch/security/DefaultConfigurationSingleNodeClusterTests.java
@@ -9,10 +9,14 @@
 */
 package org.opensearch.security;
 
+import java.io.IOException;
+import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
 
 import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
+import org.apache.commons.io.FileUtils;
+import org.junit.AfterClass;
 import org.junit.ClassRule;
 import org.junit.runner.RunWith;
 
@@ -23,6 +27,8 @@
 @ThreadLeakScope(ThreadLeakScope.Scope.NONE)
 public class DefaultConfigurationSingleNodeClusterTests extends AbstractDefaultConfigurationTests {
 
+    static Path configurationFolder = ConfigurationFiles.createConfigurationDirectory();
+
     @ClassRule
     public static LocalCluster cluster = new LocalCluster.Builder().clusterManager(ClusterManager.SINGLENODE)
         .nodeSettings(
@@ -37,6 +43,11 @@ public class DefaultConfigurationSingleNodeClusterTests extends AbstractDefaultC
         .loadConfigurationIntoIndex(false)
         .build();
 
+    @AfterClass
+    public static void cleanConfigurationDirectory() throws IOException {
+        FileUtils.deleteDirectory(configurationFolder.toFile());
+    }
+
     public DefaultConfigurationSingleNodeClusterTests() {
         super(cluster);
     }

diff --git a/...va/org/opensearch/security/DefaultConfigurationSingleNodeClusterUseClusterStateTests.java b/...va/org/opensearch/security/DefaultConfigurationSingleNodeClusterUseClusterStateTests.java
@@ -9,16 +9,22 @@
  */
 package org.opensearch.security;
 
+import java.io.IOException;
+import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.io.FileUtils;
+import org.junit.AfterClass;
 import org.junit.ClassRule;
 
 import org.opensearch.test.framework.cluster.ClusterManager;
 import org.opensearch.test.framework.cluster.LocalCluster;
 
 public class DefaultConfigurationSingleNodeClusterUseClusterStateTests extends AbstractDefaultConfigurationTests {
 
+    static Path configurationFolder = ConfigurationFiles.createConfigurationDirectory();
+
     @ClassRule
     public static LocalCluster cluster = new LocalCluster.Builder().clusterManager(ClusterManager.SINGLENODE)
         .nodeSettings(
@@ -35,6 +41,11 @@ public class DefaultConfigurationSingleNodeClusterUseClusterStateTests extends A
         .loadConfigurationIntoIndex(false)
         .build();
 
+    @AfterClass
+    public static void cleanConfigurationDirectory() throws IOException {
+        FileUtils.deleteDirectory(configurationFolder.toFile());
+    }
+
     public DefaultConfigurationSingleNodeClusterUseClusterStateTests() {
         super(cluster);
     }