Skip to content

Commit 09b3f6d

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#93214 from trashhalo/prefer-error
test: prefer NoError/Error over Nil/NotNil
2 parents 3ba1411 + 203679c commit 09b3f6d

36 files changed

+113
-113
lines changed

‎pkg/controller/endpointslice/endpointslice_controller_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func TestSyncServiceNoSelector(t *testing.T) {
9898
})
9999

100100
err := esController.syncService(fmt.Sprintf("%s/%s", ns, serviceName))
101-
assert.Nil(t, err)
101+
assert.NoError(t, err)
102102
assert.Len(t, client.Actions(), 0)
103103
}
104104

@@ -117,7 +117,7 @@ func TestSyncServicePendingDeletion(t *testing.T) {
117117
})
118118

119119
err := esController.syncService(fmt.Sprintf("%s/%s", ns, serviceName))
120-
assert.Nil(t, err)
120+
assert.NoError(t, err)
121121
assert.Len(t, client.Actions(), 0)
122122
}
123123

@@ -366,7 +366,7 @@ func TestSyncServiceFull(t *testing.T) {
366366

367367
// run through full sync service loop
368368
err = esController.syncService(fmt.Sprintf("%s/%s", namespace, serviceName))
369-
assert.Nil(t, err)
369+
assert.NoError(t, err)
370370

371371
// last action should be to create endpoint slice
372372
expectActions(t, client.Actions(), 1, "create", "endpointslices")

‎pkg/kubelet/cm/container_manager_linux_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func fakeContainerMgrMountInt() mount.Interface {
5959

6060
func TestCgroupMountValidationSuccess(t *testing.T) {
6161
f, err := validateSystemRequirements(fakeContainerMgrMountInt())
62-
assert.Nil(t, err)
62+
assert.NoError(t, err)
6363
if cgroups.IsCgroup2UnifiedMode() {
6464
assert.True(t, f.cpuHardcapping, "cpu hardcapping is expected to be enabled")
6565
} else {
@@ -116,7 +116,7 @@ func TestCgroupMountValidationMultipleSubsystem(t *testing.T) {
116116
},
117117
})
118118
_, err := validateSystemRequirements(mountInt)
119-
assert.Nil(t, err)
119+
assert.NoError(t, err)
120120
}
121121

122122
func TestGetCpuWeight(t *testing.T) {

‎pkg/kubelet/dockershim/docker_container_windows_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func TestApplyGMSAConfig(t *testing.T) {
9191
cleanupInfo := &containerCleanupInfo{}
9292
err := applyGMSAConfig(containerConfigWithGMSAAnnotation, createConfig, cleanupInfo)
9393

94-
assert.Nil(t, err)
94+
assert.NoError(t, err)
9595

9696
// the registry key should have been properly created
9797
if assert.Equal(t, 1, len(key.setStringValueArgs)) {
@@ -114,7 +114,7 @@ func TestApplyGMSAConfig(t *testing.T) {
114114
cleanupInfo := &containerCleanupInfo{}
115115
err := applyGMSAConfig(containerConfigWithGMSAAnnotation, createConfig, cleanupInfo)
116116

117-
assert.Nil(t, err)
117+
assert.NoError(t, err)
118118

119119
if assert.NotNil(t, createConfig.HostConfig) && assert.Equal(t, 1, len(createConfig.HostConfig.SecurityOpt)) {
120120
secOpt := createConfig.HostConfig.SecurityOpt[0]
@@ -135,15 +135,15 @@ func TestApplyGMSAConfig(t *testing.T) {
135135

136136
err := applyGMSAConfig(containerConfigWithGMSAAnnotation, &dockertypes.ContainerCreateConfig{}, &containerCleanupInfo{})
137137

138-
require.NotNil(t, err)
138+
require.Error(t, err)
139139
assert.Contains(t, err.Error(), "error when generating gMSA registry value name: unable to generate random string")
140140
})
141141
t.Run("if there's an error opening the registry key", func(t *testing.T) {
142142
defer setRegistryCreateKeyFunc(t, &dummyRegistryKey{}, fmt.Errorf("dummy error"))()
143143

144144
err := applyGMSAConfig(containerConfigWithGMSAAnnotation, &dockertypes.ContainerCreateConfig{}, &containerCleanupInfo{})
145145

146-
require.NotNil(t, err)
146+
require.Error(t, err)
147147
assert.Contains(t, err.Error(), "unable to open registry key")
148148
})
149149
t.Run("if there's an error writing to the registry key", func(t *testing.T) {
@@ -153,7 +153,7 @@ func TestApplyGMSAConfig(t *testing.T) {
153153

154154
err := applyGMSAConfig(containerConfigWithGMSAAnnotation, &dockertypes.ContainerCreateConfig{}, &containerCleanupInfo{})
155155

156-
if assert.NotNil(t, err) {
156+
if assert.Error(t, err) {
157157
assert.Contains(t, err.Error(), "unable to write into registry value")
158158
}
159159
assert.True(t, key.closed)
@@ -163,7 +163,7 @@ func TestApplyGMSAConfig(t *testing.T) {
163163

164164
err := applyGMSAConfig(&runtimeapi.ContainerConfig{}, createConfig, &containerCleanupInfo{})
165165

166-
assert.Nil(t, err)
166+
assert.NoError(t, err)
167167
assert.Nil(t, createConfig.HostConfig)
168168
})
169169
}
@@ -178,7 +178,7 @@ func TestRemoveGMSARegistryValue(t *testing.T) {
178178

179179
err := removeGMSARegistryValue(cleanupInfoWithValue)
180180

181-
assert.Nil(t, err)
181+
assert.NoError(t, err)
182182

183183
// the registry key should have been properly deleted
184184
if assert.Equal(t, 1, len(key.deleteValueArgs)) {
@@ -191,7 +191,7 @@ func TestRemoveGMSARegistryValue(t *testing.T) {
191191

192192
err := removeGMSARegistryValue(cleanupInfoWithValue)
193193

194-
require.NotNil(t, err)
194+
require.Error(t, err)
195195
assert.Contains(t, err.Error(), "unable to open registry key")
196196
})
197197
t.Run("if there's an error deleting from the registry key", func(t *testing.T) {
@@ -201,7 +201,7 @@ func TestRemoveGMSARegistryValue(t *testing.T) {
201201

202202
err := removeGMSARegistryValue(cleanupInfoWithValue)
203203

204-
if assert.NotNil(t, err) {
204+
if assert.Error(t, err) {
205205
assert.Contains(t, err.Error(), "unable to remove registry value")
206206
}
207207
assert.True(t, key.closed)
@@ -212,7 +212,7 @@ func TestRemoveGMSARegistryValue(t *testing.T) {
212212

213213
err := removeGMSARegistryValue(&containerCleanupInfo{})
214214

215-
assert.Nil(t, err)
215+
assert.NoError(t, err)
216216
assert.Equal(t, 0, len(key.deleteValueArgs))
217217
})
218218
}

‎pkg/kubelet/dockershim/security_context_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ func TestModifyContainerConfig(t *testing.T) {
125125
dockerCfg := &dockercontainer.Config{}
126126
err := modifyContainerConfig(tc.sc, dockerCfg)
127127
if tc.isErr {
128-
assert.NotNil(t, err)
128+
assert.Error(t, err)
129129
} else {
130-
assert.Nil(t, err)
130+
assert.NoError(t, err)
131131
assert.Equal(t, tc.expected, dockerCfg, "[Test case %q]", tc.name)
132132
}
133133
}

‎pkg/volume/awsebs/aws_ebs_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ func TestGetCandidateZone(t *testing.T) {
411411

412412
for _, test := range tests {
413413
zones, err := getCandidateZones(test.cloud, test.node)
414-
assert.Nil(t, err)
414+
assert.NoError(t, err)
415415
assert.Equal(t, test.expectedZones, zones)
416416
}
417417
}
@@ -444,7 +444,7 @@ func TestFormatVolumeID(t *testing.T) {
444444
}
445445
for _, test := range tests {
446446
volumeID, err := formatVolumeID(test.volumeIDFromPath)
447-
assert.Nil(t, err)
447+
assert.NoError(t, err)
448448
assert.Equal(t, test.expectedVolumeID, volumeID, test.volumeIDFromPath)
449449
}
450450
}

‎staging/src/k8s.io/apiextensions-apiserver/test/integration/versioning_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func TestInternalVersionIsHandlerVersion(t *testing.T) {
112112
i++
113113

114114
_, err := noxuNamespacedResourceClientV1beta2.Patch(context.TODO(), "foo", types.MergePatchType, patch, metav1.PatchOptions{})
115-
assert.NotNil(t, err)
115+
assert.Error(t, err)
116116

117117
// work around "grpc: the client connection is closing" error
118118
// TODO: fix the grpc error

‎staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/helpers_test.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -80,47 +80,47 @@ func TestNestedFieldNoCopy(t *testing.T) {
8080
// case 1: field exists and is non-nil
8181
res, exists, err := NestedFieldNoCopy(obj, "a", "b")
8282
assert.True(t, exists)
83-
assert.Nil(t, err)
83+
assert.NoError(t, err)
8484
assert.Equal(t, target, res)
8585
target["foo"] = "baz"
8686
assert.Equal(t, target["foo"], res.(map[string]interface{})["foo"], "result should be a reference to the expected item")
8787

8888
// case 2: field exists and is nil
8989
res, exists, err = NestedFieldNoCopy(obj, "a", "c")
9090
assert.True(t, exists)
91-
assert.Nil(t, err)
91+
assert.NoError(t, err)
9292
assert.Nil(t, res)
9393

9494
// case 3: error traversing obj
9595
res, exists, err = NestedFieldNoCopy(obj, "a", "d", "foo")
9696
assert.False(t, exists)
97-
assert.NotNil(t, err)
97+
assert.Error(t, err)
9898
assert.Nil(t, res)
9999

100100
// case 4: field does not exist
101101
res, exists, err = NestedFieldNoCopy(obj, "a", "g")
102102
assert.False(t, exists)
103-
assert.Nil(t, err)
103+
assert.NoError(t, err)
104104
assert.Nil(t, res)
105105

106106
// case 5: intermediate field does not exist
107107
res, exists, err = NestedFieldNoCopy(obj, "a", "g", "f")
108108
assert.False(t, exists)
109-
assert.Nil(t, err)
109+
assert.NoError(t, err)
110110
assert.Nil(t, res)
111111

112112
// case 6: intermediate field is null
113113
// (background: happens easily in YAML)
114114
res, exists, err = NestedFieldNoCopy(obj, "a", "c", "f")
115115
assert.False(t, exists)
116-
assert.Nil(t, err)
116+
assert.NoError(t, err)
117117
assert.Nil(t, res)
118118

119119
// case 7: array/slice syntax is not supported
120120
// (background: users may expect this to be supported)
121121
res, exists, err = NestedFieldNoCopy(obj, "a", "e[0]")
122122
assert.False(t, exists)
123-
assert.Nil(t, err)
123+
assert.NoError(t, err)
124124
assert.Nil(t, res)
125125
}
126126

@@ -138,27 +138,27 @@ func TestNestedFieldCopy(t *testing.T) {
138138
// case 1: field exists and is non-nil
139139
res, exists, err := NestedFieldCopy(obj, "a", "b")
140140
assert.True(t, exists)
141-
assert.Nil(t, err)
141+
assert.NoError(t, err)
142142
assert.Equal(t, target, res)
143143
target["foo"] = "baz"
144144
assert.NotEqual(t, target["foo"], res.(map[string]interface{})["foo"], "result should be a copy of the expected item")
145145

146146
// case 2: field exists and is nil
147147
res, exists, err = NestedFieldCopy(obj, "a", "c")
148148
assert.True(t, exists)
149-
assert.Nil(t, err)
149+
assert.NoError(t, err)
150150
assert.Nil(t, res)
151151

152152
// case 3: error traversing obj
153153
res, exists, err = NestedFieldCopy(obj, "a", "d", "foo")
154154
assert.False(t, exists)
155-
assert.NotNil(t, err)
155+
assert.Error(t, err)
156156
assert.Nil(t, res)
157157

158158
// case 4: field does not exist
159159
res, exists, err = NestedFieldCopy(obj, "a", "e")
160160
assert.False(t, exists)
161-
assert.Nil(t, err)
161+
assert.NoError(t, err)
162162
assert.Nil(t, res)
163163
}
164164

‎staging/src/k8s.io/apimachinery/pkg/util/net/http_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ func TestConnectWithRedirects(t *testing.T) {
428428
require.NoError(t, err, "unexpected request error")
429429

430430
result, err := ioutil.ReadAll(resp.Body)
431-
assert.Nil(t, err)
431+
assert.NoError(t, err)
432432
require.NoError(t, resp.Body.Close())
433433
if test.expectedRedirects < len(test.redirects) {
434434
// Expect the last redirect to be returned.

‎staging/src/k8s.io/apiserver/pkg/audit/policy/enforce_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func TestEnforcePolicy(t *testing.T) {
8282
objectFuzzer.Fuzz(e)
8383
ev, err := EnforcePolicy(e, tc.level, tc.omitStages)
8484
if omitSet.Has(string(e.Stage)) {
85-
require.Nil(t, err)
85+
require.NoError(t, err)
8686
require.Nil(t, ev)
8787
return
8888
}
@@ -136,10 +136,10 @@ func TestEnforcePolicy(t *testing.T) {
136136
expected.Level = tc.level
137137
require.Equal(t, expected, ev)
138138
default:
139-
require.NotNil(t, err)
139+
require.Error(t, err)
140140
return
141141
}
142-
require.Nil(t, err)
142+
require.NoError(t, err)
143143
}
144144
})
145145
}

‎staging/src/k8s.io/client-go/testing/fixture_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ func TestGetWithExactMatch(t *testing.T) {
283283
constructObject := func(s schema.GroupVersionResource, name, namespace string) (*unstructured.Unstructured, schema.GroupVersionResource) {
284284
obj := getArbitraryResource(s, name, namespace)
285285
gvks, _, err := scheme.ObjectKinds(obj)
286-
assert.Nil(t, err)
286+
assert.NoError(t, err)
287287
gvr, _ := meta.UnsafeGuessKindToResource(gvks[0])
288288
return obj, gvr
289289
}
@@ -298,11 +298,11 @@ func TestGetWithExactMatch(t *testing.T) {
298298

299299
// Exact match
300300
_, err = o.Get(gvr, "", "node")
301-
assert.Nil(t, err)
301+
assert.NoError(t, err)
302302

303303
// Unexpected namespace provided
304304
_, err = o.Get(gvr, "ns", "node")
305-
assert.NotNil(t, err)
305+
assert.Error(t, err)
306306
errNotFound := errors.NewNotFound(gvr.GroupResource(), "node")
307307
assert.EqualError(t, err, errNotFound.Error())
308308

@@ -314,11 +314,11 @@ func TestGetWithExactMatch(t *testing.T) {
314314

315315
// Exact match
316316
_, err = o.Get(gvr, "default", "pod")
317-
assert.Nil(t, err)
317+
assert.NoError(t, err)
318318

319319
// Missing namespace
320320
_, err = o.Get(gvr, "", "pod")
321-
assert.NotNil(t, err)
321+
assert.Error(t, err)
322322
errNotFound = errors.NewNotFound(gvr.GroupResource(), "pod")
323323
assert.EqualError(t, err, errNotFound.Error())
324324
}

0 commit comments

Comments
 (0)