From 870fb7b5b2acf37318b4a49dd07084c74d450276 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Sun, 26 Mar 2023 02:18:51 +0000 Subject: [PATCH 1/5] Slower sleep+timeout for `timed` doctest --- core/shared/src/main/scala/fs2/Stream.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/shared/src/main/scala/fs2/Stream.scala b/core/shared/src/main/scala/fs2/Stream.scala index 96f09ec383..0e37f7a02c 100644 --- a/core/shared/src/main/scala/fs2/Stream.scala +++ b/core/shared/src/main/scala/fs2/Stream.scala @@ -4729,11 +4729,11 @@ object Stream extends StreamLowPriority { * scala> import cats.effect.IO * scala> import cats.effect.unsafe.implicits.global * scala> import scala.concurrent.duration._ - * scala> val s = (Stream("elem") ++ Stream.sleep_[IO](600.millis)).repeat.take(3) + * scala> val s = (Stream("elem") ++ Stream.sleep_[IO](2.seconds)).repeat.take(3) * scala> s.pull * | .timed { timedPull => * | def go(timedPull: Pull.Timed[IO, String]): Pull[IO, String, Unit] = - * | timedPull.timeout(450.millis) >> // starts new timeout and stops the previous one + * | timedPull.timeout(1.second) >> // starts new timeout and stops the previous one * | timedPull.uncons.flatMap { * | case Some((Right(elems), next)) => Pull.output(elems) >> go(next) * | case Some((Left(_), next)) => Pull.output1("late!") >> go(next) From a9751b1eff9531a87e94dd1fdd4aaff0661dcd2c Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Sun, 26 Mar 2023 02:38:46 +0000 Subject: [PATCH 2/5] Increase timeout --- io/jvm/src/test/scala/fs2/io/file/WatcherSuite.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io/jvm/src/test/scala/fs2/io/file/WatcherSuite.scala b/io/jvm/src/test/scala/fs2/io/file/WatcherSuite.scala index 2c6f22cbf1..b07054531b 100644 --- a/io/jvm/src/test/scala/fs2/io/file/WatcherSuite.scala +++ b/io/jvm/src/test/scala/fs2/io/file/WatcherSuite.scala @@ -31,7 +31,7 @@ import cats.syntax.all._ import java.nio.file.WatchEvent class WatcherSuite extends Fs2Suite with BaseFileSuite { - override def munitIOTimeout = 1.minute + override def munitIOTimeout = 2.minute group("supports watching a file") { test("for modifications") { From 3f594c0aadb62537cafdeda96dadceeaf55c4d49 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Sun, 26 Mar 2023 03:10:33 +0000 Subject: [PATCH 3/5] Futz with times --- io/jvm/src/test/scala/fs2/io/file/WatcherSuite.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/io/jvm/src/test/scala/fs2/io/file/WatcherSuite.scala b/io/jvm/src/test/scala/fs2/io/file/WatcherSuite.scala index b07054531b..d7e855472b 100644 --- a/io/jvm/src/test/scala/fs2/io/file/WatcherSuite.scala +++ b/io/jvm/src/test/scala/fs2/io/file/WatcherSuite.scala @@ -31,7 +31,7 @@ import cats.syntax.all._ import java.nio.file.WatchEvent class WatcherSuite extends Fs2Suite with BaseFileSuite { - override def munitIOTimeout = 2.minute + override def munitIOTimeout = 1.minute group("supports watching a file") { test("for modifications") { @@ -168,7 +168,7 @@ class WatcherSuite extends Fs2Suite with BaseFileSuite { } private def smallDelay: Stream[IO, Nothing] = - Stream.sleep_[IO](100.millis) + Stream.sleep_[IO](1.second) // Tries to load the Oracle specific SensitivityWatchEventModifier to increase sensitivity of polling private val modifiers: Seq[WatchEvent.Modifier] = From 641b5f1e43e0c829674825835338071121ab87dd Mon Sep 17 00:00:00 2001 From: Michael Pilquist Date: Sun, 26 Mar 2023 08:58:04 -0400 Subject: [PATCH 4/5] Adjust comment for new timeout --- core/shared/src/main/scala/fs2/Stream.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/shared/src/main/scala/fs2/Stream.scala b/core/shared/src/main/scala/fs2/Stream.scala index 0e37f7a02c..4e6a57a5a1 100644 --- a/core/shared/src/main/scala/fs2/Stream.scala +++ b/core/shared/src/main/scala/fs2/Stream.scala @@ -4723,7 +4723,7 @@ object Stream extends StreamLowPriority { * * As a quick example, let's write a timed pull which emits the * string "late!" whenever a chunk of the stream is not emitted - * within 450 milliseconds: + * within 1 second: * * @example {{{ * scala> import cats.effect.IO From 635e33b84ab37ee402b36268d2665df104fc8e35 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Sun, 26 Mar 2023 06:44:38 -0700 Subject: [PATCH 5/5] Fix race condition --- core/shared/src/main/scala/fs2/Stream.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/shared/src/main/scala/fs2/Stream.scala b/core/shared/src/main/scala/fs2/Stream.scala index 4e6a57a5a1..1e01376885 100644 --- a/core/shared/src/main/scala/fs2/Stream.scala +++ b/core/shared/src/main/scala/fs2/Stream.scala @@ -4729,7 +4729,7 @@ object Stream extends StreamLowPriority { * scala> import cats.effect.IO * scala> import cats.effect.unsafe.implicits.global * scala> import scala.concurrent.duration._ - * scala> val s = (Stream("elem") ++ Stream.sleep_[IO](2.seconds)).repeat.take(3) + * scala> val s = (Stream("elem") ++ Stream.sleep_[IO](1500.millis)).repeat.take(3) * scala> s.pull * | .timed { timedPull => * | def go(timedPull: Pull.Timed[IO, String]): Pull[IO, String, Unit] =