Fix ownJob not always completing

Kotlin · Oct 27, 2021 · 2cddb28 · 2cddb28
1 parent b43b87d
commit 2cddb28
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/kotlinx-coroutines-test/common/src/TestCoroutineScope.kt b/kotlinx-coroutines-test/common/src/TestCoroutineScope.kt
@@ -45,11 +45,13 @@ private class TestCoroutineScopeImpl(
     private val initialJobs = coroutineContext.activeJobs()
 
     override fun cleanupTestCoroutines() {
-        coroutineContext.uncaughtExceptionCaptor.cleanupTestCoroutinesCaptor()
-        coroutineContext.delayController?.cleanupTestCoroutines()
-        val jobs = coroutineContext.activeJobs()
-        if ((jobs - initialJobs).isNotEmpty()) {
-            val exception = UncompletedCoroutinesError("Test finished with active jobs: $jobs")
+        try {
+            coroutineContext.uncaughtExceptionCaptor.cleanupTestCoroutinesCaptor()
+            coroutineContext.delayController?.cleanupTestCoroutines()
+            val jobs = coroutineContext.activeJobs()
+            if ((jobs - initialJobs).isNotEmpty())
+                throw UncompletedCoroutinesError("Test finished with active jobs: $jobs")
+        } catch (exception: Throwable) {
             ownJob?.completeExceptionally(exception)
             throw exception
         }