using verifyMonitorStats to enhance the test efficiency

Signed-off-by: Jacob Choi <[email protected]>
JacobCho-i · Nov 10, 2023 · 0a75b05 · 0a75b05
1 parent 19e5ded
commit 0a75b05
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/alerting/src/test/kotlin/org/opensearch/alerting/bwc/AlertingBackwardsCompatibilityIT.kt b/alerting/src/test/kotlin/org/opensearch/alerting/bwc/AlertingBackwardsCompatibilityIT.kt
@@ -71,10 +71,21 @@ class AlertingBackwardsCompatibilityIT : AlertingRestTestCase() {
                     //  the test execution by a lot (might have to wait for Job Scheduler plugin integration first)
                     // Waiting a minute to ensure the Monitor ran again at least once before checking if the job is running
                     // on time
+                    var passed = false
                     OpenSearchTestCase.waitUntil({
-                        return@waitUntil false
+                        try {
+                            // Run verifyMonitorStats until all assertion test passes
+                            verifyMonitorStats("/_plugins/_alerting")
+                            passed = true
+                            return@waitUntil true
+                        } catch (e: AssertionError) {
+                            return@waitUntil false
+                        }
                     }, 1, TimeUnit.MINUTES)
-                    verifyMonitorStats("/_plugins/_alerting")
+                    if (!passed) {
+                        // if it hit the max time (1 minute), run verifyMonitorStats again to make sure all the tests pass
+                        verifyMonitorStats("/_plugins/_alerting")
+                    }
                 }
             }
             break