Review Remarks

kubernetes-sigs · Jul 12, 2024 · a31adae · a31adae
1 parent f5866f6
commit a31adae
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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