From 55a99ac0e16ff4b51c045a3ea0a42a739cdc4c32 Mon Sep 17 00:00:00 2001
From: Craig Perkins <cwperx@amazon.com>
Date: Wed, 20 Dec 2023 09:25:35 -0500
Subject: [PATCH] Try increasing wait time to 30s

Signed-off-by: Craig Perkins <cwperx@amazon.com>
---
 .../security/InitializationIntegrationTests.java     | 11 +++++++++++
 .../opensearch/security/test/SingleClusterTest.java  | 12 ++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/src/test/java/org/opensearch/security/InitializationIntegrationTests.java b/src/test/java/org/opensearch/security/InitializationIntegrationTests.java
index 44b737d051..3558d2f292 100644
--- a/src/test/java/org/opensearch/security/InitializationIntegrationTests.java
+++ b/src/test/java/org/opensearch/security/InitializationIntegrationTests.java
@@ -28,6 +28,7 @@
 
 import java.io.File;
 import java.util.Iterator;
+import java.util.concurrent.TimeUnit;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import org.apache.hc.client5.http.classic.methods.HttpGet;
@@ -307,6 +308,16 @@ public void testInvalidDefaultConfig() throws Exception {
                 HttpStatus.SC_SERVICE_UNAVAILABLE,
                 nonSslRestHelper().executeGetRequest("", encodeBasicHeader("admin", "admin")).getStatusCode()
             );
+
+            ClusterHelper.updateDefaultDirectory(defaultInitDirectory);
+            restart(Settings.EMPTY, null, settings, false);
+            Awaitility.waitAtMost(30, TimeUnit.SECONDS)
+                .await()
+                .alias("Load default configuration")
+                .until(
+                    () -> nonSslRestHelper().executeGetRequest("", encodeBasicHeader("admin", "admin")).getStatusCode(),
+                    equalTo(HttpStatus.SC_OK)
+                );
         } finally {
             ClusterHelper.resetSystemProperties();
         }
diff --git a/src/test/java/org/opensearch/security/test/SingleClusterTest.java b/src/test/java/org/opensearch/security/test/SingleClusterTest.java
index cdde57a5c0..2839e1e283 100644
--- a/src/test/java/org/opensearch/security/test/SingleClusterTest.java
+++ b/src/test/java/org/opensearch/security/test/SingleClusterTest.java
@@ -83,6 +83,18 @@ protected void setup(
         setup(initTransportClientSettings, dynamicSecuritySettings, nodeOverride, initSecurityIndex, ClusterConfiguration.DEFAULT);
     }
 
+    protected void restart(
+        Settings initTransportClientSettings,
+        DynamicSecurityConfig dynamicSecuritySettings,
+        Settings nodeOverride,
+        boolean initOpendistroSecurityIndex
+    ) throws Exception {
+        clusterInfo = clusterHelper.startCluster(minimumSecuritySettings(ccs(nodeOverride)), ClusterConfiguration.DEFAULT);
+        if (initOpendistroSecurityIndex && dynamicSecuritySettings != null) {
+            initialize(clusterHelper, clusterInfo, dynamicSecuritySettings);
+        }
+    }
+
     private Settings ccs(Settings nodeOverride) throws Exception {
         if (remoteClusterHelper != null) {
             Assert.assertNull("No remote clusters", remoteClusterInfo);