Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Throw exception from user code in SpringFailOnTimeout even if a timeout occurs

Browse Source 
Issue: SPR-16717
This commit is contained in:
Igor Suhorukov
2018-04-12 11:37:13 +03:00
committed by Sam Brannen
parent 697d2e326f
commit 3c34a1cb8c
2 changed files with 50 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeout.java
View File

@@ -88,15 +88,11 @@ public class SpringFailOnTimeout extends Statement {
}
else {
long startTime = System.currentTimeMillis();
try {
this.next.evaluate();
}
finally {
long elapsed = System.currentTimeMillis() - startTime;
if (elapsed > this.timeout) {
throw new TimeoutException(
String.format("Test took %s ms; limit was %s ms.", elapsed, this.timeout));
}
this.next.evaluate();
long elapsed = System.currentTimeMillis() - startTime;
if (elapsed > this.timeout) {
throw new TimeoutException(
String.format("Test took %s ms; limit was %s ms.", elapsed, this.timeout));
}
}
}