Merge pull request #6639: [BEAM-5709] Fix flaky tests in BeamFnContro…

…lServiceTest.
apache · Oct 12, 2018 · ca37470 · ca37470
2 parents 1b77b90 + 7bf7318
commit ca37470
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/...er/src/test/java/org/apache/beam/runners/dataflow/worker/fn/BeamFnControlServiceTest.java b/...er/src/test/java/org/apache/beam/runners/dataflow/worker/fn/BeamFnControlServiceTest.java
@@ -88,6 +88,8 @@ public void testClientConnecting() throws Exception {
     server.shutdown();
     server.awaitTermination(1, TimeUnit.SECONDS);
     server.shutdownNow();
+    Thread.sleep(1000); // Wait for stub to close stream.
+
     verify(requestObserver).onCompleted();
     verifyNoMoreInteractions(requestObserver);
   }
@@ -126,6 +128,8 @@ public void testMultipleClientsConnecting() throws Exception {
     server.shutdown();
     server.awaitTermination(1, TimeUnit.SECONDS);
     server.shutdownNow();
+    Thread.sleep(1000); // Wait for stub to close stream.
+
     verify(requestObserver).onCompleted();
     verifyNoMoreInteractions(requestObserver);
     verify(anotherRequestObserver).onCompleted();