From 4cde6e7feb9b111cc55766e3dbad1c8952365d49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Andr=C3=A9n?= <johan@markatta.com>
Date: Mon, 12 Feb 2018 14:38:22 +0100
Subject: [PATCH] Less fragile way of waiting for stream completion #24501
 (#24528)

---
 .../stream/javadsl/cookbook/RecipeAdhocSourceTest.java   | 9 +++++----
 .../scala/docs/stream/cookbook/RecipeAdhocSource.scala   | 8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeAdhocSourceTest.java b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeAdhocSourceTest.java
index 23685cae9b..c9f1f2d818 100644
--- a/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeAdhocSourceTest.java
+++ b/akka-docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeAdhocSourceTest.java
@@ -18,6 +18,7 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.Ignore;
+import scala.concurrent.Await;
 import scala.concurrent.Promise;
 import scala.concurrent.duration.Duration;
 import scala.concurrent.duration.FiniteDuration;
@@ -99,8 +100,8 @@ public class RecipeAdhocSourceTest extends RecipeTest {
           .run(mat);
 
         probe.requestNext("a");
-        Thread.sleep(500);
-        assertEquals(true, shutdown.isCompleted());
+        Thread.sleep(300);
+        Await.result(shutdown.future(), duration("3 seconds"));
       }
     };
   }
@@ -156,8 +157,8 @@ public class RecipeAdhocSourceTest extends RecipeTest {
 
         probe.requestNext("a");
         assertEquals(1, startedCount.get());
-        Thread.sleep(500);
-        assertEquals(true, shutdown.isCompleted());
+        Thread.sleep(200);
+        Await.result(shutdown.future(), duration("3 seconds"));
       }
     };
   }
diff --git a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeAdhocSource.scala b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeAdhocSource.scala
index 33cb39f6f3..5cf47aaca6 100644
--- a/akka-docs/src/test/scala/docs/stream/cookbook/RecipeAdhocSource.scala
+++ b/akka-docs/src/test/scala/docs/stream/cookbook/RecipeAdhocSource.scala
@@ -47,8 +47,8 @@ class RecipeAdhocSource extends RecipeSpec {
         .runWith(TestSink.probe[String])
 
       sink.requestNext("a")
-      Thread.sleep(500)
-      shutdown.isCompleted should be(true)
+      Thread.sleep(200)
+      shutdown.future.futureValue should be(Done)
     }
 
     "not shut down the source when there are still demands" taggedAs TimingTest in {
@@ -88,8 +88,8 @@ class RecipeAdhocSource extends RecipeSpec {
 
       sink.requestNext("a")
       startedCount.get() should be(1)
-      Thread.sleep(500)
-      shutdown.isCompleted should be(true)
+      Thread.sleep(200)
+      shutdown.future.futureValue should be(Done)
     }
 
     "restart up to specified maxRetries" taggedAs TimingTest in {