Skip to content

Commit 7f41e53

Browse files
sivcharisivchari
committed
enable usetesting linter
Signed-off-by: sivchari <[email protected]>
1 parent 0028772 commit 7f41e53

File tree

88 files changed

+269
-331
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+269
-331
lines changed

‎.golangci.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ linters:
4747
- usestdlibvars # using variables/constants from the standard library
4848
- usetesting # report function to be replace by testing
4949
- whitespace # unnecessary newlines
50-
disable:
51-
# TODO: It will be dropped when the Go version migration is done.
52-
- usetesting
5350
settings:
5451
ginkgolinter:
5552
forbid-focus-container: true

‎cmd/clusterctl/client/alpha/rollout_pauser_test.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package alpha
1818

1919
import (
20-
"context"
2120
"testing"
2221

2322
. "github.com/onsi/gomega"
@@ -146,25 +145,25 @@ func Test_ObjectPauser(t *testing.T) {
146145
g := NewWithT(t)
147146
r := newRolloutClient()
148147
proxy := test.NewFakeProxy().WithObjs(tt.fields.objs...)
149-
err := r.ObjectPauser(context.Background(), proxy, tt.fields.ref)
148+
err := r.ObjectPauser(t.Context(), proxy, tt.fields.ref)
150149
if tt.wantErr {
151150
g.Expect(err).To(HaveOccurred())
152151
return
153152
}
154153
g.Expect(err).ToNot(HaveOccurred())
155154
for _, obj := range tt.fields.objs {
156-
cl, err := proxy.NewClient(context.Background())
155+
cl, err := proxy.NewClient(t.Context())
157156
g.Expect(err).ToNot(HaveOccurred())
158157
key := client.ObjectKeyFromObject(obj)
159158
switch obj.(type) {
160159
case *clusterv1.MachineDeployment:
161160
md := &clusterv1.MachineDeployment{}
162-
err = cl.Get(context.TODO(), key, md)
161+
err = cl.Get(t.Context(), key, md)
163162
g.Expect(err).ToNot(HaveOccurred())
164163
g.Expect(md.Spec.Paused).To(Equal(tt.wantPaused))
165164
case *controlplanev1.KubeadmControlPlane:
166165
kcp := &controlplanev1.KubeadmControlPlane{}
167-
err = cl.Get(context.TODO(), key, kcp)
166+
err = cl.Get(t.Context(), key, kcp)
168167
g.Expect(err).ToNot(HaveOccurred())
169168
g.Expect(annotations.HasPaused(kcp.GetObjectMeta())).To(Equal(tt.wantPaused))
170169
}

‎cmd/clusterctl/client/alpha/rollout_restarter_test.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package alpha
1818

1919
import (
20-
"context"
2120
"testing"
2221
"time"
2322

@@ -204,20 +203,20 @@ func Test_ObjectRestarter(t *testing.T) {
204203
g := NewWithT(t)
205204
r := newRolloutClient()
206205
proxy := test.NewFakeProxy().WithObjs(tt.fields.objs...)
207-
err := r.ObjectRestarter(context.Background(), proxy, tt.fields.ref)
206+
err := r.ObjectRestarter(t.Context(), proxy, tt.fields.ref)
208207
if tt.wantErr {
209208
g.Expect(err).To(HaveOccurred())
210209
return
211210
}
212211
g.Expect(err).ToNot(HaveOccurred())
213212
for _, obj := range tt.fields.objs {
214-
cl, err := proxy.NewClient(context.Background())
213+
cl, err := proxy.NewClient(t.Context())
215214
g.Expect(err).ToNot(HaveOccurred())
216215
key := client.ObjectKeyFromObject(obj)
217216
switch obj.(type) {
218217
case *clusterv1.MachineDeployment:
219218
md := &clusterv1.MachineDeployment{}
220-
err = cl.Get(context.TODO(), key, md)
219+
err = cl.Get(t.Context(), key, md)
221220
g.Expect(err).ToNot(HaveOccurred())
222221
if tt.wantRollout {
223222
g.Expect(md.Spec.RolloutAfter).NotTo(BeNil())
@@ -226,7 +225,7 @@ func Test_ObjectRestarter(t *testing.T) {
226225
}
227226
case *controlplanev1.KubeadmControlPlane:
228227
kcp := &controlplanev1.KubeadmControlPlane{}
229-
err = cl.Get(context.TODO(), key, kcp)
228+
err = cl.Get(t.Context(), key, kcp)
230229
g.Expect(err).ToNot(HaveOccurred())
231230
if tt.wantRollout {
232231
g.Expect(kcp.Spec.RolloutAfter).NotTo(BeNil())

‎cmd/clusterctl/client/alpha/rollout_resumer_test.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package alpha
1818

1919
import (
20-
"context"
2120
"testing"
2221

2322
. "github.com/onsi/gomega"
@@ -149,25 +148,25 @@ func Test_ObjectResumer(t *testing.T) {
149148
g := NewWithT(t)
150149
r := newRolloutClient()
151150
proxy := test.NewFakeProxy().WithObjs(tt.fields.objs...)
152-
err := r.ObjectResumer(context.Background(), proxy, tt.fields.ref)
151+
err := r.ObjectResumer(t.Context(), proxy, tt.fields.ref)
153152
if tt.wantErr {
154153
g.Expect(err).To(HaveOccurred())
155154
return
156155
}
157156
g.Expect(err).ToNot(HaveOccurred())
158157
for _, obj := range tt.fields.objs {
159-
cl, err := proxy.NewClient(context.Background())
158+
cl, err := proxy.NewClient(t.Context())
160159
g.Expect(err).ToNot(HaveOccurred())
161160
key := client.ObjectKeyFromObject(obj)
162161
switch obj.(type) {
163162
case *clusterv1.MachineDeployment:
164163
md := &clusterv1.MachineDeployment{}
165-
err = cl.Get(context.TODO(), key, md)
164+
err = cl.Get(t.Context(), key, md)
166165
g.Expect(err).ToNot(HaveOccurred())
167166
g.Expect(md.Spec.Paused).To(Equal(tt.wantPaused))
168167
case *controlplanev1.KubeadmControlPlane:
169168
kcp := &controlplanev1.KubeadmControlPlane{}
170-
err = cl.Get(context.TODO(), key, kcp)
169+
err = cl.Get(t.Context(), key, kcp)
171170
g.Expect(err).ToNot(HaveOccurred())
172171
g.Expect(annotations.HasPaused(kcp.GetObjectMeta())).To(Equal(tt.wantPaused))
173172
}

‎cmd/clusterctl/client/alpha/rollout_rollbacker_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package alpha
1818

1919
import (
20-
"context"
2120
"testing"
2221

2322
. "github.com/onsi/gomega"
@@ -241,17 +240,17 @@ func Test_ObjectRollbacker(t *testing.T) {
241240
g := NewWithT(t)
242241
r := newRolloutClient()
243242
proxy := test.NewFakeProxy().WithObjs(tt.fields.objs...)
244-
err := r.ObjectRollbacker(context.Background(), proxy, tt.fields.ref, tt.fields.toRevision)
243+
err := r.ObjectRollbacker(t.Context(), proxy, tt.fields.ref, tt.fields.toRevision)
245244
if tt.wantErr {
246245
g.Expect(err).To(HaveOccurred())
247246
return
248247
}
249248
g.Expect(err).ToNot(HaveOccurred())
250-
cl, err := proxy.NewClient(context.Background())
249+
cl, err := proxy.NewClient(t.Context())
251250
g.Expect(err).ToNot(HaveOccurred())
252251
key := client.ObjectKeyFromObject(deployment)
253252
md := &clusterv1.MachineDeployment{}
254-
err = cl.Get(context.TODO(), key, md)
253+
err = cl.Get(t.Context(), key, md)
255254
g.Expect(err).ToNot(HaveOccurred())
256255
g.Expect(*md.Spec.Template.Spec.Version).To(Equal(tt.wantVersion))
257256
g.Expect(md.Spec.Template.Spec.InfrastructureRef.Name).To(Equal(tt.wantInfraTemplate))

‎cmd/clusterctl/client/client_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ import (
4141
)
4242

4343
// TestNewFakeClient is a fake test to document fakeClient usage.
44-
func TestNewFakeClient(_ *testing.T) {
44+
func TestNewFakeClient(t *testing.T) {
4545
// create a fake config with a provider named P1 and a variable named var
4646
repository1Config := config.NewProvider("p1", "url", clusterctlv1.CoreProviderType)
4747

48-
ctx := context.Background()
48+
ctx := t.Context()
4949

5050
config1 := newFakeConfig(ctx).
5151
WithVar("var", "value").
@@ -62,7 +62,7 @@ func TestNewFakeClient(_ *testing.T) {
6262
WithObjs()
6363

6464
// create a new fakeClient that allows to execute tests on the fake config, the fake repositories and the fake cluster.
65-
newFakeClient(context.Background(), config1).
65+
newFakeClient(t.Context(), config1).
6666
WithRepository(repository1).
6767
WithCluster(cluster1)
6868
}

‎cmd/clusterctl/client/cluster/cert_manager_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ var certManagerNamespaceYaml = []byte("apiVersion: v1\n" +
6161
func Test_getManifestObjs(t *testing.T) {
6262
g := NewWithT(t)
6363

64-
defaultConfigClient, err := config.New(context.Background(), "", config.InjectReader(test.NewFakeReader().WithImageMeta(config.CertManagerImageComponent, "bar-repository.io", "")))
64+
defaultConfigClient, err := config.New(t.Context(), "", config.InjectReader(test.NewFakeReader().WithImageMeta(config.CertManagerImageComponent, "bar-repository.io", "")))
6565
g.Expect(err).ToNot(HaveOccurred())
6666

6767
type fields struct {
@@ -109,7 +109,7 @@ func Test_getManifestObjs(t *testing.T) {
109109
name: "successfully gets the cert-manager components for a custom release",
110110
fields: fields{
111111
configClient: func() config.Client {
112-
configClient, err := config.New(context.Background(), "", config.InjectReader(test.NewFakeReader().WithImageMeta(config.CertManagerImageComponent, "bar-repository.io", "").WithCertManager("", "v1.0.0", "")))
112+
configClient, err := config.New(t.Context(), "", config.InjectReader(test.NewFakeReader().WithImageMeta(config.CertManagerImageComponent, "bar-repository.io", "").WithCertManager("", "v1.0.0", "")))
113113
g.Expect(err).ToNot(HaveOccurred())
114114
return configClient
115115
}(),
@@ -125,7 +125,7 @@ func Test_getManifestObjs(t *testing.T) {
125125
t.Run(tt.name, func(t *testing.T) {
126126
g := NewWithT(t)
127127

128-
ctx := context.Background()
128+
ctx := t.Context()
129129

130130
cm := &certManagerClient{
131131
configClient: defaultConfigClient,
@@ -590,7 +590,7 @@ func Test_certManagerClient_deleteObjs(t *testing.T) {
590590
t.Run(tt.name, func(t *testing.T) {
591591
g := NewWithT(t)
592592

593-
ctx := context.Background()
593+
ctx := t.Context()
594594

595595
proxy := test.NewFakeProxy().WithObjs(tt.fields.objs...)
596596
cm := &certManagerClient{
@@ -622,7 +622,7 @@ func Test_certManagerClient_deleteObjs(t *testing.T) {
622622
cl, err := proxy.NewClient(ctx)
623623
g.Expect(err).ToNot(HaveOccurred())
624624

625-
err = cl.Get(context.Background(), client.ObjectKeyFromObject(obj), obj)
625+
err = cl.Get(t.Context(), client.ObjectKeyFromObject(obj), obj)
626626
switch objShouldStillExist {
627627
case true:
628628
g.Expect(err).ToNot(HaveOccurred())
@@ -736,7 +736,7 @@ func Test_certManagerClient_PlanUpgrade(t *testing.T) {
736736
t.Run(tt.name, func(t *testing.T) {
737737
g := NewWithT(t)
738738

739-
ctx := context.Background()
739+
ctx := t.Context()
740740

741741
proxy := test.NewFakeProxy().WithObjs(tt.objs...)
742742
fakeConfigClient := newFakeConfig()
@@ -798,7 +798,7 @@ func Test_certManagerClient_EnsureLatestVersion(t *testing.T) {
798798
proxy: tt.fields.proxy,
799799
}
800800

801-
err := cm.EnsureLatestVersion(context.Background())
801+
err := cm.EnsureLatestVersion(t.Context())
802802
if tt.wantErr {
803803
g.Expect(err).To(HaveOccurred())
804804
return

‎cmd/clusterctl/client/cluster/components_test.go

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package cluster
1818

1919
import (
20-
"context"
2120
"fmt"
2221
"testing"
2322

@@ -258,7 +257,7 @@ func Test_providerComponents_Delete(t *testing.T) {
258257

259258
c := newComponentsClient(proxy)
260259

261-
err := c.Delete(context.Background(), DeleteOptions{
260+
err := c.Delete(t.Context(), DeleteOptions{
262261
Provider: tt.args.provider,
263262
IncludeNamespace: tt.args.includeNamespace,
264263
IncludeCRDs: tt.args.includeCRD,
@@ -271,7 +270,7 @@ func Test_providerComponents_Delete(t *testing.T) {
271270

272271
g.Expect(err).ToNot(HaveOccurred())
273272

274-
cs, err := proxy.NewClient(context.Background())
273+
cs, err := proxy.NewClient(t.Context())
275274
g.Expect(err).ToNot(HaveOccurred())
276275

277276
for _, want := range tt.wantDiff {
@@ -284,7 +283,7 @@ func Test_providerComponents_Delete(t *testing.T) {
284283
Name: want.object.Name,
285284
}
286285

287-
err := cs.Get(context.Background(), key, obj)
286+
err := cs.Get(t.Context(), key, obj)
288287
if err != nil && !apierrors.IsNotFound(err) {
289288
t.Fatalf("Failed to get %v from the cluster: %v", key, err)
290289
}
@@ -323,19 +322,19 @@ func Test_providerComponents_DeleteCoreProviderWebhookNamespace(t *testing.T) {
323322
}
324323

325324
proxy := test.NewFakeProxy().WithObjs(initObjs...)
326-
proxyClient, _ := proxy.NewClient(context.Background())
325+
proxyClient, _ := proxy.NewClient(t.Context())
327326
var nsList corev1.NamespaceList
328327

329328
// assert length before deleting
330-
_ = proxyClient.List(context.Background(), &nsList)
329+
_ = proxyClient.List(t.Context(), &nsList)
331330
g.Expect(nsList.Items).Should(HaveLen(1))
332331

333332
c := newComponentsClient(proxy)
334-
err := c.DeleteWebhookNamespace(context.Background())
333+
err := c.DeleteWebhookNamespace(t.Context())
335334
g.Expect(err).To(Not(HaveOccurred()))
336335

337336
// assert length after deleting
338-
_ = proxyClient.List(context.Background(), &nsList)
337+
_ = proxyClient.List(t.Context(), &nsList)
339338
g.Expect(nsList.Items).Should(BeEmpty())
340339
})
341340
}
@@ -450,15 +449,15 @@ func Test_providerComponents_Create(t *testing.T) {
450449
}
451450
unstructuredObjectsToCreate = append(unstructuredObjectsToCreate, *uns)
452451
}
453-
err := c.Create(context.Background(), unstructuredObjectsToCreate)
452+
err := c.Create(t.Context(), unstructuredObjectsToCreate)
454453
if tt.wantErr {
455454
g.Expect(err).To(HaveOccurred())
456455
return
457456
}
458457

459458
g.Expect(err).ToNot(HaveOccurred())
460459

461-
cs, err := proxy.NewClient(context.Background())
460+
cs, err := proxy.NewClient(t.Context())
462461
g.Expect(err).ToNot(HaveOccurred())
463462

464463
for _, item := range tt.want {
@@ -470,7 +469,7 @@ func Test_providerComponents_Create(t *testing.T) {
470469
Name: item.GetName(),
471470
}
472471

473-
err := cs.Get(context.Background(), key, obj)
472+
err := cs.Get(t.Context(), key, obj)
474473

475474
if err != nil && !apierrors.IsNotFound(err) {
476475
t.Fatalf("Failed to get %v from the cluster: %v", key, err)
@@ -565,7 +564,7 @@ func Test_providerComponents_ValidateNoObjectsExist(t *testing.T) {
565564

566565
c := newComponentsClient(proxy)
567566

568-
if err := c.ValidateNoObjectsExist(context.Background(), tt.provider); (err != nil) != tt.wantErr {
567+
if err := c.ValidateNoObjectsExist(t.Context(), tt.provider); (err != nil) != tt.wantErr {
569568
t.Errorf("providerComponents.ValidateNoObjectsExist() error = %v, wantErr %v", err, tt.wantErr)
570569
}
571570
})

‎cmd/clusterctl/client/cluster/crd_migration_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,15 +203,15 @@ func Test_CRDMigrator(t *testing.T) {
203203
objs = append(objs, &tt.CRs[i])
204204
}
205205

206-
c, err := test.NewFakeProxy().WithObjs(objs...).NewClient(context.Background())
206+
c, err := test.NewFakeProxy().WithObjs(objs...).NewClient(t.Context())
207207
g.Expect(err).ToNot(HaveOccurred())
208208
countingClient := newUpgradeCountingClient(c)
209209

210210
m := crdMigrator{
211211
Client: countingClient,
212212
}
213213

214-
isMigrated, err := m.run(context.Background(), tt.newCRD)
214+
isMigrated, err := m.run(t.Context(), tt.newCRD)
215215
if tt.wantErr {
216216
g.Expect(err).To(HaveOccurred())
217217
} else {
@@ -228,7 +228,7 @@ func Test_CRDMigrator(t *testing.T) {
228228

229229
// Check storage versions has been cleaned up.
230230
currentCRD := &apiextensionsv1.CustomResourceDefinition{}
231-
err = c.Get(context.Background(), client.ObjectKeyFromObject(tt.newCRD), currentCRD)
231+
err = c.Get(t.Context(), client.ObjectKeyFromObject(tt.newCRD), currentCRD)
232232
g.Expect(err).ToNot(HaveOccurred())
233233
g.Expect(currentCRD.Status.StoredVersions).To(Equal(tt.wantStoredVersions))
234234
}

‎cmd/clusterctl/client/cluster/installer_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ func Test_providerInstaller_Validate(t *testing.T) {
292292
t.Run(tt.name, func(t *testing.T) {
293293
g := NewWithT(t)
294294

295-
ctx := context.Background()
295+
ctx := t.Context()
296296

297297
configClient, _ := config.New(ctx, "", config.InjectReader(fakeReader))
298298

0 commit comments

Comments
 (0)