From a31adaeaf2ec2bff2908c48c9e0e39b46e80a789 Mon Sep 17 00:00:00 2001 From: Traian Schiau Date: Fri, 12 Jul 2024 17:44:36 +0300 Subject: [PATCH] Review Remarks --- pkg/controller/jobframework/reconciler_test.go | 2 +- pkg/controller/jobs/job/job_controller_test.go | 2 +- pkg/controller/jobs/pod/pod_webhook_test.go | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/controller/jobframework/reconciler_test.go b/pkg/controller/jobframework/reconciler_test.go index 11dc29b399..e2d1b6ffb1 100644 --- a/pkg/controller/jobframework/reconciler_test.go +++ b/pkg/controller/jobframework/reconciler_test.go @@ -84,7 +84,7 @@ func TestIsParentJobManaged(t *testing.T) { } for name, tc := range cases { t.Run(name, func(t *testing.T) { - defer EnableIntegrationsForTest(t, "kubeflow.org/mpijob")() + t.Cleanup(EnableIntegrationsForTest(t, "kubeflow.org/mpijob")) builder := utiltesting.NewClientBuilder(kubeflow.AddToScheme) if tc.parentJob != nil { builder = builder.WithObjects(tc.parentJob) diff --git a/pkg/controller/jobs/job/job_controller_test.go b/pkg/controller/jobs/job/job_controller_test.go index 29aa874607..15bae696be 100644 --- a/pkg/controller/jobs/job/job_controller_test.go +++ b/pkg/controller/jobs/job/job_controller_test.go @@ -396,7 +396,7 @@ var ( ) func TestReconciler(t *testing.T) { - defer jobframework.EnableIntegrationsForTest(t, FrameworkName)() + t.Cleanup(jobframework.EnableIntegrationsForTest(t, FrameworkName)) baseJobWrapper := utiltestingjob.MakeJob("job", "ns"). Suspend(true). Queue("foo"). diff --git a/pkg/controller/jobs/pod/pod_webhook_test.go b/pkg/controller/jobs/pod/pod_webhook_test.go index 3b0cd5d159..66f2c0bb21 100644 --- a/pkg/controller/jobs/pod/pod_webhook_test.go +++ b/pkg/controller/jobs/pod/pod_webhook_test.go @@ -286,7 +286,7 @@ func TestDefault(t *testing.T) { for name, tc := range testCases { t.Run(name, func(t *testing.T) { - defer jobframework.EnableIntegrationsForTest(t, tc.enableIntegrations...)() + t.Cleanup(jobframework.EnableIntegrationsForTest(t, tc.enableIntegrations...)) builder := utiltesting.NewClientBuilder() builder = builder.WithObjects(tc.initObjects...) cli := builder.Build() @@ -400,7 +400,7 @@ func TestGetRoleHash(t *testing.T) { } func TestValidateCreate(t *testing.T) { - defer jobframework.EnableIntegrationsForTest(t, "batch/job")() + t.Cleanup(jobframework.EnableIntegrationsForTest(t, "batch/job")) testCases := map[string]struct { pod *corev1.Pod wantErr error @@ -503,7 +503,7 @@ func TestValidateCreate(t *testing.T) { } func TestValidateUpdate(t *testing.T) { - defer jobframework.EnableIntegrationsForTest(t, "batch/job")() + t.Cleanup(jobframework.EnableIntegrationsForTest(t, "batch/job")) testCases := map[string]struct { oldPod *corev1.Pod newPod *corev1.Pod