Skip to content

Commit 26ff60b

Browse files
kaisun2000Kai Sun
andauthored
fix TestCleanupExternalView.test (#1492)
Flaky test with 10 * 100ms. This may not be enough when there is logging or Zk is slow in github. Fix with TestHelper.verify(); Co-authored-by: Kai Sun <ksun@ksun-mn1.linkedin.biz>
1 parent ec214b2 commit 26ff60b

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

helix-core/src/test/java/org/apache/helix/integration/TestCleanupExternalView.java

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
* orphan external-view
4343
*/
4444
public class TestCleanupExternalView extends ZkUnitTestBase {
45+
private ExternalView _externalView = null;
4546
@Test
4647
public void test() throws Exception {
4748
// Logger.getRootLogger().setLevel(Level.INFO);
@@ -109,18 +110,12 @@ public void test() throws Exception {
109110
// System.out.println("re-enabling controller");
110111
admin.enableCluster(clusterName, true);
111112

112-
ExternalView externalView = null;
113-
for (int i = 0; i < 10; i++) {
114-
Thread.sleep(100);
115-
externalView = accessor.getProperty(keyBuilder.externalView("TestDB0"));
116-
// System.out.println("externalView: " + externalView);
117-
if (externalView == null) {
118-
break;
119-
}
120-
}
113+
result = TestHelper.verify(() -> {
114+
_externalView = accessor.getProperty(keyBuilder.externalView("TestDB0"));
115+
return _externalView == null;
116+
}, TestHelper.WAIT_DURATION);
121117

122-
Assert.assertNull(externalView, "external-view for TestDB0 should be removed, but was: "
123-
+ externalView);
118+
Assert.assertTrue(result, "external-view for TestDB0 should be removed, but was: " + _externalView);
124119

125120
// clean up
126121
controller.syncStop();

0 commit comments

Comments
 (0)