From 25451de1fa7fbbfd4f7c6d2ed099e66a09e60af7 Mon Sep 17 00:00:00 2001 From: Mohamed Chiheb Ben Jemaa Date: Tue, 28 Nov 2023 10:40:32 +0100 Subject: [PATCH] Change to context.Background() in tests --- cmd/clusterctl/client/alpha/rollout_pauser_test.go | 2 +- cmd/clusterctl/client/alpha/rollout_restarter_test.go | 2 +- cmd/clusterctl/client/alpha/rollout_resumer_test.go | 2 +- cmd/clusterctl/client/alpha/rollout_rollbacker_test.go | 2 +- cmd/clusterctl/client/cluster/components_test.go | 6 +++--- cmd/clusterctl/client/cluster/crd_migration_test.go | 2 +- cmd/clusterctl/client/tree/discovery_test.go | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmd/clusterctl/client/alpha/rollout_pauser_test.go b/cmd/clusterctl/client/alpha/rollout_pauser_test.go index 231799c4d529..ae5d0b939e6e 100644 --- a/cmd/clusterctl/client/alpha/rollout_pauser_test.go +++ b/cmd/clusterctl/client/alpha/rollout_pauser_test.go @@ -153,7 +153,7 @@ func Test_ObjectPauser(t *testing.T) { } g.Expect(err).ToNot(HaveOccurred()) for _, obj := range tt.fields.objs { - cl, err := proxy.NewClient(context.TODO()) + cl, err := proxy.NewClient(context.Background()) g.Expect(err).ToNot(HaveOccurred()) key := client.ObjectKeyFromObject(obj) switch obj.(type) { diff --git a/cmd/clusterctl/client/alpha/rollout_restarter_test.go b/cmd/clusterctl/client/alpha/rollout_restarter_test.go index d2e721f210b2..14969e1946f2 100644 --- a/cmd/clusterctl/client/alpha/rollout_restarter_test.go +++ b/cmd/clusterctl/client/alpha/rollout_restarter_test.go @@ -211,7 +211,7 @@ func Test_ObjectRestarter(t *testing.T) { } g.Expect(err).ToNot(HaveOccurred()) for _, obj := range tt.fields.objs { - cl, err := proxy.NewClient(context.TODO()) + cl, err := proxy.NewClient(context.Background()) g.Expect(err).ToNot(HaveOccurred()) key := client.ObjectKeyFromObject(obj) switch obj.(type) { diff --git a/cmd/clusterctl/client/alpha/rollout_resumer_test.go b/cmd/clusterctl/client/alpha/rollout_resumer_test.go index 029c58734e51..da85fb930291 100644 --- a/cmd/clusterctl/client/alpha/rollout_resumer_test.go +++ b/cmd/clusterctl/client/alpha/rollout_resumer_test.go @@ -156,7 +156,7 @@ func Test_ObjectResumer(t *testing.T) { } g.Expect(err).ToNot(HaveOccurred()) for _, obj := range tt.fields.objs { - cl, err := proxy.NewClient(context.TODO()) + cl, err := proxy.NewClient(context.Background()) g.Expect(err).ToNot(HaveOccurred()) key := client.ObjectKeyFromObject(obj) switch obj.(type) { diff --git a/cmd/clusterctl/client/alpha/rollout_rollbacker_test.go b/cmd/clusterctl/client/alpha/rollout_rollbacker_test.go index 29f27e3d0ef9..9ddf27de008f 100644 --- a/cmd/clusterctl/client/alpha/rollout_rollbacker_test.go +++ b/cmd/clusterctl/client/alpha/rollout_rollbacker_test.go @@ -247,7 +247,7 @@ func Test_ObjectRollbacker(t *testing.T) { return } g.Expect(err).ToNot(HaveOccurred()) - cl, err := proxy.NewClient(context.TODO()) + cl, err := proxy.NewClient(context.Background()) g.Expect(err).ToNot(HaveOccurred()) key := client.ObjectKeyFromObject(deployment) md := &clusterv1.MachineDeployment{} diff --git a/cmd/clusterctl/client/cluster/components_test.go b/cmd/clusterctl/client/cluster/components_test.go index c5355876e5f0..e67692d5d6ff 100644 --- a/cmd/clusterctl/client/cluster/components_test.go +++ b/cmd/clusterctl/client/cluster/components_test.go @@ -270,7 +270,7 @@ func Test_providerComponents_Delete(t *testing.T) { g.Expect(err).ToNot(HaveOccurred()) - cs, err := proxy.NewClient(context.TODO()) + cs, err := proxy.NewClient(context.Background()) g.Expect(err).ToNot(HaveOccurred()) for _, want := range tt.wantDiff { @@ -322,7 +322,7 @@ func Test_providerComponents_DeleteCoreProviderWebhookNamespace(t *testing.T) { } proxy := test.NewFakeProxy().WithObjs(initObjs...) - proxyClient, _ := proxy.NewClient(context.TODO()) + proxyClient, _ := proxy.NewClient(context.Background()) var nsList corev1.NamespaceList // assert length before deleting @@ -457,7 +457,7 @@ func Test_providerComponents_Create(t *testing.T) { g.Expect(err).ToNot(HaveOccurred()) - cs, err := proxy.NewClient(context.TODO()) + cs, err := proxy.NewClient(context.Background()) g.Expect(err).ToNot(HaveOccurred()) for _, item := range tt.want { diff --git a/cmd/clusterctl/client/cluster/crd_migration_test.go b/cmd/clusterctl/client/cluster/crd_migration_test.go index 8bee2c261e05..950e5150b875 100644 --- a/cmd/clusterctl/client/cluster/crd_migration_test.go +++ b/cmd/clusterctl/client/cluster/crd_migration_test.go @@ -264,7 +264,7 @@ func Test_CRDMigrator(t *testing.T) { objs = append(objs, &tt.CRs[i]) } - c, err := test.NewFakeProxy().WithObjs(objs...).NewClient(context.TODO()) + c, err := test.NewFakeProxy().WithObjs(objs...).NewClient(context.Background()) g.Expect(err).ToNot(HaveOccurred()) countingClient := newUpgradeCountingClient(c) diff --git a/cmd/clusterctl/client/tree/discovery_test.go b/cmd/clusterctl/client/tree/discovery_test.go index fbb5f6a99af1..ed8bb4284710 100644 --- a/cmd/clusterctl/client/tree/discovery_test.go +++ b/cmd/clusterctl/client/tree/discovery_test.go @@ -841,7 +841,7 @@ func Test_Discovery(t *testing.T) { t.Run(tt.name, func(t *testing.T) { g := NewWithT(t) - client, err := test.NewFakeProxy().WithObjs(tt.args.objs...).NewClient(context.TODO()) + client, err := test.NewFakeProxy().WithObjs(tt.args.objs...).NewClient(context.Background()) g.Expect(client).ToNot(BeNil()) g.Expect(err).ToNot(HaveOccurred())