diff --git a/spock-core/src/main/java/org/spockframework/runtime/extension/builtin/RepeatUntilFailureExtension.java b/spock-core/src/main/java/org/spockframework/runtime/extension/builtin/RepeatUntilFailureExtension.java index a60ba7b74f..129e21b6d7 100644 --- a/spock-core/src/main/java/org/spockframework/runtime/extension/builtin/RepeatUntilFailureExtension.java +++ b/spock-core/src/main/java/org/spockframework/runtime/extension/builtin/RepeatUntilFailureExtension.java @@ -37,12 +37,8 @@ public void runIterations(IDataIterator dataIterator, IIterationRunner iteration dataIterator.forEachRemaining(data::add); for (int attempt = 0; attempt < maxAttempts; attempt++) { for (Object[] dataValues : data) { - try { - ExecutionResult executionResult = iterationRunner.runIteration(dataValues, maxIterations).get(); - if (executionResult == ExecutionResult.FAILED) { - return; - } - } catch (InterruptedException | ExecutionException e) { + ExecutionResult executionResult = iterationRunner.runIteration(dataValues, maxIterations).join(); + if (executionResult == ExecutionResult.FAILED) { return; } } diff --git a/spock-core/src/main/java/org/spockframework/runtime/extension/builtin/TimeoutInterceptor.java b/spock-core/src/main/java/org/spockframework/runtime/extension/builtin/TimeoutInterceptor.java index 28bc6da492..2c0e8050fe 100644 --- a/spock-core/src/main/java/org/spockframework/runtime/extension/builtin/TimeoutInterceptor.java +++ b/spock-core/src/main/java/org/spockframework/runtime/extension/builtin/TimeoutInterceptor.java @@ -70,9 +70,34 @@ public void run() { long timeoutAt = 0; int unsuccessfulInterruptAttempts = 0; - syncWithThread(startLatch, "feature", methodName); + boolean syncedWithFeature = false; + try { + startLatch.countDown(); + syncedWithFeature = startLatch.await(5, TimeUnit.SECONDS); + } catch (InterruptedException ignored) { + // this is our own thread, so we can ignore the interruption safely + } + if (!syncedWithFeature) { + System.out.printf("[spock.lang.Timeout] Could not sync with Feature for method '%s'", methodName); + } + while (waitMillis > 0) { + long waitStart = System.nanoTime(); + try { + synced = sync.offer(stackTrace, waitMillis, TimeUnit.MILLISECONDS); + } catch (InterruptedException ignored) { + // this is our own thread, so we can ignore the interruption safely and continue the remaining waiting + waitMillis -= TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - waitStart); + continue; + } + break; + } + if (!synced) { + stackTrace = mainThread.getStackTrace(); + waitMillis = 250; + } while (!synced) { + mainThread.interrupt(); try { synced = sync.offer(stackTrace, waitMillis, TimeUnit.MILLISECONDS); } catch (InterruptedException ignored) { @@ -80,23 +105,22 @@ public void run() { // the latter returns. Once this mission has been accomplished, this thread will die quickly } if (!synced) { - long now = System.nanoTime(); - if (stackTrace.length == 0) { - logMethodTimeout(methodName, timeoutSeconds); - stackTrace = mainThread.getStackTrace(); - waitMillis = 250; - timeoutAt = now; - } else { - waitMillis *= 2; - logUnsuccessfulInterrupt(methodName, now, timeoutAt, waitMillis, ++unsuccessfulInterruptAttempts); - } - mainThread.interrupt(); + System.out.printf("[spock.lang.Timeout] Method '%s' has not yet returned - interrupting. Next try in %1.2f seconds.\n", + methodName, waitMillis / 1000.); } } } }.start(); - syncWithThread(startLatch, "watcher", methodName); + boolean syncedWithWatcher = false; + try { + startLatch.countDown(); + syncedWithWatcher = startLatch.await(5, TimeUnit.SECONDS); + } finally { + if (!syncedWithWatcher) { + System.out.printf("[spock.lang.Timeout] Could not sync with Watcher for method '%s'", invocation.getMethod().getName()); + } + } Throwable saved = null; try { @@ -216,13 +240,4 @@ private static Pair findThreadSection(List lines, Stri return null; } - - private static void syncWithThread(CountDownLatch startLatch, String threadName, String methodName) { - try { - startLatch.countDown(); - startLatch.await(5, TimeUnit.SECONDS); - } catch (InterruptedException ignored) { - System.out.printf("[spock.lang.Timeout] Could not sync with %s thread for method '%s'", threadName, methodName); - } - } } diff --git a/spock-core/src/main/java/spock/util/concurrent/AsyncConditions.java b/spock-core/src/main/java/spock/util/concurrent/AsyncConditions.java index b010f78793..a56657a979 100644 --- a/spock-core/src/main/java/spock/util/concurrent/AsyncConditions.java +++ b/spock-core/src/main/java/spock/util/concurrent/AsyncConditions.java @@ -131,15 +131,14 @@ public void await() throws Throwable { * @throws Throwable the first exception thrown by an evaluate block */ public void await(double seconds) throws Throwable { - latch.await((long) (seconds * 1000), TimeUnit.MILLISECONDS); + boolean evalBlocksFinished = latch.await((long) (seconds * 1000), TimeUnit.MILLISECONDS); if (!exceptions.isEmpty()) throw exceptions.poll(); - long pendingEvalBlocks = latch.getCount(); - if (pendingEvalBlocks > 0) { + if (!evalBlocksFinished) { String msg = String.format("Async conditions timed out " + "after %1.2f seconds; %d out of %d evaluate blocks did not complete in time", - seconds, pendingEvalBlocks, numEvalBlocks); + seconds, latch.getCount(), numEvalBlocks); throw new SpockTimeoutError(seconds, msg); } } diff --git a/spock-specs/src/test/groovy/org/spockframework/smoke/extension/ParallelSpec.groovy b/spock-specs/src/test/groovy/org/spockframework/smoke/extension/ParallelSpec.groovy index 8e24026c35..fdc9fdc2d1 100644 --- a/spock-specs/src/test/groovy/org/spockframework/smoke/extension/ParallelSpec.groovy +++ b/spock-specs/src/test/groovy/org/spockframework/smoke/extension/ParallelSpec.groovy @@ -265,7 +265,7 @@ class ParallelSpec extends EmbeddedSpecification { @ResourceLock(value = "a", mode = ResourceAccessMode.READ) def writeA() { when: - incrementAndBlock(atomicInteger, latch) + incrementAndBlock(atomicInteger, latch, 10000) then: atomicInteger.get() == 3 @@ -519,7 +519,7 @@ class ParallelSpec extends EmbeddedSpecification { throws InterruptedException { int value = sharedResource.incrementAndGet() countDownLatch.countDown() - countDownLatch.await(timeout, MILLISECONDS) + assert countDownLatch.await(timeout, MILLISECONDS) : 'Timeout expired' return value } @@ -527,7 +527,7 @@ class ParallelSpec extends EmbeddedSpecification { throws InterruptedException { int value = sharedResource.get() countDownLatch.countDown() - countDownLatch.await(timeout, MILLISECONDS) + assert countDownLatch.await(timeout, MILLISECONDS) : 'Timeout expired' assert value == sharedResource.get() } } diff --git a/spock-specs/src/test/groovy/org/spockframework/smoke/mock/InvokingMocksFromMultipleThreads.groovy b/spock-specs/src/test/groovy/org/spockframework/smoke/mock/InvokingMocksFromMultipleThreads.groovy index c3713edc85..cecf027bc2 100644 --- a/spock-specs/src/test/groovy/org/spockframework/smoke/mock/InvokingMocksFromMultipleThreads.groovy +++ b/spock-specs/src/test/groovy/org/spockframework/smoke/mock/InvokingMocksFromMultipleThreads.groovy @@ -42,7 +42,7 @@ class InvokingMocksFromMultipleThreads extends Specification { } } } - latch.await(10, TimeUnit.SECONDS) + assert latch.await(10, TimeUnit.SECONDS) : 'Timeout expired' then: interaction { @@ -68,7 +68,7 @@ class InvokingMocksFromMultipleThreads extends Specification { } } } - latch.await(10, TimeUnit.SECONDS) + assert latch.await(10, TimeUnit.SECONDS) : 'Timeout expired' then: interaction { @@ -93,7 +93,7 @@ class InvokingMocksFromMultipleThreads extends Specification { } } } - latch.await(10, TimeUnit.SECONDS) + assert latch.await(10, TimeUnit.SECONDS) : 'Timeout expired' then: interaction {