Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NO-JIRA Improve SpawnVMCheck

This commit is contained in:
Clebert Suconic 2018-07-11 16:25:22 -04:00 committed by Francesco Nigro
parent a1d34f5631
commit be8c29d4e1
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/util/SpawnedVMCheck.java
View File

@ -26,4 +26,10 @@ public class SpawnedVMCheck extends ExternalResource {
super.after();
SpawnedVMSupport.checkProcess();
}
@Override
public void before() throws Throwable {
super.before();
SpawnedVMSupport.enableCheck();
}
}

34
tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/util/SpawnedVMSupport.java
View File

@ -40,7 +40,7 @@ import static java.util.concurrent.TimeUnit.SECONDS;
public final class SpawnedVMSupport {
static ConcurrentHashMap<Process, String> startedProcesses = new ConcurrentHashMap();
static ConcurrentHashMap<Process, String> startedProcesses = null;
private static final UnitTestLogger log = UnitTestLogger.LOGGER;
@ -203,7 +203,9 @@ public final class SpawnedVMSupport {
ProcessLogger errorLogger = new ProcessLogger(logErrorOutput, process.getErrorStream(), className, wordMatch, wordRunning);
errorLogger.start();
startedProcesses.put(process, className);
if (startedProcesses != null) {
startedProcesses.put(process, className);
}
return process;
}
@ -216,18 +218,20 @@ public final class SpawnedVMSupport {
HashSet<Process> aliveProcess = new HashSet<>();
for (;;) {
try {
aliveProcess.clear();
for (Process process : startedProcesses.keySet()) {
if (process.isAlive()) {
aliveProcess.add(process);
process.destroyForcibly();
if (startedProcesses != null) {
for (;;) {
try {
aliveProcess.clear();
for (Process process : startedProcesses.keySet()) {
if (process.isAlive()) {
aliveProcess.add(process);
process.destroyForcibly();
}
}
break;
} catch (Throwable e) {
e.printStackTrace();
}
break;
} catch (Throwable e) {
e.printStackTrace();
}
}
@ -251,6 +255,10 @@ public final class SpawnedVMSupport {
}
public static void enableCheck() {
startedProcesses = new ConcurrentHashMap<>();
}
public static void checkProcess() {
HashSet<Process> aliveProcess = getAliveProcesses();
@ -265,7 +273,7 @@ public final class SpawnedVMSupport {
Assert.fail("There are " + aliveProcess.size() + " processes alive :: " + buffer.toString());
}
} finally {
startedProcesses.clear();
startedProcesses = null;
}
}