Merge pull request #30224 from bryan-cox/fix-conformance

openshift-merge-bot[bot] · web-flow · commit 922dcc636df9 · 2025-09-18T04:03:29.000Z
OCPBUGS-61398: fix(test): prevent nil pointer dereference in ginkgo test runner
diff --git a/pkg/test/ginkgo/status.go b/pkg/test/ginkgo/status.go
@@ -3,6 +3,7 @@ package ginkgo
 import (
 	"fmt"
 	"io"
+	"os"
 	"sort"
 	"sync"
 )
@@ -38,6 +39,11 @@ func (s *testSuiteProgress) TestEnded(testName string, testRunResult *testRunRes
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
+	if testRunResult == nil {
+		fmt.Fprintln(os.Stderr, "testRunResult is nil")
+		return
+	}
+
 	if isTestFailed(testRunResult.testState) {
 		s.failures++
 	}
diff --git a/pkg/test/ginkgo/test_runner.go b/pkg/test/ginkgo/test_runner.go
@@ -221,6 +221,11 @@ func recordTestResultInLogWithoutOverlap(testRunResult *testRunResultHandle, tes
 }
 
 func recordTestResultInLog(testRunResult *testRunResultHandle, out io.Writer, includeSuccessfulOutput bool) {
+	if testRunResult == nil {
+		fmt.Fprintln(os.Stderr, "testRunResult is nil")
+		return
+	}
+
 	// output the status of the test
 	switch testRunResult.testState {
 	case TestFlaked:
@@ -257,6 +262,11 @@ func recordTestResultInLog(testRunResult *testRunResultHandle, out io.Writer, in
 }
 
 func recordTestResultInMonitor(testRunResult *testRunResultHandle, monitorRecorder monitorapi.Recorder) {
+	if testRunResult == nil {
+		fmt.Fprintln(os.Stderr, "testRunResult is nil")
+		return
+	}
+
 	eventLevel := monitorapi.Warning
 
 	msg := monitorapi.NewMessage().HumanMessage("e2e test finished")
