[JENKINS-34637] Verifying behavior of timeout step around other block…

…-scoped steps.
jenkinsci · Oct 18, 2016 · ae8b586 · ae8b586
1 parent f36a5c3
commit ae8b586
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -28,8 +28,8 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>2.14</version>
-        <relativePath />
+        <version>2.17</version>
+        <relativePath/>
     </parent>
     <groupId>org.jenkins-ci.plugins.workflow</groupId>
     <artifactId>workflow-basic-steps</artifactId>
@@ -66,7 +66,7 @@
     </properties>
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-step-api</artifactId>
             <version>2.3</version>
         </dependency>
@@ -76,7 +76,7 @@
             <version>1.13</version>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-step-api</artifactId>
             <version>2.3</version>
             <classifier>tests</classifier>
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-api</artifactId>
-            <version>2.1</version>
+            <version>2.4</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
@@ -95,13 +95,13 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-cps</artifactId>
-            <version>2.10</version>
+            <version>2.20-SNAPSHOT</version> <!-- TODO https://github.com/jenkinsci/workflow-cps-plugin/pull/76 -->
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-cps</artifactId>
-            <version>2.10</version>
+            <version>2.20-SNAPSHOT</version>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
@@ -120,7 +120,13 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-support</artifactId>
-            <version>2.1</version>
+            <version>2.9-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins.workflow</groupId>
+            <artifactId>workflow-support</artifactId>
+            <version>2.9-SNAPSHOT</version>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>

diff --git a/src/test/java/org/jenkinsci/plugins/workflow/steps/TimeoutStepRunTest.java b/src/test/java/org/jenkinsci/plugins/workflow/steps/TimeoutStepRunTest.java
@@ -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
@@ -47,7 +45,6 @@ public void evaluate() throws Throwable {
         });
     }
 
-    @Ignore("TODO: fails because the timeout step doesn't abort the build")
     @Issue("JENKINS-34637")
     @Test
     public void basicWithBlock() {