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

…harness 2.0. Originally-Committed-As: 109b8f82415fc41f24d5d6545e586f0bce7ba705
jenkinsci · Jan 22, 2016 · 1508af2 · 1508af2
1 parent d1b9bd8
commit 1508af2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 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/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/input/InputStepTest.java b/aggregator/src/test/java/org/jenkinsci/plugins/workflow/steps/input/InputStepTest.java
@@ -53,13 +53,12 @@
 import org.jvnet.hudson.test.JenkinsRule;
 
 import java.util.Arrays;
-import org.jenkinsci.plugins.workflow.JenkinsRuleExt;
 
 /**
  * @author Kohsuke Kawaguchi
  */
 public class InputStepTest extends Assert {
-    @Rule public JenkinsRule j = JenkinsRuleExt.workAroundJenkins30395();
+    @Rule public JenkinsRule j = new JenkinsRule();
 
     /**
      * Try out a parameter.