Fix halt/interrupt tests

zio · Apr 10, 2020 · 128f859 · 128f859
1 parent e779a61
commit 128f859
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/streams-tests/jvm/src/test/scala/zio/stream/StreamHaltWhenSpec.scala b/streams-tests/jvm/src/test/scala/zio/stream/StreamHaltWhenSpec.scala
@@ -56,7 +56,8 @@ object StreamHaltWhenSpec extends ZIOBaseSpec {
         for {
           halt <- Promise.make[String, Nothing]
           _    <- halt.fail("Fail")
-          result <- ZStream(1, 2, 3)
+          result <- ZStream
+                     .fromIterable(scala.Stream.from(0))
                      .haltWhen(halt.await)
                      .runDrain
                      .either

diff --git a/streams-tests/jvm/src/test/scala/zio/stream/StreamInterruptWhenSpec.scala b/streams-tests/jvm/src/test/scala/zio/stream/StreamInterruptWhenSpec.scala
@@ -59,7 +59,8 @@ object StreamInterruptWhenSpec extends ZIOBaseSpec {
           for {
             halt <- Promise.make[String, Nothing]
             _    <- halt.fail("Fail")
-            result <- ZStream(1)
+            result <- ZStream
+                       .fromIterable(scala.Stream.from(0))
                        .haltWhen(halt.await)
                        .runDrain
                        .either

diff --git a/streams/shared/src/main/scala/zio/stream/ZStream.scala b/streams/shared/src/main/scala/zio/stream/ZStream.scala
@@ -1766,14 +1766,15 @@ class ZStream[-R, +E, +A] private[stream] (private[stream] val structure: ZStrea
    * IO will be forked as part of this stream, and its success will be discarded. This
    * combinator will also interrupt any in-progress element being pulled from upstream.
    *
-   * If the IO completes with a failure, the stream will emit that failure.
+   * If the IO completes with a failure before the stream completes, the returned stream
+   * will emit that failure.
    */
   final def interruptWhen[R1 <: R, E1 >: E](io: ZIO[R1, E1, Any]): ZStream[R1, E1, A] =
     ZStream {
       for {
         as    <- self.process
         runIO <- (io.asSomeError *> Pull.end).forkManaged
-      } yield as.raceFirst(runIO.join)
+      } yield runIO.join.disconnect.raceFirst(as)
     }
 
   /**