Skip to content
Permalink
Browse files

[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 1fd6810 commit 3863d452771b11172229444caba00984b18dae7c
@@ -29,7 +29,6 @@
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.jenkinsci.plugins.workflow.JenkinsRuleExt;
import org.jenkinsci.plugins.workflow.actions.LogAction;
import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
import org.jenkinsci.plugins.workflow.graph.FlowGraphWalker;
@@ -46,7 +45,7 @@
public class EchoStepTest {

@ClassRule public static BuildWatcher buildWatcher = new BuildWatcher();
@Rule public JenkinsRule r = JenkinsRuleExt.workAroundJenkins30395();
@Rule public JenkinsRule r = new JenkinsRule();

@Test public void smokes() throws Exception {
WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p");
@@ -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'";
@@ -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");
@@ -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();

0 comments on commit 3863d45

Please sign in to comment.
You can’t perform that action at this time.