From 712cb8fd0b292a6851b40417faa13e036e4089e3 Mon Sep 17 00:00:00 2001 From: Adam Fraser Date: Sun, 12 Feb 2023 11:48:58 -0800 Subject: [PATCH 1/2] add test aspect timed --- core-tests/shared/src/test/scala/zio/ZIOBaseSpec.scala | 4 ++-- test-tests/shared/src/test/scala/zio/test/ZIOBaseSpec.scala | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core-tests/shared/src/test/scala/zio/ZIOBaseSpec.scala b/core-tests/shared/src/test/scala/zio/ZIOBaseSpec.scala index 580913b4f3d7..f6775e17d0bb 100644 --- a/core-tests/shared/src/test/scala/zio/ZIOBaseSpec.scala +++ b/core-tests/shared/src/test/scala/zio/ZIOBaseSpec.scala @@ -6,8 +6,8 @@ import scala.annotation.tailrec trait ZIOBaseSpec extends ZIOSpecDefault { override def aspects: Chunk[TestAspectPoly] = - if (TestPlatform.isJVM) Chunk(TestAspect.timeout(120.seconds)) - else Chunk(TestAspect.timeout(120.seconds), TestAspect.sequential) + if (TestPlatform.isJVM) Chunk(TestAspect.timeout(120.seconds), TestAspect.timed) + else Chunk(TestAspect.timeout(120.seconds), TestAspect.sequential, TestAspect.timed) sealed trait ZIOTag { val value: String diff --git a/test-tests/shared/src/test/scala/zio/test/ZIOBaseSpec.scala b/test-tests/shared/src/test/scala/zio/test/ZIOBaseSpec.scala index b65cd96a5a7d..98fb534f10f3 100644 --- a/test-tests/shared/src/test/scala/zio/test/ZIOBaseSpec.scala +++ b/test-tests/shared/src/test/scala/zio/test/ZIOBaseSpec.scala @@ -4,6 +4,6 @@ import zio._ trait ZIOBaseSpec extends ZIOSpecDefault { override def aspects: Chunk[TestAspectAtLeastR[TestEnvironment]] = - if (TestPlatform.isJVM) Chunk(TestAspect.timeout(120.seconds)) - else Chunk(TestAspect.timeout(120.seconds), TestAspect.sequential) + if (TestPlatform.isJVM) Chunk(TestAspect.timeout(120.seconds), TestAspect.timed) + else Chunk(TestAspect.timeout(120.seconds), TestAspect.sequential, TestAspect.timed) } From bd4f6e53e0d161e7df653094204e02946cdbfed2 Mon Sep 17 00:00:00 2001 From: Adam Fraser Date: Sun, 12 Feb 2023 11:50:24 -0800 Subject: [PATCH 2/2] managed tests --- .../shared/src/test/scala/zio/managed/ZIOBaseSpec.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/managed-tests/shared/src/test/scala/zio/managed/ZIOBaseSpec.scala b/managed-tests/shared/src/test/scala/zio/managed/ZIOBaseSpec.scala index b68d19e4aea7..d3ce19c5fd68 100644 --- a/managed-tests/shared/src/test/scala/zio/managed/ZIOBaseSpec.scala +++ b/managed-tests/shared/src/test/scala/zio/managed/ZIOBaseSpec.scala @@ -7,8 +7,8 @@ import scala.annotation.tailrec trait ZIOBaseSpec extends ZIOSpecDefault { override def aspects: Chunk[TestAspectPoly] = - if (TestPlatform.isJVM) Chunk(TestAspect.timeout(120.seconds)) - else Chunk(TestAspect.timeout(120.seconds)) + if (TestPlatform.isJVM) Chunk(TestAspect.timeout(120.seconds), TestAspect.timed) + else Chunk(TestAspect.timeout(120.seconds), TestAspect.timed) sealed trait ZIOTag { val value: String