Merge branch 'main' into bugfix/ocp-414-link

cardil · Aug 29, 2023 · 15203f0 · 15203f0
2 parents 20bc3c6 + 30f70bc
commit 15203f0
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/test/servinge2e/kourier/service_to_service_test.go b/test/servinge2e/kourier/service_to_service_test.go
@@ -18,10 +18,6 @@ import (
 // services from within the cluster.
 func TestServiceToServiceCalls(t *testing.T) {
 
-	caCtx := test.SetupClusterAdmin(t)
-	test.CleanupOnInterrupt(t, func() { test.CleanupAll(t, caCtx) })
-	defer test.CleanupAll(t, caCtx)
-
 	tests := []testCase{{
 		// Requests go via gateway -> activator -> pod.
 		name: "service-call-via-activator",
@@ -58,7 +54,11 @@ func TestServiceToServiceCalls(t *testing.T) {
 	for _, scenario := range tests {
 		scenario := scenario
 		t.Run(scenario.name, func(t *testing.T) {
-			testServiceToService(t, caCtx, test.Namespace, scenario)
+			// Create a new context to prevent calling ctx.T.Fatal on parent T.
+			ctx := test.SetupClusterAdmin(t)
+			test.CleanupOnInterrupt(t, func() { test.CleanupAll(t, ctx) })
+			defer test.CleanupAll(t, ctx)
+			testServiceToService(t, ctx, test.Namespace, scenario)
 		})
 	}
 }