Merge pull request #768 from mzuehlke/infinite-timeouts

Handle infinite timeouts
scalameta · Apr 19, 2024 · cd435cb · cd435cb
2 parents 7197bea + 067c717
commit cd435cb
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 15 deletions.
diff --git a/munit/js/src/main/scala/munit/internal/PlatformCompat.scala b/munit/js/src/main/scala/munit/internal/PlatformCompat.scala
@@ -36,16 +36,20 @@ object PlatformCompat {
       ec: ExecutionContext
   ): Future[T] = {
     val onComplete = Promise[T]()
-    val timeoutHandle = timers.setTimeout(duration.toMillis) {
-      onComplete.tryFailure(
-        new TimeoutException(s"test timed out after $duration")
-      )
-    }
+    val timeoutHandle =
+      if (duration.isFinite)
+        Some(timers.setTimeout(duration.toMillis) {
+          onComplete.tryFailure(
+            new TimeoutException(s"test timed out after $duration")
+          )
+        })
+      else
+        None
     ec.execute(new Runnable {
       def run(): Unit = {
         startFuture().onComplete { result =>
           onComplete.tryComplete(result)
-          timers.clearTimeout(timeoutHandle)
+          timeoutHandle.foreach(timers.clearTimeout(_))
         }(ec)
       }
     })

diff --git a/munit/jvm/src/main/scala/munit/internal/PlatformCompat.scala b/munit/jvm/src/main/scala/munit/internal/PlatformCompat.scala
@@ -56,19 +56,25 @@ object PlatformCompat {
       ec: ExecutionContext
   ): Future[T] = {
     val onComplete = Promise[T]()
-    val timeout = sh.schedule[Unit](
-      () =>
-        onComplete.tryFailure(
-          new TimeoutException(s"test timed out after $duration")
-        ),
-      duration.toMillis,
-      TimeUnit.MILLISECONDS
-    )
+    val timeout =
+      if (duration.isFinite)
+        Some(
+          sh.schedule[Unit](
+            () =>
+              onComplete.tryFailure(
+                new TimeoutException(s"test timed out after $duration")
+              ),
+            duration.toMillis,
+            TimeUnit.MILLISECONDS
+          )
+        )
+      else
+        None
     ec.execute(new Runnable {
       def run(): Unit = {
         startFuture().onComplete { result =>
           onComplete.tryComplete(result)
-          timeout.cancel(false)
+          timeout.foreach(_.cancel(false))
         }(ec)
       }
     })