Skip to content

Commit 6bd57ff

Browse files
authored
Merge pull request kubernetes#127527 from mmorel-35/testifylint/[email protected]/client-go
fix: enable compares rule from testifylint in module k8s.io/client-go
2 parents 5253ca0 + 407d74f commit 6bd57ff

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

staging/src/k8s.io/client-go/discovery/cached/memory/memcache_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -445,8 +445,8 @@ func TestOpenAPIMemCache(t *testing.T) {
445445
continue
446446
}
447447

448-
assert.True(t, reflect.ValueOf(paths).Pointer() == reflect.ValueOf(pathsAgain).Pointer())
449-
assert.True(t, reflect.ValueOf(original).Pointer() == reflect.ValueOf(schemaAgain).Pointer())
448+
assert.Equal(t, reflect.ValueOf(paths).Pointer(), reflect.ValueOf(pathsAgain).Pointer())
449+
assert.Equal(t, reflect.ValueOf(original).Pointer(), reflect.ValueOf(schemaAgain).Pointer())
450450

451451
// Invalidate and try again. This time pointers should not be equal
452452
client.Invalidate()
@@ -461,8 +461,8 @@ func TestOpenAPIMemCache(t *testing.T) {
461461
continue
462462
}
463463

464-
assert.True(t, reflect.ValueOf(paths).Pointer() != reflect.ValueOf(pathsAgain).Pointer())
465-
assert.True(t, reflect.ValueOf(original).Pointer() != reflect.ValueOf(schemaAgain).Pointer())
464+
assert.NotEqual(t, reflect.ValueOf(paths).Pointer(), reflect.ValueOf(pathsAgain).Pointer())
465+
assert.NotEqual(t, reflect.ValueOf(original).Pointer(), reflect.ValueOf(schemaAgain).Pointer())
466466
assert.Equal(t, original, schemaAgain)
467467
}
468468
})

staging/src/k8s.io/client-go/discovery/discovery_client_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2425,9 +2425,9 @@ func TestAggregatedServerGroupsAndResources(t *testing.T) {
24252425
"%s: Expected GVKs (%s), got (%s)", test.name, expectedGroupNames.List(), actualGroupNames.List())
24262426
// If the core V1 group is returned from /api, it should be the first group.
24272427
if expectedGroupNames.Has("") {
2428-
assert.True(t, len(apiGroups) > 0)
2428+
assert.NotEmpty(t, apiGroups)
24292429
actualFirstGroup := apiGroups[0]
2430-
assert.True(t, len(actualFirstGroup.Versions) > 0)
2430+
assert.NotEmpty(t, actualFirstGroup.Versions)
24312431
actualFirstGroupVersion := actualFirstGroup.Versions[0].GroupVersion
24322432
assert.Equal(t, "v1", actualFirstGroupVersion)
24332433
}

0 commit comments

Comments
 (0)