Skip to content

Commit 181412e

Browse files
authored
Fix lint (stakater#2)
1 parent 72bc75f commit 181412e

1 file changed

Lines changed: 41 additions & 16 deletions

File tree

internal/pkg/callbacks/rolling_upgrade_test.go

Lines changed: 41 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,8 @@ func TestResourceItem(t *testing.T) {
172172
_, err = tt.getItemFunc(clients, accessor.GetName(), fixtures.namespace)
173173
assert.NoError(t, err)
174174

175-
tt.deleteFunc(clients, fixtures.namespace, accessor.GetName())
175+
err = tt.deleteFunc(clients, fixtures.namespace, accessor.GetName())
176+
assert.NoError(t, err)
176177
})
177178
}
178179
}
@@ -184,7 +185,7 @@ func TestResourceItems(t *testing.T) {
184185
name string
185186
createFunc func(kube.Clients, string) error
186187
getItemsFunc func(kube.Clients, string) []runtime.Object
187-
deleteFunc func(kube.Clients, string)
188+
deleteFunc func(kube.Clients, string) error
188189
expectedCount int
189190
}{
190191
{
@@ -352,7 +353,8 @@ func TestUpdateResources(t *testing.T) {
352353
accessor, err := meta.Accessor(resource)
353354
assert.NoError(t, err)
354355

355-
tt.deleteFunc(clients, fixtures.namespace, accessor.GetName())
356+
err = tt.deleteFunc(clients, fixtures.namespace, accessor.GetName())
357+
assert.NoError(t, err)
356358
})
357359
}
358360
}
@@ -404,7 +406,8 @@ func TestPatchResources(t *testing.T) {
404406
accessor, err := meta.Accessor(resource)
405407
assert.NoError(t, err)
406408

407-
tt.deleteFunc(clients, fixtures.namespace, accessor.GetName())
409+
err = tt.deleteFunc(clients, fixtures.namespace, accessor.GetName())
410+
assert.NoError(t, err)
408411
})
409412
}
410413
}
@@ -418,7 +421,8 @@ func TestCreateJobFromCronjob(t *testing.T) {
418421
err = callbacks.CreateJobFromCronjob(clients, fixtures.namespace, cronJob.(*batchv1.CronJob))
419422
assert.NoError(t, err)
420423

421-
deleteTestCronJob(clients, fixtures.namespace, "test-cronjob")
424+
err = deleteTestCronJob(clients, fixtures.namespace, "test-cronjob")
425+
assert.NoError(t, err)
422426
}
423427

424428
func TestReCreateJobFromJob(t *testing.T) {
@@ -430,7 +434,8 @@ func TestReCreateJobFromJob(t *testing.T) {
430434
err = callbacks.ReCreateJobFromjob(clients, fixtures.namespace, job.(*batchv1.Job))
431435
assert.NoError(t, err)
432436

433-
deleteTestJob(clients, fixtures.namespace, "test-cronjob")
437+
err = deleteTestJob(clients, fixtures.namespace, "test-job")
438+
assert.NoError(t, err)
434439
}
435440

436441
func TestGetVolumes(t *testing.T) {
@@ -510,10 +515,14 @@ func createTestDeployments(clients kube.Clients, namespace string) error {
510515
return nil
511516
}
512517

513-
func deleteTestDeployments(clients kube.Clients, namespace string) {
518+
func deleteTestDeployments(clients kube.Clients, namespace string) error {
514519
for i := 1; i <= 2; i++ {
515-
testutil.DeleteDeployment(clients.KubernetesClient, namespace, fmt.Sprintf("test-deployment-%d", i))
520+
err := testutil.DeleteDeployment(clients.KubernetesClient, namespace, fmt.Sprintf("test-deployment-%d", i))
521+
if err != nil {
522+
return err
523+
}
516524
}
525+
return nil
517526
}
518527

519528
func createTestCronJobs(clients kube.Clients, namespace string) error {
@@ -526,10 +535,14 @@ func createTestCronJobs(clients kube.Clients, namespace string) error {
526535
return nil
527536
}
528537

529-
func deleteTestCronJobs(clients kube.Clients, namespace string) {
538+
func deleteTestCronJobs(clients kube.Clients, namespace string) error {
530539
for i := 1; i <= 2; i++ {
531-
testutil.DeleteCronJob(clients.KubernetesClient, namespace, fmt.Sprintf("test-cron-%d", i))
540+
err := testutil.DeleteCronJob(clients.KubernetesClient, namespace, fmt.Sprintf("test-cron-%d", i))
541+
if err != nil {
542+
return err
543+
}
532544
}
545+
return nil
533546
}
534547

535548
func createTestJobs(clients kube.Clients, namespace string) error {
@@ -542,10 +555,14 @@ func createTestJobs(clients kube.Clients, namespace string) error {
542555
return nil
543556
}
544557

545-
func deleteTestJobs(clients kube.Clients, namespace string) {
558+
func deleteTestJobs(clients kube.Clients, namespace string) error {
546559
for i := 1; i <= 2; i++ {
547-
testutil.DeleteJob(clients.KubernetesClient, namespace, fmt.Sprintf("test-job-%d", i))
560+
err := testutil.DeleteJob(clients.KubernetesClient, namespace, fmt.Sprintf("test-job-%d", i))
561+
if err != nil {
562+
return err
563+
}
548564
}
565+
return nil
549566
}
550567

551568
func createTestDaemonSets(clients kube.Clients, namespace string) error {
@@ -558,10 +575,14 @@ func createTestDaemonSets(clients kube.Clients, namespace string) error {
558575
return nil
559576
}
560577

561-
func deleteTestDaemonSets(clients kube.Clients, namespace string) {
578+
func deleteTestDaemonSets(clients kube.Clients, namespace string) error {
562579
for i := 1; i <= 2; i++ {
563-
testutil.DeleteDaemonSet(clients.KubernetesClient, namespace, fmt.Sprintf("test-daemonset-%d", i))
580+
err := testutil.DeleteDaemonSet(clients.KubernetesClient, namespace, fmt.Sprintf("test-daemonset-%d", i))
581+
if err != nil {
582+
return err
583+
}
564584
}
585+
return nil
565586
}
566587

567588
func createTestStatefulSets(clients kube.Clients, namespace string) error {
@@ -574,10 +595,14 @@ func createTestStatefulSets(clients kube.Clients, namespace string) error {
574595
return nil
575596
}
576597

577-
func deleteTestStatefulSets(clients kube.Clients, namespace string) {
598+
func deleteTestStatefulSets(clients kube.Clients, namespace string) error {
578599
for i := 1; i <= 2; i++ {
579-
testutil.DeleteStatefulSet(clients.KubernetesClient, namespace, fmt.Sprintf("test-statefulset-%d", i))
600+
err := testutil.DeleteStatefulSet(clients.KubernetesClient, namespace, fmt.Sprintf("test-statefulset-%d", i))
601+
if err != nil {
602+
return err
603+
}
580604
}
605+
return nil
581606
}
582607

583608
func createResourceWithPodAnnotations(obj runtime.Object, annotations map[string]string) runtime.Object {

0 commit comments

Comments
 (0)