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

…harness 2.0. Originally-Committed-As: 109b8f82415fc41f24d5d6545e586f0bce7ba705
jenkinsci · Jan 22, 2016 · 5d87ee5 · 5d87ee5
1 parent 0d7bbf1
commit 5d87ee5
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/PwdStepTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/PwdStepTest.java
@@ -24,7 +24,6 @@
 
 package org.jenkinsci.plugins.workflow.steps;
 
-import org.jenkinsci.plugins.workflow.JenkinsRuleExt;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.junit.Test;
@@ -33,7 +32,7 @@
 
 public class PwdStepTest {
 
-    @Rule public JenkinsRule r = JenkinsRuleExt.workAroundJenkins30395();
+    @Rule public JenkinsRule r = new JenkinsRule();
 
     @Test public void basics() throws Exception {
         WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p");

diff --git a/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/ToolStepTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/ToolStepTest.java
@@ -25,7 +25,6 @@
 package org.jenkinsci.plugins.workflow.steps;
 
 import hudson.tasks.Maven;
-import org.jenkinsci.plugins.workflow.JenkinsRuleExt;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.junit.ClassRule;
@@ -38,7 +37,7 @@
 public class ToolStepTest {
 
     @ClassRule public static BuildWatcher buildWatcher = new BuildWatcher();
-    @Rule public JenkinsRule r = JenkinsRuleExt.workAroundJenkins30395();
+    @Rule public JenkinsRule r = new JenkinsRule();
 
     @Test public void build() throws Exception {
         Maven.MavenInstallation tool = ToolInstallations.configureMaven3();

diff --git a/...src/test/java/org/jenkinsci/plugins/workflow/steps/build/BuildTriggerStepRestartTest.java b/...src/test/java/org/jenkinsci/plugins/workflow/steps/build/BuildTriggerStepRestartTest.java
@@ -7,7 +7,6 @@
 import hudson.model.queue.QueueTaskFuture;
 import java.io.IOException;
 import java.util.Arrays;
-import org.jenkinsci.plugins.workflow.JenkinsRuleExt;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowExecution;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
@@ -26,7 +25,7 @@
 public class BuildTriggerStepRestartTest extends Assert {
 
     @ClassRule public static BuildWatcher buildWatcher = new BuildWatcher();
-    @Rule public RestartableJenkinsRule story = JenkinsRuleExt.workAroundJenkins30395Restartable();
+    @Rule public RestartableJenkinsRule story = new RestartableJenkinsRule();
 
     @Test
     public void restartBetweenJobs() throws IOException {

diff --git a/...egator/src/test/java/org/jenkinsci/plugins/workflow/steps/build/BuildTriggerStepTest.java b/...egator/src/test/java/org/jenkinsci/plugins/workflow/steps/build/BuildTriggerStepTest.java
@@ -15,7 +15,6 @@
 import java.util.Arrays;
 import java.util.List;
 import org.apache.commons.lang.StringUtils;
-import org.jenkinsci.plugins.workflow.JenkinsRuleExt;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowExecution;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
@@ -36,7 +35,7 @@
 public class BuildTriggerStepTest {
 
     @ClassRule public static BuildWatcher buildWatcher = new BuildWatcher();
-    @Rule public JenkinsRule j = JenkinsRuleExt.workAroundJenkins30395();
+    @Rule public JenkinsRule j = new JenkinsRule();
 
     @Issue("JENKINS-25851")
     @Test public void buildTopLevelProject() throws Exception {