Fix SecurityConfigurationTests test

willyborankin · Jun 14, 2024 · f5073d9 · f5073d9
1 parent 2105c4b
commit f5073d9
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/integrationTest/java/org/opensearch/security/SecurityConfigurationTests.java b/src/integrationTest/java/org/opensearch/security/SecurityConfigurationTests.java
@@ -93,6 +93,11 @@ public static void initData() {
             client.prepareIndex(LIMITED_USER_INDEX).setId(ID_1).setRefreshPolicy(IMMEDIATE).setSource("foo", "bar").get();
             client.prepareIndex(PROHIBITED_INDEX).setId(ID_2).setRefreshPolicy(IMMEDIATE).setSource("three", "four").get();
         }
+        try (TestRestClient client = cluster.getRestClient(USER_ADMIN)) {
+            Awaitility.await()
+                .alias("Load default configuration")
+                .until(() -> client.securityHealth().getTextFromJsonBody("/status"), equalTo("UP"));
+        }
     }
 
     @Test
@@ -258,7 +263,11 @@ public void testParallelTenantPutRequests() throws Exception {
 
             AtomicInteger numCreatedResponses = new AtomicInteger();
             AsyncActions.getAll(conflictingRequests, 1, TimeUnit.SECONDS).forEach((response) -> {
-                assertThat(response.getStatusCode(), anyOf(equalTo(HttpStatus.SC_CREATED), equalTo(HttpStatus.SC_CONFLICT)));
+                assertThat(
+                    response.getBody(),
+                    response.getStatusCode(),
+                    anyOf(equalTo(HttpStatus.SC_CREATED), equalTo(HttpStatus.SC_CONFLICT))
+                );
                 if (response.getStatusCode() == HttpStatus.SC_CREATED) numCreatedResponses.getAndIncrement();
             });
             assertThat(numCreatedResponses.get(), equalTo(1)); // should only be one 201