Merge pull request #41 from willemv/master

[FIXED JENKINS-34804] Don't report test failures of inactive Matrix Configurations
jenkinsci · May 17, 2016 · e83aaf7 · e83aaf7
2 parents 3cb3cba + 7effaed
commit e83aaf7
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/java/hudson/plugins/view/dashboard/test/TestUtil.java b/src/main/java/hudson/plugins/view/dashboard/test/TestUtil.java
@@ -1,5 +1,6 @@
 package hudson.plugins.view.dashboard.test;
 
+import hudson.matrix.MatrixConfiguration;
 import hudson.matrix.MatrixProject;
 import hudson.maven.reporters.SurefireAggregatedReport;
 import hudson.model.Job;
@@ -26,10 +27,9 @@ public static TestResultSummary getTestResultSummary(Collection<TopLevelItem> jo
          if (item instanceof MatrixProject) {
             MatrixProject mp = (MatrixProject) item;
 
-            for (Job job : mp.getAllJobs()) {
-               if (job != mp) { //getAllJobs includes the parent job too, so skip that
-                  summarizeJob(job, summary);
-               }
+            for (MatrixConfiguration configuration : mp.getActiveConfigurations()) {
+               MatrixConfiguration job = mp.getItem(configuration.getCombination());
+               summarizeJob(job, summary);
             }
          }
          else if (item instanceof Job) {