From 134e56959238033cd6f33bc166401d930acb681e Mon Sep 17 00:00:00 2001 From: Prajjwal Yadav Date: Thu, 20 Jun 2024 19:45:36 +0000 Subject: [PATCH 1/2] merge TLS and OIDC parallel tests --- test/rekt/parallel_test.go | 51 ++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 29 deletions(-) diff --git a/test/rekt/parallel_test.go b/test/rekt/parallel_test.go index fab2e3223ce..67cea85e317 100644 --- a/test/rekt/parallel_test.go +++ b/test/rekt/parallel_test.go @@ -51,22 +51,6 @@ func TestParallel(t *testing.T) { env.Test(ctx, t, parallel.ParallelWithTwoBranches(channel_template.ImmemoryChannelTemplate())) } -func TestParallelTLS(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.Test(ctx, t, parallel.ParallelWithTwoBranchesTLS(channel_template.ImmemoryChannelTemplate())) -} - func TestParallelSupportsOIDC(t *testing.T) { t.Parallel() @@ -88,17 +72,26 @@ func TestParallelSupportsOIDC(t *testing.T) { env.Test(ctx, t, parallel.ParallelHasAudienceOfInputChannel(name, env.Namespace(), channel_impl.GVR(), channel_impl.GVK().Kind)) } -func TestParallelTwoBranchesWithOIDC(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, parallel.ParallelWithTwoBranchesOIDC(channel_template.ImmemoryChannelTemplate())) +func TestParallelTLSAndOIDC(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("TestParallelTLS", func(t *testing.T) { + t.Parallel() + env.Test(ctx, t, parallel.ParallelWithTwoBranchesTLS(channel_template.ImmemoryChannelTemplate())) + }) + + t.Run("TestParallelOIDC", func(t *testing.T) { + t.Parallel() + env.Test(ctx, t, parallel.ParallelWithTwoBranchesOIDC(channel_template.ImmemoryChannelTemplate())) + }) } From bbe334c723d21aa7b6506571658287d37c94c931 Mon Sep 17 00:00:00 2001 From: Prajjwal Yadav Date: Thu, 20 Jun 2024 20:51:23 +0000 Subject: [PATCH 2/2] merge PingSource TLS and OIDC tests --- test/rekt/pingsource_test.go | 55 ++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/test/rekt/pingsource_test.go b/test/rekt/pingsource_test.go index 1aab02f7e8c..0c3831ec4af 100644 --- 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()) + }) +} \ No newline at end of file