diff --git a/tests/js/src/test/scala/cats/effect/unsafe/StripedHashtableSuite.scala b/tests/js/src/test/scala/cats/effect/unsafe/StripedHashtableSuite.scala index d93460f293..b8acc7db22 100644 --- a/tests/js/src/test/scala/cats/effect/unsafe/StripedHashtableSuite.scala +++ b/tests/js/src/test/scala/cats/effect/unsafe/StripedHashtableSuite.scala @@ -24,7 +24,7 @@ import scala.concurrent.duration._ class StripedHashtableSuite extends BaseSuite { - override def executionTimeout: FiniteDuration = 2.minutes + override def munitTimeout: FiniteDuration = 2.minutes def hashtableRuntime(): IORuntime = IORuntime( diff --git a/tests/jvm/src/test/scala/cats/effect/ParasiticECSuite.scala b/tests/jvm/src/test/scala/cats/effect/ParasiticECSuite.scala index 6b9956d47f..600e791d65 100644 --- a/tests/jvm/src/test/scala/cats/effect/ParasiticECSuite.scala +++ b/tests/jvm/src/test/scala/cats/effect/ParasiticECSuite.scala @@ -25,7 +25,7 @@ import scala.concurrent.duration._ class ParasiticECSuite extends BaseSuite with TestInstances { - override def executionTimeout: FiniteDuration = 60.seconds + override def munitTimeout: FiniteDuration = 60.seconds real("evaluate fibers correctly in presence of a parasitic execution context") { val test = { diff --git a/tests/jvm/src/test/scala/cats/effect/unsafe/BlockingStressSuite.scala b/tests/jvm/src/test/scala/cats/effect/unsafe/BlockingStressSuite.scala index e4f6242061..9b6f59e18a 100644 --- a/tests/jvm/src/test/scala/cats/effect/unsafe/BlockingStressSuite.scala +++ b/tests/jvm/src/test/scala/cats/effect/unsafe/BlockingStressSuite.scala @@ -27,7 +27,7 @@ import java.util.concurrent.CountDownLatch class BlockingStressSuite extends BaseSuite { - override def executionTimeout: FiniteDuration = 30.seconds + override def munitTimeout: FiniteDuration = 30.seconds // This test spawns a lot of helper threads. private val count = 1000 diff --git a/tests/jvm/src/test/scala/cats/effect/unsafe/StripedHashtableSuite.scala b/tests/jvm/src/test/scala/cats/effect/unsafe/StripedHashtableSuite.scala index a4aa4bf189..3d59f8311b 100644 --- a/tests/jvm/src/test/scala/cats/effect/unsafe/StripedHashtableSuite.scala +++ b/tests/jvm/src/test/scala/cats/effect/unsafe/StripedHashtableSuite.scala @@ -25,7 +25,7 @@ import java.util.concurrent.CountDownLatch class StripedHashtableSuite extends BaseSuite { - override def executionTimeout: FiniteDuration = 30.seconds + override def munitTimeout: FiniteDuration = 30.seconds def hashtableRuntime(): IORuntime = { lazy val rt: IORuntime = { diff --git a/tests/shared/src/test/scala/cats/effect/IOPropSuite.scala b/tests/shared/src/test/scala/cats/effect/IOPropSuite.scala index c91865e44e..43aa2663e6 100644 --- a/tests/shared/src/test/scala/cats/effect/IOPropSuite.scala +++ b/tests/shared/src/test/scala/cats/effect/IOPropSuite.scala @@ -30,7 +30,7 @@ import munit.DisciplineSuite //We allow these tests to have a longer timeout than IOSpec as they run lots of iterations class IOPropSuite extends BaseSuite with DisciplineSuite { - override def executionTimeout: FiniteDuration = 2.minutes + override def munitTimeout: FiniteDuration = 2.minutes realProp( "parTraverseN should give the same result as parTraverse", diff --git a/tests/shared/src/test/scala/cats/effect/Runners.scala b/tests/shared/src/test/scala/cats/effect/Runners.scala index c6a315e8cf..a2100ca771 100644 --- a/tests/shared/src/test/scala/cats/effect/Runners.scala +++ b/tests/shared/src/test/scala/cats/effect/Runners.scala @@ -33,7 +33,7 @@ import munit.internal.PlatformCompat trait Runners extends TestInstances with RunnersPlatform { self: FunSuite => - def executionTimeout: FiniteDuration = 20.seconds + override def munitTimeout: FiniteDuration = 20.seconds def ticked(options: TestOptions)(body: Ticker => Any)(implicit loc: Location): Unit = test(options)(body(Ticker(TestContext()))) @@ -41,7 +41,7 @@ trait Runners extends TestInstances with RunnersPlatform { def real[A](options: TestOptions)(body: => IO[A])(implicit loc: Location): Unit = test(options) { val (fut, cancel) = body.unsafeToFutureCancelable()(runtime()) - timeout(fut, cancel, executionTimeout) + timeout(fut, cancel, munitTimeout) } /* @@ -59,7 +59,7 @@ trait Runners extends TestInstances with RunnersPlatform { test(options) { val rt = runtime() val (fut, cancel) = f(rt).unsafeToFutureCancelable()(rt) - timeout(fut, cancel, executionTimeout) + timeout(fut, cancel, munitTimeout) } def assertCompleteAs[A: Eq: Show](ioa: IO[A], expected: A)( diff --git a/tests/shared/src/test/scala/cats/effect/std/DequeueSuite.scala b/tests/shared/src/test/scala/cats/effect/std/DequeueSuite.scala index 1ada14a6e3..a764680b2b 100644 --- a/tests/shared/src/test/scala/cats/effect/std/DequeueSuite.scala +++ b/tests/shared/src/test/scala/cats/effect/std/DequeueSuite.scala @@ -27,7 +27,7 @@ import scala.concurrent.duration._ class BoundedDequeueSuite extends BaseSuite with DequeueTests { - override def executionTimeout = 20.seconds + override def munitTimeout = 20.seconds boundedDequeueTests( "BoundedDequeue (forward)", diff --git a/tests/shared/src/test/scala/cats/effect/std/DispatcherSuite.scala b/tests/shared/src/test/scala/cats/effect/std/DispatcherSuite.scala index aed00eb189..51424b500a 100644 --- a/tests/shared/src/test/scala/cats/effect/std/DispatcherSuite.scala +++ b/tests/shared/src/test/scala/cats/effect/std/DispatcherSuite.scala @@ -28,7 +28,7 @@ import java.util.concurrent.atomic.AtomicInteger class DispatcherSuite extends BaseSuite with DetectPlatform { - override def executionTimeout = 30.seconds + override def munitTimeout = 30.seconds { val D = Dispatcher.sequential[IO](await = true) diff --git a/tests/shared/src/test/scala/cats/effect/std/MutexSuite.scala b/tests/shared/src/test/scala/cats/effect/std/MutexSuite.scala index 0cf32e89de..62379aa4fb 100644 --- a/tests/shared/src/test/scala/cats/effect/std/MutexSuite.scala +++ b/tests/shared/src/test/scala/cats/effect/std/MutexSuite.scala @@ -25,7 +25,7 @@ import scala.concurrent.duration._ final class MutexSuite extends BaseSuite with DetectPlatform { - final override def executionTimeout = 2.minutes + final override def munitTimeout = 2.minutes tests("ConcurrentMutex", Mutex.apply[IO]) tests("Mutex with dual constructors", Mutex.in[IO, IO]) diff --git a/tests/shared/src/test/scala/cats/effect/std/PQueueSuite.scala b/tests/shared/src/test/scala/cats/effect/std/PQueueSuite.scala index 9b6c102b51..b4bf65e4eb 100644 --- a/tests/shared/src/test/scala/cats/effect/std/PQueueSuite.scala +++ b/tests/shared/src/test/scala/cats/effect/std/PQueueSuite.scala @@ -33,7 +33,7 @@ import scala.concurrent.duration._ class BoundedPQueueSuite extends BaseSuite with PQueueTests { - override def executionTimeout = 20.seconds + override def munitTimeout = 20.seconds implicit val orderForInt: Order[Int] = Order.fromLessThan((x, y) => x < y) @@ -113,7 +113,7 @@ class BoundedPQueueSuite extends BaseSuite with PQueueTests { class UnboundedPQueueSuite extends BaseSuite with PQueueTests { - override def executionTimeout = 20.seconds + override def munitTimeout = 20.seconds implicit val orderForInt: Order[Int] = Order.fromLessThan((x, y) => x < y) diff --git a/tests/shared/src/test/scala/cats/effect/std/UnsafeBoundedSuite.scala b/tests/shared/src/test/scala/cats/effect/std/UnsafeBoundedSuite.scala index 88bfcafb93..e0df9de47b 100644 --- a/tests/shared/src/test/scala/cats/effect/std/UnsafeBoundedSuite.scala +++ b/tests/shared/src/test/scala/cats/effect/std/UnsafeBoundedSuite.scala @@ -24,7 +24,7 @@ import scala.concurrent.duration._ class UnsafeBoundedSuite extends BaseSuite { import Queue.UnsafeBounded - override def executionTimeout = 30.seconds + override def munitTimeout = 30.seconds // NB: emperically, it seems this needs to be > availableProcessors() to be effective val length = 1000