fixing boolean supplier correctly

Signed-off-by: Jacob Choi <[email protected]>
opensearch-project · Nov 1, 2023 · 19e5ded · 19e5ded
1 parent e650f15
commit 19e5ded
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/alerting/src/test/kotlin/org/opensearch/alerting/MonitorRunnerServiceIT.kt b/alerting/src/test/kotlin/org/opensearch/alerting/MonitorRunnerServiceIT.kt
@@ -1429,7 +1429,7 @@ class MonitorRunnerServiceIT : AlertingRestTestCase() {
 
         // Execute Monitor and check that both Alerts were updated
         OpenSearchTestCase.waitUntil({
-            return@waitUntil (searchAlerts(monitor, AlertIndices.ALL_ALERT_INDEX_PATTERN).size == 2)
+            return@waitUntil false
         }, 200, TimeUnit.MILLISECONDS)
         executeMonitor(monitor.id)
         currentAlerts = searchAlerts(monitor, AlertIndices.ALL_ALERT_INDEX_PATTERN)

diff --git a/alerting/src/test/kotlin/org/opensearch/alerting/resthandler/MonitorRestApiIT.kt b/alerting/src/test/kotlin/org/opensearch/alerting/resthandler/MonitorRestApiIT.kt
@@ -812,8 +812,9 @@ class MonitorRestApiIT : AlertingRestTestCase() {
 
         // Wait 5 seconds for event to be processed and alerts moved
         OpenSearchTestCase.waitUntil({
+            val alerts = searchAlerts(monitor)
             val historyAlerts = searchAlerts(monitor, AlertIndices.ALERT_HISTORY_WRITE_INDEX)
-            return@waitUntil (historyAlerts.size == 1)
+            return@waitUntil (alerts.isEmpty() && historyAlerts.size == 1)
         }, 5, TimeUnit.SECONDS)
 
         val alerts = searchAlerts(monitor)
@@ -846,8 +847,7 @@ class MonitorRestApiIT : AlertingRestTestCase() {
 
         // Wait 5 seconds for event to be processed and alerts moved
         OpenSearchTestCase.waitUntil({
-            val historyAlerts = searchAlerts(monitor, AlertIndices.ALERT_HISTORY_WRITE_INDEX)
-            return@waitUntil (historyAlerts.size == 1)
+            return@waitUntil false
         }, 5, TimeUnit.SECONDS)
 
         val alerts = searchAlerts(monitor)