Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[JENKINS-30395] Deleting workaround now that we can use jenkins-test-…
…harness 2.0.

Originally-Committed-As: 109b8f82415fc41f24d5d6545e586f0bce7ba705
  • Loading branch information
jglick committed Jan 22, 2016
1 parent aa37801 commit b37d996
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 7 deletions.
Expand Up @@ -39,7 +39,7 @@

public class ScalabilityTest {

@Rule public RestartableJenkinsRule story = JenkinsRuleExt.workAroundJenkins30395Restartable();
@Rule public RestartableJenkinsRule story = new RestartableJenkinsRule();

@Issue("JENKINS-30055")
@Test public void manySteps() {
Expand Down
Expand Up @@ -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;
Expand All @@ -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");
Expand Down
Expand Up @@ -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;
Expand All @@ -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();
Expand Down
Expand Up @@ -26,7 +26,6 @@

import hudson.model.Result;
import org.jenkinsci.plugins.scriptsecurity.scripts.ScriptApproval;
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;
Expand All @@ -44,7 +43,7 @@
public class RunWrapperTest {

@ClassRule public static BuildWatcher buildWatcher = new BuildWatcher();
@Rule public RestartableJenkinsRule r = JenkinsRuleExt.workAroundJenkins30395Restartable();
@Rule public RestartableJenkinsRule r = new RestartableJenkinsRule();

@Test public void historyAndPickling() {
r.addStep(new Statement() {
Expand Down

0 comments on commit b37d996

Please sign in to comment.