Skip to content

Commit be59afc

Browse files
mmorel-35mmorel-35
committed
fix: enable testifylint on pkg/controller
Signed-off-by: Matthieu MOREL <[email protected]>
1 parent 2d4514e commit be59afc

File tree

6 files changed

+39
-38
lines changed

6 files changed

+39
-38
lines changed

‎pkg/controller/controller_utils_test.go‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ import (
5858

5959
"github.com/google/go-cmp/cmp"
6060
"github.com/stretchr/testify/assert"
61+
"github.com/stretchr/testify/require"
6162
)
6263

6364
// NewFakeControllerExpectationsLookup creates a fake store for PodExpectations.
@@ -183,7 +184,7 @@ func TestControllerExpectations(t *testing.T) {
183184

184185
// RC fires off adds and deletes at apiserver, then sets expectations
185186
rcKey, err := KeyFunc(rc)
186-
assert.NoError(t, err, "Couldn't get key for object %#v: %v", rc, err)
187+
require.NoError(t, err, "Couldn't get key for object %#v: %v", rc, err)
187188

188189
e.SetExpectations(logger, rcKey, adds, dels)
189190
var wg sync.WaitGroup
@@ -238,7 +239,7 @@ func TestControllerExpectations(t *testing.T) {
238239
e.SetExpectations(logger, rcKey, test.expectationsToSet[0], test.expectationsToSet[1])
239240
}
240241
podExp, exists, err := e.GetExpectations(rcKey)
241-
assert.NoError(t, err, "Could not get expectations for rc, exists %v and err %v", exists, err)
242+
require.NoError(t, err, "Could not get expectations for rc, exists %v and err %v", exists, err)
242243
assert.True(t, exists, "Could not get expectations for rc, exists %v and err %v", exists, err)
243244

244245
add, del := podExp.GetExpectations()
@@ -382,12 +383,12 @@ func TestCreatePodsWithGenerateName(t *testing.T) {
382383
}
383384

384385
err := test.podCreationFunc(podControl)
385-
assert.NoError(t, err, "unexpected error: %v", err)
386+
require.NoError(t, err, "unexpected error: %v", err)
386387

387388
fakeHandler.ValidateRequest(t, "/api/v1/namespaces/default/pods", "POST", nil)
388389
var actualPod = &v1.Pod{}
389390
err = json.Unmarshal([]byte(fakeHandler.RequestBody), actualPod)
390-
assert.NoError(t, err, "unexpected error: %v", err)
391+
require.NoError(t, err, "unexpected error: %v", err)
391392
assert.True(t, apiequality.Semantic.DeepDerivative(test.wantPod, actualPod),
392393
"Body: %s", fakeHandler.RequestBody)
393394
})
@@ -426,10 +427,10 @@ func TestCountTerminatingPods(t *testing.T) {
426427

427428
terminatingPods := CountTerminatingPods(podPointers)
428429

429-
assert.Equal(t, terminatingPods, int32(2))
430+
assert.Equal(t, int32(2), terminatingPods)
430431

431432
terminatingList := FilterTerminatingPods(podPointers)
432-
assert.Equal(t, len(terminatingList), int(2))
433+
assert.Len(t, terminatingList, int(2))
433434
}
434435

