Fix panic from missing root test

gotestyourself · Sep 17, 2024 · 4f35e55 · 4f35e55
1 parent 57f1b7f
commit 4f35e55
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 1 deletion.
diff --git a/testjson/execution.go b/testjson/execution.go
@@ -447,7 +447,11 @@ func (p *Package) addTestEvent(event TestEvent) {
 		// If this is a subtest, mark the root test as having a failed subtest
 		if tc.Test.IsSubTest() {
 			root, _ := TestName(event.Test).Split()
-			rootTestCase := p.running[root]
+			rootTestCase, ok := p.running[root]
+			if !ok {
+				rootTestCase = p.newTestCaseFromEvent(event)
+				rootTestCase.Test = TestName(root)
+			}
 			rootTestCase.hasSubTestFailed = true
 			p.running[root] = rootTestCase
 		}

diff --git a/testjson/execution_test.go b/testjson/execution_test.go
@@ -251,6 +251,38 @@ func (s *captureHandler) Err(text string) error {
 	return nil
 }
 
+func TestScanTestOuput_SubtestWithNoRunningRoot(t *testing.T) {
+	source := []byte(`{"Action":"start","Package":"k8s.io/kubernetes/test/integration/scheduler_perf"}
+{"Action":"skip","Package":"k8s.io/kubernetes/test/integration/scheduler_perf","Test":"BenchmarkPerfScheduling/SchedulingBasic/500Nodes"}
+{"Action":"skip","Package":"k8s.io/kubernetes/test/integration/scheduler_perf","Test":"BenchmarkPerfScheduling/SchedulingPodAntiAffinity/500Nodes"}
+{"Action":"skip","Package":"k8s.io/kubernetes/test/integration/scheduler_perf","Test":"BenchmarkPerfScheduling/SchedulingSecrets/500Nodes"}
+{"Action":"skip","Package":"k8s.io/kubernetes/test/integration/scheduler_perf","Test":"BenchmarkPerfScheduling/SchedulingPodAffinity/500Nodes"}
+{"Action":"skip","Package":"k8s.io/kubernetes/test/integration/scheduler_perf","Test":"BenchmarkPerfScheduling/SchedulingPreferredPodAntiAffinity/500Nodes"}
+{"Action":"fail","Package":"k8s.io/kubernetes/test/integration/scheduler_perf","Test":"BenchmarkPerfScheduling/SchedulingDaemonset/15000Nodes"}
+{"Action":"fail","Package":"k8s.io/kubernetes/test/integration/scheduler_perf","Test":"BenchmarkPerfScheduling/SchedulingDaemonset"}
+{"Action":"skip","Package":"k8s.io/kubernetes/test/integration/scheduler_perf","Test":"BenchmarkPerfScheduling/SchedulingNodeAffinity/500Nodes"}
+{"Action":"fail","Package":"k8s.io/kubernetes/test/integration/scheduler_perf","Elapsed":660.472}`)
+
+	handler := &captureHandler{}
+	cfg := ScanConfig{
+		Stdout:  bytes.NewReader(source),
+		Handler: handler,
+	}
+	exec, err := ScanTestOutput(cfg)
+	assert.NilError(t, err)
+	actual := FilterFailedUnique(exec.Failed())
+
+	expected := []TestCase{
+		{
+			ID:      6,
+			Package: "k8s.io/kubernetes/test/integration/scheduler_perf",
+			Test:    "BenchmarkPerfScheduling/SchedulingDaemonset/15000Nodes",
+		},
+	}
+	cmpTestCase := cmp.AllowUnexported(TestCase{})
+	assert.DeepEqual(t, expected, actual, cmpTestCase)
+}
+
 func TestFilterFailedUnique_MultipleNested(t *testing.T) {
 	source := []byte(`{"Package": "pkg", "Action": "run"}
 	{"Package": "pkg", "Test": "TestParent", "Action": "run"}