[JENKINS-30395] Deleting workaround now that we can use jenkins-test-…

…harness 2.0. Originally-Committed-As: 109b8f82415fc41f24d5d6545e586f0bce7ba705
jenkinsci · Jan 22, 2016 · 925dd27 · 925dd27
1 parent 46f7c28
commit 925dd27
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/PushdStepTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/PushdStepTest.java
@@ -26,7 +26,6 @@
 
 import hudson.Functions;
 import java.io.File;
-import org.jenkinsci.plugins.workflow.JenkinsRuleExt;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
@@ -41,7 +40,7 @@
 public class PushdStepTest {
 
     @ClassRule public static BuildWatcher buildWatcher = new BuildWatcher();
-    @Rule public RestartableJenkinsRule story = JenkinsRuleExt.workAroundJenkins30395Restartable();
+    @Rule public RestartableJenkinsRule story = new RestartableJenkinsRule();
 
     private String pwdStep() {
         return Functions.isWindows() ? "bat 'cd'" : "sh 'pwd'";

diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/scm/GitStepRestartTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/scm/GitStepRestartTest.java
@@ -31,7 +31,6 @@
 import java.util.Iterator;
 import java.util.List;
 import org.apache.commons.io.FileUtils;
-import org.jenkinsci.plugins.workflow.JenkinsRuleExt;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
@@ -47,7 +46,7 @@
 public class GitStepRestartTest {
 
     @ClassRule public static BuildWatcher buildWatcher = new BuildWatcher();
-    @Rule public RestartableJenkinsRule r = JenkinsRuleExt.workAroundJenkins30395Restartable();
+    @Rule public RestartableJenkinsRule r = new RestartableJenkinsRule();
     @Rule public GitSampleRepoRule sampleRepo = new GitSampleRepoRule();
 
     @Issue("JENKINS-26761")

diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/scm/MercurialStepTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/scm/MercurialStepTest.java
@@ -32,7 +32,6 @@
 import java.util.List;
 import jenkins.util.VirtualFile;
 import org.apache.commons.io.FileUtils;
-import org.jenkinsci.plugins.workflow.JenkinsRuleExt;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
@@ -45,7 +44,7 @@
 @For(GenericSCMStep.class) // formerly a dedicated MercurialStep
 public class MercurialStepTest {
 
-    @Rule public JenkinsRule r = JenkinsRuleExt.workAroundJenkins30395();
+    @Rule public JenkinsRule r = new JenkinsRule();
     @Rule public MercurialSampleRepoRule sampleRepo = new MercurialSampleRepoRule();
     @Rule public MercurialSampleRepoRule otherRepo = new MercurialSampleRepoRule();
 

diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/scm/SubversionStepTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/scm/SubversionStepTest.java
@@ -31,7 +31,6 @@
 import java.util.Iterator;
 import java.util.List;
 import jenkins.util.VirtualFile;
-import org.jenkinsci.plugins.workflow.JenkinsRuleExt;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
@@ -45,7 +44,7 @@
 public class SubversionStepTest {
 
     @ClassRule public static BuildWatcher buildWatcher = new BuildWatcher();
-    @Rule public JenkinsRule r = JenkinsRuleExt.workAroundJenkins30395();
+    @Rule public JenkinsRule r = new JenkinsRule();
     @Rule public SubversionSampleRepoRule sampleRepo = new SubversionSampleRepoRule();
     @Rule public SubversionSampleRepoRule otherRepo = new SubversionSampleRepoRule();