[FIXED JENKINS-10234] Removed checkpoint from JUnitResultArchiver.

jenkinsci · Jul 21, 2014 · 90ff9f8 · 90ff9f8
1 parent c64e4d9
commit 90ff9f8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/changelog.html b/changelog.html
@@ -55,7 +55,9 @@
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
-  <li class=>
+  <li class="bug">
+    Should not stop a build from finishing just to compute JUnit result difference to a prior build which is still running.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-10234">issue 10234</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 

diff --git a/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java b/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java
@@ -32,7 +32,6 @@
 import hudson.model.AbstractProject;
 import hudson.model.Action;
 import hudson.model.BuildListener;
-import hudson.model.CheckPoint;
 import hudson.model.Descriptor;
 import hudson.model.Result;
 import hudson.model.Saveable;
@@ -152,9 +151,6 @@ public boolean perform(AbstractBuild build, Launcher launcher,
 			}
 
 			action.setData(data);
-
-			CHECKPOINT.block(listener, getDescriptor().getDisplayName());
-
 		} catch (AbortException e) {
 			if (build.getResult() == Result.FAILURE)
 				// most likely a build failed before it gets to the test phase.
@@ -171,7 +167,6 @@ public boolean perform(AbstractBuild build, Launcher launcher,
 		}
 
 		build.addAction(action);
-		CHECKPOINT.report();
 
 		if (action.getResult().getFailCount() > 0)
 			build.setResult(Result.UNSTABLE);
@@ -189,9 +184,6 @@ protected TestResult parseResult(DirectoryScanner ds, long buildTime)
 		return new TestResult(buildTime, ds);
 	}
 
-	/**
-	 * This class does explicit checkpointing.
-	 */
 	public BuildStepMonitor getRequiredMonitorService() {
 		return BuildStepMonitor.NONE;
 	}
@@ -216,12 +208,6 @@ public boolean isKeepLongStdio() {
 		return keepLongStdio;
 	}
 
-	/**
-	 * Test result tracks the diff from the previous run, hence the checkpoint.
-	 */
-	private static final CheckPoint CHECKPOINT = new CheckPoint(
-			"JUnit result archiving");
-
 	private static final long serialVersionUID = 1L;
 
     @Extension