fix retry ignore subclass of exception class

kotest · Mar 29, 2024 · 3e22202 · 3e22202
1 parent 2d62856
commit 3e22202
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/...ons/kotest-assertions-core/src/jvmTest/kotlin/com/sksamuel/kotest/assertions/RetryTest.kt b/...ons/kotest-assertions-core/src/jvmTest/kotlin/com/sksamuel/kotest/assertions/RetryTest.kt
@@ -83,6 +83,16 @@ class RetryTest : StringSpec() {
 
          testClass.times shouldBe 1
       }
+
+      "should retry in case of subclass exception"{
+         val testClass = TestClass(3)
+         runSafely {
+            retry(2, 500.milliseconds, 20.milliseconds, 1, Exception::class) {
+               testClass.throwUnexpectedException()
+            }
+         }
+         testClass.times shouldBe 2
+      }
    }
 
    private class TestClass(private val readyAfter: Int) {

diff --git a/...t-assertions/kotest-assertions-shared/src/commonMain/kotlin/io/kotest/assertions/Retry.kt b/...t-assertions/kotest-assertions-shared/src/commonMain/kotlin/io/kotest/assertions/Retry.kt
@@ -78,7 +78,7 @@ suspend fun <T> retry(
          when {
             // Not the kind of exceptions we were prepared to tolerate
             e::class.simpleName != "AssertionError" &&
-               e::class != config.exceptionClass &&
+               config.exceptionClass?.isInstance(e) == false &&
                e::class.bestName() != "org.opentest4j.AssertionFailedError" &&
                !e::class.bestName().endsWith("AssertionFailedError") -> throw e
          }