Merge pull request #30216 from nivox/fix-hubspec-test

Fixed race condition in MergeHub draining test: 30207
akka · May 14, 2021 · 877c4ee · 877c4ee
2 parents dd8b514 + 9fbc796
commit 877c4ee
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/HubSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/HubSpec.scala
@@ -208,14 +208,16 @@ class HubSpec extends StreamSpec {
       draining.drainAndComplete()
 
       downstream.request(10)
-      downstream.expectNextN(10).sorted should ===(1 to 10)
+      val firstBatch = downstream.expectNextN(10)
 
       val upstream = TestPublisher.probe[Int]()
       Source.fromPublisher(upstream).runWith(sink)
       upstream.expectCancellation()
 
       downstream.request(10)
-      downstream.expectNextN(10).sorted should ===(11 to 20)
+      val secondBatch = downstream.expectNextN(10)
+
+      (firstBatch ++ secondBatch).sorted should ===(1 to 20)
 
       downstream.expectComplete()
     }