Switch to signal/wait pattern for failing test

Signed-off-by: Peter Nied <petern@amazon.com>
opensearch-project · Jun 23, 2022 · 4fc8041 · 4fc8041
1 parent 698dbdf
commit 4fc8041
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/test/java/org/opensearch/security/auditlog/compliance/ComplianceAuditlogTest.java b/src/test/java/org/opensearch/security/auditlog/compliance/ComplianceAuditlogTest.java
@@ -183,13 +183,12 @@ public void testSourceFilterMsearch() throws Exception {
                 "   }" +
                 "}"+System.lineSeparator();
 
-        TestAuditlogImpl.clear();
-        HttpResponse response = rh.executePostRequest("_msearch?pretty", search, encodeBasicHeader("admin", "admin"));
-        assertNotContains(response, "*exception*");
-        Assert.assertEquals(HttpStatus.SC_OK, response.getStatusCode());
-        Thread.sleep(1500);
+        TestAuditlogImpl.doThenWaitForMessages(() -> {
+            HttpResponse response = rh.executePostRequest("_msearch?pretty", search, encodeBasicHeader("admin", "admin"));
+            assertNotContains(response, "*exception*");
+            Assert.assertEquals(HttpStatus.SC_OK, response.getStatusCode());
+        }, 2);
         System.out.println(TestAuditlogImpl.sb.toString());
-        Assert.assertTrue("Was "+TestAuditlogImpl.messages.size(), TestAuditlogImpl.messages.size() == 2);
         Assert.assertTrue(TestAuditlogImpl.sb.toString().contains("COMPLIANCE_DOC_READ"));
         Assert.assertFalse(TestAuditlogImpl.sb.toString().contains("Salary"));
         Assert.assertTrue(TestAuditlogImpl.sb.toString().contains("Gender"));