Fix tests running forever

sunkup · sunkup · commit 25c43f4f1c58 · 2025-02-26T09:55:39.000+01:00
diff --git a/lib/src/androidTest/java/at/bitfire/cert4android/UserDecisionRegistryTest.kt b/lib/src/androidTest/java/at/bitfire/cert4android/UserDecisionRegistryTest.kt
@@ -63,13 +63,16 @@ class UserDecisionRegistryTest {
             }
         }
         val results = Collections.synchronizedList(mutableListOf<Boolean>())
-        runBlocking {
-            repeat(5) {
-                launch(Dispatchers.Default) {
-                    results += registry.check(testCert, this, getUserDecision)
+        runBlocking(Dispatchers.Default) {
+            try {
+                repeat(5) {
+                    launch {
+                        results += registry.check(testCert, this, getUserDecision)
+                    }
                 }
+            } finally {
+                canSendFeedback.release()
             }
-            canSendFeedback.release()
         }
         synchronized(registry.pendingDecisions) {
             assertFalse(registry.pendingDecisions.containsKey(testCert))
@@ -89,13 +92,16 @@ class UserDecisionRegistryTest {
             }
         }
         val results = Collections.synchronizedList(mutableListOf<Boolean>())
-        runBlocking {
-            repeat(5) {
-                launch(Dispatchers.Default) {
-                    results += registry.check(testCert, this, getUserDecision)
+        runBlocking(Dispatchers.Default) {
+            try {
+                repeat(5) {
+                    launch {
+                        results += registry.check(testCert, this, getUserDecision)
+                    }
                 }
+            } finally {
+                canSendFeedback.release()
             }
-            canSendFeedback.release()
         }
         synchronized(registry.pendingDecisions) {
             assertFalse(registry.pendingDecisions.containsKey(testCert))

Original file line number	Diff line number	Diff line change
`@@ -63,13 +63,16 @@ class UserDecisionRegistryTest {`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`	`val results = Collections.synchronizedList(mutableListOf<Boolean>())`
`66`		`- runBlocking {`
`67`		`- repeat(5) {`
`68`		`- launch(Dispatchers.Default) {`
`69`		`- results += registry.check(testCert, this, getUserDecision)`
	`66`	`+ runBlocking(Dispatchers.Default) {`
	`67`	`+ try {`
	`68`	`+ repeat(5) {`
	`69`	`+ launch {`
	`70`	`+ results += registry.check(testCert, this, getUserDecision)`
	`71`	`+ }`
`70`	`72`	`}`
	`73`	`+ } finally {`
	`74`	`+ canSendFeedback.release()`
`71`	`75`	`}`
`72`		`- canSendFeedback.release()`
`73`	`76`	`}`
`74`	`77`	`synchronized(registry.pendingDecisions) {`
`75`	`78`	`assertFalse(registry.pendingDecisions.containsKey(testCert))`
`@@ -89,13 +92,16 @@ class UserDecisionRegistryTest {`
`89`	`92`	`}`
`90`	`93`	`}`
`91`	`94`	`val results = Collections.synchronizedList(mutableListOf<Boolean>())`
`92`		`- runBlocking {`
`93`		`- repeat(5) {`
`94`		`- launch(Dispatchers.Default) {`
`95`		`- results += registry.check(testCert, this, getUserDecision)`
	`95`	`+ runBlocking(Dispatchers.Default) {`
	`96`	`+ try {`
	`97`	`+ repeat(5) {`
	`98`	`+ launch {`
	`99`	`+ results += registry.check(testCert, this, getUserDecision)`
	`100`	`+ }`
`96`	`101`	`}`
	`102`	`+ } finally {`
	`103`	`+ canSendFeedback.release()`
`97`	`104`	`}`
`98`		`- canSendFeedback.release()`
`99`	`105`	`}`
`100`	`106`	`synchronized(registry.pendingDecisions) {`
`101`	`107`	`assertFalse(registry.pendingDecisions.containsKey(testCert))`