trying to make simulator functional test less flaky

This commit is contained in:
rusefillc 2023-10-08 12:16:36 -04:00
parent 0a806e31e3
commit bdcbef5018
2 changed files with 10 additions and 6 deletions

View File

@ -46,10 +46,6 @@ public class SimulatorExecHelper {
FileLog.MAIN.logLine("simulatorProcess: " + simulatorProcess);
dumpProcessOutput(simulatorProcess, simulatorStarted);
FileLog.MAIN.logLine("exitValue: " + simulatorProcess.exitValue());
System.out.println("end of console");
} catch (Exception err) {
if (isHappy) {
System.out.println("Already happy " + err);
@ -57,6 +53,14 @@ public class SimulatorExecHelper {
throw new IllegalStateException(err);
}
}
try {
FileLog.MAIN.logLine("exitValue: " + simulatorProcess.exitValue());
} catch (Exception err) {
log.warn("Error reading exit value", err);
}
System.out.println("end of console");
}
public static void dumpProcessOutput(Process process, CountDownLatch countDownLatch) throws IOException {

View File

@ -8,11 +8,11 @@ import com.rusefi.simulator.SimulatorFunctionalTest;
* As of Dec 2020 this seems very broken?
*/
public class SimulatorFunctionalTestLauncher {
static boolean isHappy;
static volatile boolean isHappy;
public static void main(String[] args) {
Thread.setDefaultUncaughtExceptionHandler((t, e) -> {
e.printStackTrace();
System.exit(-1);
System.exit(66);
});
boolean startSimulator = args.length == 1 && args[0].equalsIgnoreCase("start");