[FIXED JENKINS-10234] Removed checkpoint from JUnitResultArchiver.

This commit is contained in:
Jesse Glick committed 2014-07-21 12:21:21 -04:00
1 parent c64e4d977b
commit 90ff9f806f
2 files changed
+3 -15

No files matched your search

+3 -1
View File
@@ -55,7 +55,9 @@ Upcoming changes</a>
<!-- 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=-->
@@ -32,7 +32,6 @@ import hudson.model.AbstractBuild;
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 class JUnitResultArchiver extends Recorder {
}
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 class JUnitResultArchiver extends Recorder {
}
build.addAction(action);
CHECKPOINT.report();
if (action.getResult().getFailCount() > 0)
build.setResult(Result.UNSTABLE);
@@ -189,9 +184,6 @@ public class JUnitResultArchiver extends Recorder {
return new TestResult(buildTime, ds);
}
/**
* This class does explicit checkpointing.
*/
public BuildStepMonitor getRequiredMonitorService() {
return BuildStepMonitor.NONE;
}
@@ -216,12 +208,6 @@ public class JUnitResultArchiver extends Recorder {
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