Skip to content

Commit

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

Originally-Committed-As: 109b8f82415fc41f24d5d6545e586f0bce7ba705
  • Loading branch information
jglick committed Jan 22, 2016
1 parent 9915731 commit 53e7fcd
Show file tree
Hide file tree
Showing 17 changed files with 17 additions and 40 deletions.
Expand Up @@ -37,7 +37,7 @@
*/
public class DSLTest {

@Rule public JenkinsRule r = JenkinsRuleExt.workAroundJenkins30395();
@Rule public JenkinsRule r = new JenkinsRule();

@Test public void overrideFunction() throws Exception {
WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p");
Expand Down
Expand Up @@ -12,13 +12,12 @@
import org.jvnet.hudson.test.JenkinsRule;

import java.util.Arrays;
import org.jenkinsci.plugins.workflow.JenkinsRuleExt;

/**
* @author Kohsuke Kawaguchi
*/
public class ArtifactArchiverStepTest extends Assert {
@Rule public JenkinsRule j = JenkinsRuleExt.workAroundJenkins30395();
@Rule public JenkinsRule j = new JenkinsRule();

/**
* Archive and unarchive file
Expand Down
Expand Up @@ -26,7 +26,6 @@

import hudson.model.Result;
import jenkins.model.CauseOfInterruption;
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 @@ -37,7 +36,7 @@

public class CatchErrorStepTest {

@Rule public JenkinsRule r = JenkinsRuleExt.workAroundJenkins30395();
@Rule public JenkinsRule r = new JenkinsRule();

@Test public void specialStatus() throws Exception {
WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p");
Expand Down
Expand Up @@ -30,7 +30,6 @@
import hudson.tasks.junit.TestResultAction;
import java.util.List;
import javax.mail.internet.InternetAddress;
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 @@ -45,7 +44,7 @@
public class CoreStepTest {

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

@Test public void artifactArchiver() throws Exception {
WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p");
Expand Down
Expand Up @@ -62,7 +62,7 @@
public class CoreWrapperStepTest {

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

@Test public void useWrapper() throws Exception {
story.addStep(new Statement() {
Expand Down
Expand Up @@ -25,25 +25,19 @@
package org.jenkinsci.plugins.workflow.steps;

import java.io.File;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
import org.jenkinsci.plugins.workflow.job.WorkflowJob;
import org.jenkinsci.plugins.workflow.job.WorkflowRun;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.jvnet.hudson.test.JenkinsRule;

import hudson.FilePath;
import hudson.model.queue.QueueTaskFuture;
import org.jenkinsci.plugins.workflow.JenkinsRuleExt;

public class DeleteDirStepTest {

@Rule public JenkinsRule r = JenkinsRuleExt.workAroundJenkins30395();
@Rule public JenkinsRule r = new JenkinsRule();

@Test
public void testDeleteEmptyWorkspace() throws Exception {
Expand Down
Expand Up @@ -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;
Expand All @@ -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");
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.jenkinsci.plugins.workflow.job.WorkflowRun;
Expand All @@ -39,7 +38,7 @@
public class EnvStepTest {

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

@Test public void overriding() {
story.addStep(new Statement() {
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 IsUnixStepTest {

@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 @@ -24,9 +24,7 @@
package org.jenkinsci.plugins.workflow.steps;

import hudson.model.Result;
import hudson.model.queue.QueueTaskFuture;
import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
import org.jenkinsci.plugins.workflow.flow.FlowExecution;
import org.jenkinsci.plugins.workflow.job.WorkflowJob;
import org.jenkinsci.plugins.workflow.job.WorkflowRun;
import org.junit.Assert;
Expand All @@ -37,15 +35,13 @@

import javax.mail.Message;
import javax.mail.internet.MimeMultipart;
import java.io.IOException;
import org.jenkinsci.plugins.workflow.JenkinsRuleExt;

/**
* @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly@gmail.com</a>
*/
public class MailStepTest {

@Rule public JenkinsRule jenkinsRule = JenkinsRuleExt.workAroundJenkins30395();
@Rule public JenkinsRule jenkinsRule = new JenkinsRule();

@Test
public void test_missing_subject() throws Exception {
Expand Down
Expand Up @@ -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;
Expand All @@ -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'";
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.Functions;
import org.jenkinsci.plugins.workflow.JenkinsRuleExt;

import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
import org.jenkinsci.plugins.workflow.job.WorkflowJob;
Expand All @@ -36,7 +35,7 @@

public class ReadWriteFileStepTest {

@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 java.util.List;
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.cps.nodes.StepAtomNode;
Expand All @@ -45,7 +44,7 @@
public class SleepStepTest {

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

@Test public void sleepAndRestart() {
r.addStep(new Statement() {
Expand Down
Expand Up @@ -18,7 +18,6 @@
import org.jvnet.hudson.test.RestartableJenkinsRule;

import java.util.List;
import org.jenkinsci.plugins.workflow.JenkinsRuleExt;

/**
* @author Kohsuke Kawaguchi
Expand All @@ -27,7 +26,7 @@ public class TimeoutStepTest extends Assert {

@ClassRule public static BuildWatcher buildWatcher = new BuildWatcher();

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

/**
* The simplest possible timeout step ever.
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 @@ -24,7 +24,6 @@

package org.jenkinsci.plugins.workflow.steps.stash;

import org.jenkinsci.plugins.workflow.JenkinsRuleExt;
import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
import org.jenkinsci.plugins.workflow.flow.StashManager;
import org.jenkinsci.plugins.workflow.job.WorkflowJob;
Expand All @@ -42,7 +41,7 @@
public class StashTest {

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

@Issue("JENKINS-26942")
@Test public void smokes() throws Exception {
Expand Down

0 comments on commit 53e7fcd

Please sign in to comment.