Defending against past corrupt builds (#651)

jenkinsci · Sep 26, 2024 · ab878c3 · ab878c3
1 parent 2a6bf20
commit ab878c3
Showing 1 changed file with 19 additions and 5 deletions.
diff --git a/src/main/java/hudson/tasks/test/TestResult.java b/src/main/java/hudson/tasks/test/TestResult.java
@@ -23,12 +23,15 @@
  */
 package hudson.tasks.test;
 
+import hudson.model.Job;
 import hudson.model.Result;
 import hudson.model.Run;
 import hudson.tasks.junit.TestAction;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * A class that represents a general concept of a test result, without any
@@ -38,6 +41,7 @@
  * @since 1.343
  */
 public abstract class TestResult extends TestObject {
+    private static final Logger LOGGER = Logger.getLogger(TestResult.class.getName());
 
     /**
      * If the concept of a parent action is important to a subclass, then it should
@@ -136,17 +140,27 @@ public TestResult getPreviousResult() {
         if (b == null) {
             return null;
         }
+        Job<?, ?> job = b.getParent();
         while (true) {
             b = b.getPreviousBuild();
             if (b == null) {
                 return null;
             }
-            AbstractTestResultAction r = b.getAction(getParentAction().getClass());
-            if (r != null) {
-                TestResult result = r.findCorrespondingResult(this.getId());
-                if (result != null) {
-                    return result;
+            try {
+                AbstractTestResultAction r = b.getAction(getParentAction().getClass());
+                if (r != null) {
+                    TestResult result = r.findCorrespondingResult(this.getId());
+                    if (result != null) {
+                        return result;
+                    }
                 }
+            } catch (RuntimeException e) {
+                Run<?, ?> loggedBuild = b;
+                LOGGER.log(
+                        Level.WARNING,
+                        e,
+                        () -> "Failed to load (corrupt?) build " + job.getFullName() + " #" + loggedBuild.getNumber()
+                                + ", skipping");
             }
         }
     }