eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 16:14:10 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

JUnit: don't kill test runner after timeout

Browse Source
This commit is contained in:
Alexey Andreev 2021-03-17 23:31:52 +03:00
parent a8eebd7e1a
commit b5ad203631
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/junit/src/main/java/org/teavm/junit/TeaVMTestRunner.java
View File

@ -41,7 +41,6 @@ import java.util.Properties;
import java.util.Set; import java.util.Set;
import java.util.WeakHashMap; import java.util.WeakHashMap;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
@ -136,7 +135,6 @@ public class TeaVMTestRunner extends Runner implements Filterable {
static class RunnerKindInfo { static class RunnerKindInfo {
volatile TestRunner runner; volatile TestRunner runner;
volatile TestRunStrategy strategy; volatile TestRunStrategy strategy;
volatile ScheduledFuture<?> cleanupFuture;
} }
static { static {
@ -147,7 +145,6 @@ public class TeaVMTestRunner extends Runner implements Filterable {
synchronized (TeaVMTestRunner.class) { synchronized (TeaVMTestRunner.class) {
for (RunnerKindInfo info : runners.values()) { for (RunnerKindInfo info : runners.values()) {
if (info.runner != null) { if (info.runner != null) {
info.cleanupFuture = null;
info.runner.stop(); info.runner.stop();
info.runner.waitForCompletion(); info.runner.waitForCompletion();
} }
@ -935,19 +932,13 @@ public class TeaVMTestRunner extends Runner implements Filterable {
} }
info.runner.run(run); info.runner.run(run);
if (info.cleanupFuture != null) {
info.cleanupFuture.cancel(false);
info.cleanupFuture = null;
}
RunKind kind = run.getKind(); RunKind kind = run.getKind();
info.cleanupFuture = executor.schedule(() -> cleanupRunner(kind), stopTimeout, TimeUnit.MILLISECONDS);
} }
} }
private static void cleanupRunner(RunKind kind) { private static void cleanupRunner(RunKind kind) {
synchronized (TeaVMTestRunner.class) { synchronized (TeaVMTestRunner.class) {
RunnerKindInfo info = runners.get(kind); RunnerKindInfo info = runners.get(kind);
info.cleanupFuture = null;
info.runner.stop(); info.runner.stop();
info.runner = null; info.runner = null;
} }