From 290f054d9be199b8608ae29c51bc5aa318328121 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Sat, 21 Sep 2024 21:23:07 +0200 Subject: [PATCH] fix: enable compares rule from testifylint in module Signed-off-by: Matthieu MOREL Kubernetes-commit: 407d74fb6a563951045287338a6c64a79fcad8ec --- discovery/cached/memory/memcache_test.go | 8 ++++---- discovery/discovery_client_test.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/discovery/cached/memory/memcache_test.go b/discovery/cached/memory/memcache_test.go index 3c8f1a17c..dc017cb52 100644 --- a/discovery/cached/memory/memcache_test.go +++ b/discovery/cached/memory/memcache_test.go @@ -445,8 +445,8 @@ func TestOpenAPIMemCache(t *testing.T) { continue } - assert.True(t, reflect.ValueOf(paths).Pointer() == reflect.ValueOf(pathsAgain).Pointer()) - assert.True(t, reflect.ValueOf(original).Pointer() == reflect.ValueOf(schemaAgain).Pointer()) + assert.Equal(t, reflect.ValueOf(paths).Pointer(), reflect.ValueOf(pathsAgain).Pointer()) + assert.Equal(t, reflect.ValueOf(original).Pointer(), reflect.ValueOf(schemaAgain).Pointer()) // Invalidate and try again. This time pointers should not be equal client.Invalidate() @@ -461,8 +461,8 @@ func TestOpenAPIMemCache(t *testing.T) { continue } - assert.True(t, reflect.ValueOf(paths).Pointer() != reflect.ValueOf(pathsAgain).Pointer()) - assert.True(t, reflect.ValueOf(original).Pointer() != reflect.ValueOf(schemaAgain).Pointer()) + assert.NotEqual(t, reflect.ValueOf(paths).Pointer(), reflect.ValueOf(pathsAgain).Pointer()) + assert.NotEqual(t, reflect.ValueOf(original).Pointer(), reflect.ValueOf(schemaAgain).Pointer()) assert.Equal(t, original, schemaAgain) } }) diff --git a/discovery/discovery_client_test.go b/discovery/discovery_client_test.go index 87e6c95aa..538237019 100644 --- a/discovery/discovery_client_test.go +++ b/discovery/discovery_client_test.go @@ -2425,9 +2425,9 @@ func TestAggregatedServerGroupsAndResources(t *testing.T) { "%s: Expected GVKs (%s), got (%s)", test.name, expectedGroupNames.List(), actualGroupNames.List()) // If the core V1 group is returned from /api, it should be the first group. if expectedGroupNames.Has("") { - assert.True(t, len(apiGroups) > 0) + assert.NotEmpty(t, apiGroups) actualFirstGroup := apiGroups[0] - assert.True(t, len(actualFirstGroup.Versions) > 0) + assert.NotEmpty(t, actualFirstGroup.Versions) actualFirstGroupVersion := actualFirstGroup.Versions[0].GroupVersion assert.Equal(t, "v1", actualFirstGroupVersion) }