fix atMost + timeout verify

this is addressed to fix mockk#1169
s4ysolutions · Nov 21, 2023 · 3dc1034 · 3dc1034
1 parent fa0fb5a
commit 3dc1034
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/modules/mockk/src/commonMain/kotlin/io/mockk/impl/verify/TimeoutVerifier.kt b/modules/mockk/src/commonMain/kotlin/io/mockk/impl/verify/TimeoutVerifier.kt
@@ -17,10 +17,14 @@ class TimeoutVerifier(
         val stubs = verificationSequence.allStubs(stubRepo)
 
         val session = stubRepo.openRecordCallAwaitSession(stubs, params.timeout)
+        val startTime = System.currentTimeMillis()
         try {
             while (true) {
                 val result = verifierChain.verify(verificationSequence, params)
-                if (params.inverse != result.matches) {
+                // With atMost set the reaching expected result does not mean test passed
+                //  - it can fail till the end of the timeout
+                if (params.inverse != result.matches && 
+                        (params.max != Int.MAX_VALUE && (System.currentTimeMillis() - startTime < params.timeout))) {
                     return result // passed
                 }
                 if (!session.wait()) {