Skip to content
Permalink
Browse files

[JENKINS-25894] Pick up fix from jenkinsci/workflow-cps-plugin#6.

  • Loading branch information...
jglick committed Apr 13, 2016
1 parent e3ca5ce commit cf118defbbfc7a1581b64cbbc668d6e3b07c337f
Showing with 2 additions and 4 deletions.
  1. +1 −1 pom.xml
  2. +1 −3 src/test/java/org/jenkinsci/plugins/workflow/steps/TimeoutStepRunTest.java
@@ -90,7 +90,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-cps</artifactId>
<version>1.15</version>
<version>2.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -18,8 +18,6 @@
import org.jvnet.hudson.test.RestartableJenkinsRule;

import java.util.List;
import org.jenkinsci.plugins.workflow.steps.SleepStep;
import org.jenkinsci.plugins.workflow.steps.TimeoutStepExecution;

/**
* @author Kohsuke Kawaguchi
@@ -64,7 +62,7 @@ public void evaluate() throws Throwable {
+ " }\n"
+ " echo 'NotHere'\n"
+ "}\n"));
WorkflowRun b = story.j.assertBuildStatus(/* TODO JENKINS-25894 should really be ABORTED */Result.FAILURE, p.scheduleBuild2(0).get());
WorkflowRun b = story.j.assertBuildStatus(Result.ABORTED, p.scheduleBuild2(0).get());

// make sure things that are supposed to run do, and things that are NOT supposed to run do not.
story.j.assertLogNotContains("NotHere", b);

0 comments on commit cf118de

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