Fix TestClusterAggregateMetrics (apache#2602)

Fix flaky test TestClusterAggregateMetrics --------- Co-authored-by: Xiaxuan Gao <[email protected]>
himanshukandwal · Sep 16, 2023 · c607364 · c607364
1 parent 279c3f3
commit c607364
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestClusterAggregateMetrics.java b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestClusterAggregateMetrics.java
@@ -156,7 +156,9 @@ public void testAggregateMetrics() throws Exception {
     expectedMetricValues.put(ERROR_PARTITION_COUNT, 0L);
     expectedMetricValues.put(WITHOUT_TOPSTATE_COUNT, 0L);
     expectedMetricValues.put(IS_EV_MISMATCH_COUNT, 0L);
-    Assert.assertTrue(verifyMetrics(expectedMetricValues));
+    Assert.assertTrue(TestHelper.verify(() -> {
+      return verifyMetrics(expectedMetricValues);
+    }, TestHelper.WAIT_DURATION), "Expected metrics and observed metrics don't align.");
 
     // Disable all Participants (instances)
     _setupTool.getClusterManagementTool()
@@ -183,7 +185,9 @@ public void testAggregateMetrics() throws Exception {
     Assert.assertTrue(verifier.verifyByPolling());
 
     expectedMetricValues.put(WITHOUT_TOPSTATE_COUNT, 5L);
-    Assert.assertTrue(verifyMetrics(expectedMetricValues));
+    Assert.assertTrue(TestHelper.verify(() -> {
+      return verifyMetrics(expectedMetricValues);
+    }, TestHelper.WAIT_DURATION), "Expected metrics and observed metrics don't align.");
 
     // Re-enable all Participants (instances)
     for (int i = 0; i < NUM_PARTICIPANTS; i++) {
@@ -223,7 +227,9 @@ public void testAggregateMetrics() throws Exception {
     Assert.assertTrue(verifier.verifyByPolling());
 
     expectedMetricValues.put(PARTITION_COUNT, 0L);
-    Assert.assertTrue(verifyMetrics(expectedMetricValues));
+    Assert.assertTrue(TestHelper.verify(() -> {
+      return verifyMetrics(expectedMetricValues);
+    }, TestHelper.WAIT_DURATION), "Expected metrics and observed metrics don't align.");
   }
 
   /**