zio · jdegoes · Sep 11, 2021 · Sep 10, 2021 · Sep 10, 2021 · Sep 10, 2021
diff --git a/test-tests/shared/src/test/scala/zio/test/TestSpec.scala b/test-tests/shared/src/test/scala/zio/test/TestSpec.scala
@@ -1,14 +1,20 @@
 package zio.test
 
+import zio._
 import zio.Clock._
+import zio.test.environment._
 import zio.test.Assertion._
-import zio.test.TestAspect.failing
+import zio.test.TestAspect.{failing, timeout}
 import zio.test.TestUtils.execute
-import zio.{Clock, Has, ZIO}
 
 object TestSpec extends ZIOBaseSpec {
 
-  def spec: Spec[Has[Clock], TestFailure[Any], TestSuccess] = suite("TestSpec")(
+  override val runner: TestRunner[TestEnvironment, Any] =
+    defaultTestRunner.withRuntimeConfig { runtimeConfig =>
+      runtimeConfig.copy(logger = runtimeConfig.logger.filterLogLevel(_ >= LogLevel.Error))
+    }
+
+  def spec: Spec[Environment, TestFailure[Any], TestSuccess] = suite("TestSpec")(
     test("assertM works correctly") {
       assertM(nanoTime)(equalTo(0L))
     },
@@ -39,6 +45,13 @@ object TestSpec extends ZIOBaseSpec {
       for {
         _ <- execute(spec)
       } yield assert(n)(equalTo(1))
-    }
+    },
+    test("test does not wait to interrupt children") {
+      for {
+        promise <- Promise.make[Nothing, Unit]
+        _       <- (promise.succeed(()) *> Live.live(ZIO.sleep(20.seconds))).uninterruptible.fork
+        _       <- promise.await
+      } yield assertCompletes
+    } @@ timeout(10.seconds)
   )
 }
diff --git a/test/shared/src/main/scala/zio/test/TestAspect.scala b/test/shared/src/main/scala/zio/test/TestAspect.scala
@@ -881,7 +881,7 @@ object TestAspect extends TimeoutVariants {
   def verify[R0, E0](condition: => ZIO[R0, E0, TestResult]): TestAspect[Nothing, R0, E0, Any] =
     new TestAspect.PerTest[Nothing, R0, E0, Any] {
       def perTest[R <: R0, E >: E0](test: ZIO[R, TestFailure[E], TestSuccess]): ZIO[R, TestFailure[E], TestSuccess] =
-        test <* ZTest(condition)
+        test <* ZTest("verify", condition)
     }
 
   /**

diff --git a/test/shared/src/main/scala/zio/test/TestConstructor.scala b/test/shared/src/main/scala/zio/test/TestConstructor.scala
@@ -27,7 +27,7 @@ trait TestConstructorLowPriority1 extends TestConstructorLowPriority2 {
         Spec.labeled(
           label,
           Spec
-            .test(ZTest(assertion), TestAnnotationMap.empty)
+            .test(ZTest(label, assertion), TestAnnotationMap.empty)
             .annotate(TestAnnotation.location, location :: Nil)
         )
     }
@@ -52,7 +52,7 @@ trait TestConstructorLowPriority3 {
         Spec.labeled(
           label,
           Spec
-            .test(ZTest(assertion), TestAnnotationMap.empty)
+            .test(ZTest(label, assertion), TestAnnotationMap.empty)
             .annotate(TestAnnotation.location, location :: Nil)
         )
     }

diff --git a/test/shared/src/main/scala/zio/test/package.scala b/test/shared/src/main/scala/zio/test/package.scala
@@ -103,9 +103,25 @@ package object test extends CompileVariants {
     /**
      * Builds a test with an effectual assertion.
      */
-    def apply[R, E](assertion: => ZIO[R, E, TestResult]): ZIO[R, TestFailure[E], TestSuccess] =
+    def apply[R, E](label: String, assertion: => ZIO[R, E, TestResult]): ZIO[R, TestFailure[E], TestSuccess] =
       ZIO
         .suspendSucceed(assertion)
+        .overrideForkScope(ZScope.global)
+        .ensuringChildren { children =>
+          ZIO.foreach(children) { child =>
+            val warning =
+              s"Warning: ZIO Test is attempting to interrupt fiber " +
+                s"${child.id} forked in test $label due to automatic, " +
+                "supervision, but interruption has taken more than 10 " +
+                "seconds to complete. This may indicate a resource leak. " +
+                "Make sure you are not forking a fiber in an " +
+                "uninterruptible region."
+            for {
+              fiber <- ZIO.logWarning(warning).delay(10.seconds).provide(Has(Clock.ClockLive)).interruptible.forkDaemon
+              _     <- (child.interrupt *> fiber.interrupt).forkDaemon
+            } yield ()
+          }
+        }
         .foldCauseZIO(
           cause => ZIO.fail(TestFailure.Runtime(cause)),
           _.failures match {