435436
func TestActivePodFiltering(t *testing.T) {
@@ -957,7 +958,7 @@ func TestRemoveTaintOffNode(t *testing.T) {
957958
for _, test := range tests {
958959
node, _ := test.nodeHandler.Get(context.TODO(), test.nodeName, metav1.GetOptions{})
959960
err := RemoveTaintOffNode(context.TODO(), test.nodeHandler, test.nodeName, node, test.taintsToRemove...)
960-
assert.NoError(t, err, "%s: RemoveTaintOffNode() error = %v", test.name, err)
961+
require.NoError(t, err, "%s: RemoveTaintOffNode() error = %v", test.name, err)
961962

962963
node, _ = test.nodeHandler.Get(context.TODO(), test.nodeName, metav1.GetOptions{})
963964
assert.EqualValues(t, test.expectedTaints, node.Spec.Taints,
@@ -1196,7 +1197,7 @@ func TestAddOrUpdateTaintOnNode(t *testing.T) {
11961197
assert.Equal(t, test.expectedErr, err, "AddOrUpdateTaintOnNode get unexpected error")
11971198
continue
11981199
}
1199-
assert.NoError(t, err, "%s: AddOrUpdateTaintOnNode() error = %v", test.name, err)
1200+
require.NoError(t, err, "%s: AddOrUpdateTaintOnNode() error = %v", test.name, err)
12001201

12011202
node, _ := test.nodeHandler.Get(context.TODO(), test.nodeName, metav1.GetOptions{})
12021203
assert.EqualValues(t, test.expectedTaints, node.Spec.Taints,

‎pkg/controller/endpointslice/endpointslice_controller_test.go‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ func TestSyncServiceNoSelector(t *testing.T) {
194194

195195
logger, _ := ktesting.NewTestContext(t)
196196
err := esController.syncService(logger, fmt.Sprintf("%s/%s", ns, serviceName))
197-
assert.NoError(t, err)
197+
require.NoError(t, err)
198198
assert.Empty(t, client.Actions())
199199
}
200200

@@ -255,17 +255,17 @@ func TestServiceExternalNameTypeSync(t *testing.T) {
255255

256256
pod := newPod(1, namespace, true, 0, false)
257257
err := esController.podStore.Add(pod)
258-
assert.NoError(t, err)
258+
require.NoError(t, err)
259259

260260
err = esController.serviceStore.Add(tc.service)
261-
assert.NoError(t, err)
261+
require.NoError(t, err)
262262

263263
err = esController.syncService(logger, fmt.Sprintf("%s/%s", namespace, serviceName))
264-
assert.NoError(t, err)
264+
require.NoError(t, err)
265265
assert.Empty(t, client.Actions())
266266

267267
sliceList, err := client.DiscoveryV1().EndpointSlices(namespace).List(context.TODO(), metav1.ListOptions{})
268-
assert.NoError(t, err)
268+
require.NoError(t, err)
269269
assert.Empty(t, sliceList.Items, "Expected 0 endpoint slices")
270270
})
271271
}
@@ -287,7 +287,7 @@ func TestSyncServicePendingDeletion(t *testing.T) {
287287

288288
logger, _ := ktesting.NewTestContext(t)
289289
err := esController.syncService(logger, fmt.Sprintf("%s/%s", ns, serviceName))
290-
assert.NoError(t, err)
290+
require.NoError(t, err)
291291
assert.Empty(t, client.Actions())
292292
}
293293

@@ -300,7 +300,7 @@ func TestSyncServiceWithSelector(t *testing.T) {
300300
expectActions(t, client.Actions(), 1, "create", "endpointslices")
301301

302302
sliceList, err := client.DiscoveryV1().EndpointSlices(ns).List(context.TODO(), metav1.ListOptions{})
303-
assert.Nil(t, err, "Expected no error fetching endpoint slices")
303+
require.NoError(t, err, "Expected no error fetching endpoint slices")
304304
assert.Len(t, sliceList.Items, 1, "Expected 1 endpoint slices")
305305
slice := sliceList.Items[0]
306306
assert.Regexp(t, "^"+serviceName, slice.Name)
@@ -338,7 +338,7 @@ func TestSyncServiceMissing(t *testing.T) {
338338
err := esController.syncService(logger, fmt.Sprintf("%s/%s", namespace, missingServiceName))
339339

340340
// nil should be returned when the service doesn't exist
341-
assert.Nil(t, err, "Expected no error syncing service")
341+
require.NoError(t, err, "Expected no error syncing service")
342342

343343
// That should mean no client actions were performed
344344
assert.Empty(t, client.Actions())
@@ -368,13 +368,13 @@ func TestSyncServicePodSelection(t *testing.T) {
368368

369369
// an endpoint slice should be created, it should only reference pod1 (not pod2)
370370
slices, err := client.DiscoveryV1().EndpointSlices(ns).List(context.TODO(), metav1.ListOptions{})
371-
assert.Nil(t, err, "Expected no error fetching endpoint slices")
371+
require.NoError(t, err, "Expected no error fetching endpoint slices")
372372
assert.Len(t, slices.Items, 1, "Expected 1 endpoint slices")
373373
slice := slices.Items[0]
374374
assert.Len(t, slice.Endpoints, 1, "Expected 1 endpoint in first slice")
375375
assert.NotEmpty(t, slice.Annotations[v1.EndpointsLastChangeTriggerTime])
376376
endpoint := slice.Endpoints[0]
377-
assert.EqualValues(t, endpoint.TargetRef, &v1.ObjectReference{Kind: "Pod", Namespace: ns, Name: pod1.Name})
377+
assert.EqualValues(t, &v1.ObjectReference{Kind: "Pod", Namespace: ns, Name: pod1.Name}, endpoint.TargetRef)
378378
}
379379

380380
func TestSyncServiceEndpointSlicePendingDeletion(t *testing.T) {
@@ -384,7 +384,7 @@ func TestSyncServiceEndpointSlicePendingDeletion(t *testing.T) {
384384
service := createService(t, esController, ns, serviceName)
385385
logger, _ := ktesting.NewTestContext(t)
386386
err := esController.syncService(logger, fmt.Sprintf("%s/%s", ns, serviceName))
387-
assert.Nil(t, err, "Expected no error syncing service")
387+
require.NoError(t, err, "Expected no error syncing service")
388388

389389
gvk := schema.GroupVersionKind{Version: "v1", Kind: "Service"}
390390
ownerRef := metav1.NewControllerRef(service, gvk)
@@ -415,7 +415,7 @@ func TestSyncServiceEndpointSlicePendingDeletion(t *testing.T) {
415415
logger, _ = ktesting.NewTestContext(t)
416416
numActionsBefore := len(client.Actions())
417417
err = esController.syncService(logger, fmt.Sprintf("%s/%s", ns, serviceName))
418-
assert.Nil(t, err, "Expected no error syncing service")
418+
require.NoError(t, err, "Expected no error syncing service")
419419

420420
// The EndpointSlice marked for deletion should be ignored by the controller, and thus
421421
// should not result in any action.
@@ -505,7 +505,7 @@ func TestSyncServiceEndpointSliceLabelSelection(t *testing.T) {
505505
numActionsBefore := len(client.Actions())
506506
logger, _ := ktesting.NewTestContext(t)
507507
err := esController.syncService(logger, fmt.Sprintf("%s/%s", ns, serviceName))
508-
assert.Nil(t, err, "Expected no error syncing service")
508+
require.NoError(t, err, "Expected no error syncing service")
509509

510510
if len(client.Actions()) != numActionsBefore+2 {
511511
t.Errorf("Expected 2 more actions, got %d", len(client.Actions())-numActionsBefore)
@@ -1292,16 +1292,16 @@ func TestSyncService(t *testing.T) {
12921292
esController.serviceStore.Add(testcase.service)
12931293

12941294
_, err := esController.client.CoreV1().Services(testcase.service.Namespace).Create(context.TODO(), testcase.service, metav1.CreateOptions{})
1295-
assert.Nil(t, err, "Expected no error creating service")
1295+
require.NoError(t, err, "Expected no error creating service")
12961296

12971297
logger, _ := ktesting.NewTestContext(t)
12981298
err = esController.syncService(logger, fmt.Sprintf("%s/%s", testcase.service.Namespace, testcase.service.Name))
1299-
assert.Nil(t, err)
1299+
require.NoError(t, err)
13001300

13011301
// last action should be to create endpoint slice
13021302
expectActions(t, client.Actions(), 1, "create", "endpointslices")
13031303
sliceList, err := client.DiscoveryV1().EndpointSlices(testcase.service.Namespace).List(context.TODO(), metav1.ListOptions{})
1304-
assert.Nil(t, err, "Expected no error fetching endpoint slices")
1304+
require.NoError(t, err, "Expected no error fetching endpoint slices")
13051305
assert.Len(t, sliceList.Items, 1, "Expected 1 endpoint slices")
13061306

13071307
// ensure all attributes of endpoint slice match expected state
@@ -1684,7 +1684,7 @@ func TestPodDeleteBatching(t *testing.T) {
16841684
time.Sleep(update.delay)
16851685

16861686
old, exists, err := esController.podStore.GetByKey(fmt.Sprintf("%s/%s", ns, update.podName))
1687-
assert.Nil(t, err, "error while retrieving old value of %q: %v", update.podName, err)
1687+
require.NoError(t, err, "error while retrieving old value of %q: %v", update.podName, err)
16881688
assert.True(t, exists, "pod should exist")
16891689
esController.podStore.Delete(old)
16901690
esController.deletePod(old)
@@ -2050,7 +2050,7 @@ func standardSyncService(t *testing.T, esController *endpointSliceController, na
20502050

20512051
logger, _ := ktesting.NewTestContext(t)
20522052
err := esController.syncService(logger, fmt.Sprintf("%s/%s", namespace, serviceName))
2053-
assert.Nil(t, err, "Expected no error syncing service")
2053+
require.NoError(t, err, "Expected no error syncing service")
20542054
}
20552055

20562056
func createService(t *testing.T, esController *endpointSliceController, namespace, serviceName string) *v1.Service {
@@ -2070,7 +2070,7 @@ func createService(t *testing.T, esController *endpointSliceController, namespac
20702070
}
20712071
esController.serviceStore.Add(service)
20722072
_, err := esController.client.CoreV1().Services(namespace).Create(context.TODO(), service, metav1.CreateOptions{})
2073-
assert.Nil(t, err, "Expected no error creating service")
2073+
require.NoError(t, err, "Expected no error creating service")
20742074
return service
20752075
}
20762076

‎pkg/controller/podautoscaler/horizontal_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -757,7 +757,7 @@ func (tc *testCase) setupController(t *testing.T) (*HorizontalController, inform
757757
tc.expectedDesiredReplicas,
758758
(int64(tc.reportedLevels[0])*100)/tc.reportedCPURequests[0].MilliValue(), tc.specReplicas), obj.Message)
759759
default:
760-
assert.False(t, true, fmt.Sprintf("Unexpected event: %s / %s", obj.Reason, obj.Message))
760+
assert.False(t, true, "Unexpected event: %s / %s", obj.Reason, obj.Message)
761761
}
762762
}
763763
tc.eventCreated = true
@@ -3863,7 +3863,7 @@ func TestCalculateScaleUpLimitWithScalingRules(t *testing.T) {
38633863
},
38643864
},
38653865
})
3866-
assert.Equal(t, calculated, int32(2))
3866+
assert.Equal(t, int32(2), calculated)
38673867
}
38683868

38693869
func TestCalculateScaleDownLimitWithBehaviors(t *testing.T) {
@@ -3885,7 +3885,7 @@ func TestCalculateScaleDownLimitWithBehaviors(t *testing.T) {
38853885
},
38863886
},
38873887
})
3888-
assert.Equal(t, calculated, int32(3))
3888+
assert.Equal(t, int32(3), calculated)
38893889
}
38903890

38913891
func generateScalingRules(pods, podsPeriod, percent, percentPeriod, stabilizationWindow int32) *autoscalingv2.HPAScalingRules {

‎pkg/controller/podautoscaler/metrics/client_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import (
4141
emfake "k8s.io/metrics/pkg/client/external_metrics/fake"
4242

4343
"github.com/stretchr/testify/assert"
44+
"github.com/stretchr/testify/require"
4445
)
4546

4647
var fixedTimestamp = time.Date(2015, time.November, 10, 12, 30, 0, 0, time.UTC)
@@ -209,11 +210,11 @@ func (tc *restClientTestCase) prepareTestClient(t *testing.T) (*metricsfake.Clie
209210

210211
func (tc *restClientTestCase) verifyResults(t *testing.T, metrics PodMetricsInfo, timestamp time.Time, err error) {
211212
if tc.desiredError != nil {
212-
assert.Error(t, err, "there should be an error retrieving the metrics")
213+
require.Error(t, err, "there should be an error retrieving the metrics")
213214
assert.Contains(t, fmt.Sprintf("%v", err), fmt.Sprintf("%v", tc.desiredError), "the error message should be as expected")
214215
return
215216
}
216-
assert.NoError(t, err, "there should be no error retrieving the metrics")
217+
require.NoError(t, err, "there should be no error retrieving the metrics")
217218
assert.NotNil(t, metrics, "there should be metrics returned")
218219

219220
if len(metrics) != len(tc.desiredMetricValues) {
@@ -230,7 +231,7 @@ func (tc *restClientTestCase) verifyResults(t *testing.T, metrics PodMetricsInfo
230231
}
231232

232233
targetTimestamp := offsetTimestampBy(tc.targetTimestamp)
233-
assert.True(t, targetTimestamp.Equal(timestamp), fmt.Sprintf("the timestamp should be as expected (%s) but was %s", targetTimestamp, timestamp))
234+
assert.True(t, targetTimestamp.Equal(timestamp), "the timestamp should be as expected (%s) but was %s", targetTimestamp, timestamp)
234235
}
235236

236237
func (tc *restClientTestCase) runTest(t *testing.T) {

‎pkg/controller/podautoscaler/metrics/utilization_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"testing"
2222

2323
"github.com/stretchr/testify/assert"
24+
"github.com/stretchr/testify/require"
2425
)
2526

2627
type resourceUtilizationRatioTestCase struct {
@@ -38,12 +39,12 @@ func (tc *resourceUtilizationRatioTestCase) runTest(t *testing.T) {
3839
actualUtilizationRatio, actualCurrentUtilization, actualRawAverageValue, actualErr := GetResourceUtilizationRatio(tc.metrics, tc.requests, tc.targetUtilization)
3940

4041
if tc.expectedErr != nil {
41-
assert.Error(t, actualErr, "there should be an error getting the utilization ratio")
42+
require.Error(t, actualErr, "there should be an error getting the utilization ratio")
4243
assert.Contains(t, fmt.Sprintf("%v", actualErr), fmt.Sprintf("%v", tc.expectedErr), "the error message should be as expected")
4344
return
4445
}
4546

46-
assert.NoError(t, actualErr, "there should be no error retrieving the utilization ratio")
47+
require.NoError(t, actualErr, "there should be no error retrieving the utilization ratio")
4748
assert.Equal(t, tc.expectedUtilizationRatio, actualUtilizationRatio, "the utilization ratios should be as expected")
4849
assert.Equal(t, tc.expectedCurrentUtilization, actualCurrentUtilization, "the current utilization should be as expected")
4950
assert.Equal(t, tc.expectedRawAverageValue, actualRawAverageValue, "the raw average value should be as expected")

‎pkg/controller/podautoscaler/replica_calculator_test.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -355,9 +355,7 @@ func (tc *replicaCalcTestCase) runTest(t *testing.T) {
355355
selector, err := metav1.LabelSelectorAsSelector(&metav1.LabelSelector{
356356
MatchLabels: map[string]string{"name": podNamePrefix},
357357
})
358-
if err != nil {
359-
require.Nil(t, err, "something went horribly wrong...")
360-
}
358+
require.NoError(t, err, "something went horribly wrong...")
361359

362360
if tc.resource != nil {
363361
outReplicas, outUtilization, outRawValue, outTimestamp, err := replicaCalc.GetResourceReplicas(context.TODO(), tc.currentReplicas, tc.resource.targetUtilization, tc.resource.name, testNamespace, selector, tc.container)

0 commit comments

Comments
 (0)