Merge branch 'master' into karthik/docimprov
diff --git a/heron/common/tests/java/com/twitter/heron/common/test/HeronServerTest.java b/heron/common/tests/java/com/twitter/heron/common/test/HeronServerTest.java
index d8a3fc7..6af92a5 100644
--- a/heron/common/tests/java/com/twitter/heron/common/test/HeronServerTest.java
+++ b/heron/common/tests/java/com/twitter/heron/common/test/HeronServerTest.java
@@ -289,16 +289,19 @@
*/
@Test
public void testRegisterTimerEventInNanoSeconds() {
+ final CountDownLatch runnableLatch = new CountDownLatch(1);
Runnable r = new Runnable() {
@Override
public void run() {
isTimerEventInvoked = true;
+ runnableLatch.countDown();
}
};
heronServer.registerTimerEvent(Duration.ZERO, r);
runBase();
+ HeronServerTester.await(runnableLatch);
Assert.assertTrue(isTimerEventInvoked);
}
