From 90ff9f806fcac1a58f4bd40bfcc4ed5273ff116a Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 21 Jul 2014 12:21:21 -0400 Subject: [PATCH] [FIXED JENKINS-10234] Removed checkpoint from JUnitResultArchiver. --- changelog.html | 4 +++- .../hudson/tasks/junit/JUnitResultArchiver.java | 14 -------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/changelog.html b/changelog.html index ea8845b64f..f40bfd5509 100644 --- a/changelog.html +++ b/changelog.html @@ -55,7 +55,9 @@ Upcoming changes diff --git a/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java b/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java index d3804a9bdb..c2267e45fa 100644 --- 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.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