[FIXED JENKINS-44444] Corrected test to not send an orphaned Run to O…

…ldDataMonitor.
jenkinsci · May 23, 2017 · ac364d6 · ac364d6
1 parent 8d94ba8
commit ac364d6
Show file tree

Hide file tree

Showing 7 changed files with 82 additions and 15 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,8 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>2.26</version>
+        <version>2.29</version>
+        <relativePath />
     </parent>
     <artifactId>matrix-project</artifactId>
     <version>1.11-SNAPSHOT</version>

diff --git a/src/test/java/hudson/matrix/MatrixRunTest.java b/src/test/java/hudson/matrix/MatrixRunTest.java
@@ -24,18 +24,14 @@
 
 package hudson.matrix;
 
-import hudson.model.Run;
-
-import java.io.InputStream;
-
 import jenkins.model.CauseOfInterruption;
 import jenkins.model.InterruptedBuildAction;
 import static org.junit.Assert.*;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.recipes.LocalData;
 
 public class MatrixRunTest {
 
@@ -44,14 +40,13 @@ public class MatrixRunTest {
     /**
      * Unmarshall a matrix build.xml result.
      */
+    @LocalData
     @Issue("JENKINS-10903")
     @Test public void unmarshalRunMatrix() {
-        InputStream is = MatrixRunTest.class.getResourceAsStream("runMatrix.xml");
-        MatrixRun result = (MatrixRun) Run.XSTREAM.fromXML(is);
+        MatrixRun result = r.jenkins.getItemByFullName("p/x=1", MatrixConfiguration.class).getBuildByNumber(1);
         assertNotNull(result);
-        assertNotNull(result.getPersistentActions());
-        assertEquals(2, result.getPersistentActions().size());
-        InterruptedBuildAction action = (InterruptedBuildAction) result.getPersistentActions().get(1);
+        InterruptedBuildAction action = result.getAction(InterruptedBuildAction.class);
+        assertNotNull(action);
         assertNotNull(action.getCauses());
         assertEquals(1, action.getCauses().size());
         CauseOfInterruption.UserInterruption cause =

diff --git a/src/test/resources/hudson/matrix/MatrixRunTest/unmarshalRunMatrix/jobs/p/builds/1/build.xml b/src/test/resources/hudson/matrix/MatrixRunTest/unmarshalRunMatrix/jobs/p/builds/1/build.xml
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<matrix-build>
+  <actions>
+    <hudson.model.CauseAction>
+      <causes>
+        <hudson.model.Cause_-UserIdCause/>
+      </causes>
+    </hudson.model.CauseAction>
+  </actions>
+  <queueId>1</queueId>
+  <timestamp>1495549558728</timestamp>
+  <startTime>1495549558735</startTime>
+  <result>SUCCESS</result>
+  <duration>1098</duration>
+  <charset>UTF-8</charset>
+  <keepLog>false</keepLog>
+  <builtOn></builtOn>
+  <workspace>…</workspace>
+  <hudsonVersion>1.609</hudsonVersion>
+  <scm class="hudson.scm.NullChangeLogParser"/>
+  <culprits class="com.google.common.collect.EmptyImmutableSortedSet"/>
+  <axes>
+    <hudson.matrix.TextAxis>
+      <name>x</name>
+      <values>
+        <string>1</string>
+      </values>
+    </hudson.matrix.TextAxis>
+  </axes>
+</matrix-build>
diff --git a/src/test/resources/hudson/matrix/MatrixRunTest/unmarshalRunMatrix/jobs/p/config.xml b/src/test/resources/hudson/matrix/MatrixRunTest/unmarshalRunMatrix/jobs/p/config.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<matrix-project>
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties/>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers/>
+  <concurrentBuild>false</concurrentBuild>
+  <axes>
+    <hudson.matrix.TextAxis>
+      <name>x</name>
+      <values>
+        <string>1</string>
+      </values>
+    </hudson.matrix.TextAxis>
+  </axes>
+  <builders/>
+  <publishers/>
+  <buildWrappers/>
+  <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
+    <runSequentially>false</runSequentially>
+  </executionStrategy>
+</matrix-project>
diff --git a/...est/resources/hudson/matrix/runMatrix.xml → ...onfigurations/axis-x/1/builds/1/build.xml b/...est/resources/hudson/matrix/runMatrix.xml → ...onfigurations/axis-x/1/builds/1/build.xml
@@ -4,9 +4,9 @@
     <hudson.model.CauseAction>
       <causes>
         <hudson.model.Cause_-UpstreamCause>
-          <upstreamProject>MatrixProject</upstreamProject>
-          <upstreamUrl>job/MatrixProject/</upstreamUrl>
-          <upstreamBuild>8</upstreamBuild>
+          <upstreamProject>p</upstreamProject>
+          <upstreamUrl>job/p/</upstreamUrl>
+          <upstreamBuild>1</upstreamBuild>
           <upstreamCauses>
             <hudson.model.Cause_-UserCause>
               <authenticationName>auser</authenticationName>
@@ -25,7 +25,7 @@
       </causes>
     </jenkins.model.InterruptedBuildAction>
   </actions>
-  <number>8</number>
+  <number>1</number>
   <result>ABORTED</result>
   <duration>3253844</duration>
   <charset>windows-1252</charset>

diff --git a/.../hudson/matrix/MatrixRunTest/unmarshalRunMatrix/jobs/p/configurations/axis-x/1/config.xml b/.../hudson/matrix/MatrixRunTest/unmarshalRunMatrix/jobs/p/configurations/axis-x/1/config.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<matrix-config>
+  <keepDependencies>false</keepDependencies>
+  <properties/>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>false</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers/>
+  <concurrentBuild>false</concurrentBuild>
+</matrix-config>
diff --git a/src/test/resources/hudson/matrix/MatrixRunTest/unmarshalRunMatrix/jobs/p/nextBuildNumber b/src/test/resources/hudson/matrix/MatrixRunTest/unmarshalRunMatrix/jobs/p/nextBuildNumber
@@ -0,0 +1 @@
+2