Destroy xUnit runner process if build is aborted. Fixes issue# 14

carlpett · Aug 6, 2016 · 1844956 · 1844956
1 parent 623969b
commit 1844956
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/xunit-agent/src/main/java/se/capeit/dev/xunittestrunner/FutureBasedBuildProcess.java b/xunit-agent/src/main/java/se/capeit/dev/xunittestrunner/FutureBasedBuildProcess.java
@@ -57,9 +57,12 @@ public boolean isFinished()
         return myFuture.isDone();
     }
 
+    protected abstract void cancelBuild();
+
     public void interrupt()
     {
         logger.message("Attempt to interrupt build process");
+        cancelBuild();
         myFuture.cancel(true);
     }
 

diff --git a/xunit-agent/src/main/java/se/capeit/dev/xunittestrunner/XUnitBuildProcess.java b/xunit-agent/src/main/java/se/capeit/dev/xunittestrunner/XUnitBuildProcess.java
@@ -20,6 +20,7 @@
 class XUnitBuildProcess extends FutureBasedBuildProcess {
     private final AgentRunningBuild buildingAgent;
     private final BuildRunnerContext context;
+    private Process testRunnerProcess;
 
     public XUnitBuildProcess(@NotNull final BuildRunnerContext context) {
         super(context);
@@ -41,6 +42,13 @@ private List<String> getAssemblies(final String rawAssemblyParameter) {
         return assemblies;
     }
 
+    protected void cancelBuild() {
+        if (testRunnerProcess == null)
+            return;
+
+        testRunnerProcess.destroy();
+    }
+
     public BuildFinishedStatus call() throws Exception {
         try {
             String version = getParameter(StringConstants.ParameterName_XUnitVersion);
@@ -83,20 +91,20 @@ public BuildFinishedStatus call() throws Exception {
                     env.put(kvp.getKey(), kvp.getValue());
                 }
 
-                Process process = processBuilder.start();
+                testRunnerProcess = processBuilder.start();
 
-                redirectStreamToLogger(process.getInputStream(), new RedirectionTarget() {
+                redirectStreamToLogger(testRunnerProcess.getInputStream(), new RedirectionTarget() {
                     public void redirect(String s) {
                         logger.message(s);
                     }
                 });
-                redirectStreamToLogger(process.getErrorStream(), new RedirectionTarget() {
+                redirectStreamToLogger(testRunnerProcess.getErrorStream(), new RedirectionTarget() {
                     public void redirect(String s) {
                         logger.warning(s);
                     }
                 });
 
-                int exitCode = process.waitFor();
+                int exitCode = testRunnerProcess.waitFor();
                 if(exitCode != 0) {
                     logger.warning("Test runner exited with non-zero status!");
                     status = BuildFinishedStatus.FINISHED_FAILED;