merge PingSource TLS and OIDC tests

knative · Jun 20, 2024 · bbe334c · bbe334c
1 parent 134e569
commit bbe334c
Showing 1 changed file with 24 additions and 31 deletions.
diff --git a/test/rekt/pingsource_test.go b/test/rekt/pingsource_test.go
@@ -46,23 +46,6 @@ func TestPingSourceWithSinkRef(t *testing.T) {
 	env.Test(ctx, t, pingsource.SendsEventsWithSinkRef())
 }
 
-func TestPingSourceTLS(t *testing.T) {
-	t.Parallel()
-
-	ctx, env := global.Environment(
-		knative.WithKnativeNamespace(system.Namespace()),
-		knative.WithLoggingConfig,
-		knative.WithTracingConfig,
-		k8s.WithEventListener,
-		environment.Managed(t),
-		eventshub.WithTLS(t),
-	)
-	t.Cleanup(env.Finish)
-
-	env.ParallelTest(ctx, t, pingsource.SendsEventsTLS())
-	env.ParallelTest(ctx, t, pingsource.SendsEventsTLSTrustBundle())
-}
-
 func TestPingSourceWithSinkURI(t *testing.T) {
 	t.Parallel()
 
@@ -120,17 +103,27 @@ func TestPingSourceDataPlane_BrokerAsSinkTLS(t *testing.T) {
 	env.Test(ctx, t, pingsource.SendsEventsWithBrokerAsSinkTLS())
 }
 
-func TestPingSourceSendsEventsOIDC(t *testing.T) {
-	t.Parallel()
-
-	ctx, env := global.Environment(
-		knative.WithKnativeNamespace(system.Namespace()),
-		knative.WithLoggingConfig,
-		knative.WithTracingConfig,
-		k8s.WithEventListener,
-		environment.Managed(t),
-		eventshub.WithTLS(t),
-	)
-
-	env.Test(ctx, t, pingsource.PingSourceSendEventOIDC())
-}
+func TestPingSourceTLSAndOIDC(t *testing.T) {
+    t.Parallel()
+
+    ctx, env := global.Environment(
+        knative.WithKnativeNamespace(system.Namespace()),
+        knative.WithLoggingConfig,
+        knative.WithTracingConfig,
+        k8s.WithEventListener,
+        environment.Managed(t),
+        eventshub.WithTLS(t),
+    )
+    t.Cleanup(env.Finish)
+
+    t.Run("SendsEventsTLS", func(t *testing.T) {
+        t.Parallel()
+        env.ParallelTest(ctx, t, pingsource.SendsEventsTLS())
+        env.ParallelTest(ctx, t, pingsource.SendsEventsTLSTrustBundle())
+    })
+
+    t.Run("SendsEventsOIDC", func(t *testing.T) {
+        t.Parallel()
+        env.Test(ctx, t, pingsource.PingSourceSendEventOIDC())
+    })
+}