Fix exception handling in cancel

softwaremill · Aug 30, 2023 · 90428c2 · 90428c2
1 parent bef5eff
commit 90428c2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/core/src/main/scala/ox/fork.scala b/core/src/main/scala/ox/fork.scala
@@ -111,8 +111,7 @@ def forkCancellable[T](f: => T)(using Ox): CancellableFork[T] =
       try Right(result.get())
       catch
         case e: ExecutionException => Left(e.getCause)
-        case e: Throwable          => Left(e)
-//        case NonFatal(e)           => Left(e)
+        case NonFatal(e)           => Left(e)
 
     override def cancelNow(): Unit =
       // will cause the scope to end, interrupting the task if it hasn't yet finished (or potentially never starting it)

diff --git a/core/src/test/scala/ox/ForkTest.scala b/core/src/test/scala/ox/ForkTest.scala
@@ -140,7 +140,7 @@ class ForkTest extends AnyFlatSpec with Matchers {
       val s = Semaphore(0)
       scoped {
         val f = forkCancellable {
-          trail.add("started")
+          // trail.add("started") // uncommenting this makes interruption to get swallowed by SBT's runner from time to time ...
           try
             s.acquire()
             trail.add("main done")
@@ -159,7 +159,7 @@ class ForkTest extends AnyFlatSpec with Matchers {
       }
       if trail.get.length == 1
       then trail.get shouldBe Vector("cancel done") // the fork wasn't even started
-      else trail.get shouldBe Vector("started", "interrupted", "interrupted done", "cancel done")
+      else trail.get shouldBe Vector("interrupted", "interrupted done", "cancel done")
     }
   }