From acc5917341fd946dfa3c809c59d540bb35cfeb4a Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Fri, 28 Jun 2024 21:20:13 +0200 Subject: [PATCH] fix: enable empty and len rules from testifylint on pkg package Signed-off-by: Matthieu MOREL Co-authored-by: Patrick Ohly Kubernetes-commit: f014b754fb5925dfbca6e27a44d0c3968b157e14 --- discovery/cached/disk/cached_discovery_test.go | 4 ++-- discovery/cached/memory/memcache_test.go | 4 ++-- tools/cache/reflector_test.go | 2 +- .../list_data_consistency_detector_test.go | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/discovery/cached/disk/cached_discovery_test.go b/discovery/cached/disk/cached_discovery_test.go index f27f2a43..e95eb13c 100644 --- a/discovery/cached/disk/cached_discovery_test.go +++ b/discovery/cached/disk/cached_discovery_test.go @@ -152,7 +152,7 @@ func TestOpenAPIDiskCache(t *testing.T) { require.NoError(t, err) defer fakeServer.HttpServer.Close() - require.Greater(t, len(fakeServer.ServedDocuments), 0) + require.NotEmpty(t, fakeServer.ServedDocuments) client, err := NewCachedDiscoveryClientForConfig( &restclient.Config{Host: fakeServer.HttpServer.URL}, @@ -175,7 +175,7 @@ func TestOpenAPIDiskCache(t *testing.T) { paths, err := openapiClient.Paths() require.NoError(t, err) assert.Equal(t, 1, fakeServer.RequestCounters["/openapi/v3"]) - require.Greater(t, len(paths), 0) + require.NotEmpty(t, paths) contentTypes := []string{ runtime.ContentTypeJSON, openapi.ContentTypeOpenAPIV3PB, diff --git a/discovery/cached/memory/memcache_test.go b/discovery/cached/memory/memcache_test.go index dbd7b46c..3c8f1a17 100644 --- a/discovery/cached/memory/memcache_test.go +++ b/discovery/cached/memory/memcache_test.go @@ -411,7 +411,7 @@ func TestOpenAPIMemCache(t *testing.T) { require.NoError(t, err) defer fakeServer.HttpServer.Close() - require.Greater(t, len(fakeServer.ServedDocuments), 0) + require.NotEmpty(t, fakeServer.ServedDocuments) client := NewMemCacheClient( discovery.NewDiscoveryClientForConfigOrDie( @@ -604,7 +604,7 @@ func TestMemCacheGroupsAndMaybeResources(t *testing.T) { require.NoError(t, err) // "Unaggregated" discovery always returns nil for resources. assert.Nil(t, resourcesMap) - assert.True(t, len(failedGVs) == 0, "expected empty failed GroupVersions, got (%d)", len(failedGVs)) + assert.Emptyf(t, failedGVs, "expected empty failed GroupVersions, got (%d)", len(failedGVs)) assert.False(t, memClient.receivedAggregatedDiscovery) assert.True(t, memClient.Fresh()) // Test the expected groups are returned for the aggregated format. diff --git a/tools/cache/reflector_test.go b/tools/cache/reflector_test.go index 1b4904a6..e9b14b3a 100644 --- a/tools/cache/reflector_test.go +++ b/tools/cache/reflector_test.go @@ -194,7 +194,7 @@ func TestReflectorWatchStoppedAfter(t *testing.T) { err := target.watch(nil, stopCh, nil) require.NoError(t, err) - require.Equal(t, 1, len(watchers)) + require.Len(t, watchers, 1) require.True(t, watchers[0].IsStopped()) } diff --git a/util/consistencydetector/list_data_consistency_detector_test.go b/util/consistencydetector/list_data_consistency_detector_test.go index e0a25016..a4bd8c9c 100644 --- a/util/consistencydetector/list_data_consistency_detector_test.go +++ b/util/consistencydetector/list_data_consistency_detector_test.go @@ -132,7 +132,7 @@ func TestCheckListFromCacheDataConsistencyIfRequestedInternalHappyPath(t *testin checkListFromCacheDataConsistencyIfRequestedInternal(ctx, "", fakeLister.List, listOptions, scenario.retrievedList) require.Equal(t, 1, fakeLister.counter) - require.Equal(t, 1, len(fakeLister.requestOptions)) + require.Len(t, fakeLister.requestOptions, 1) require.Equal(t, fakeLister.requestOptions[0], scenario.expectedRequestOptions) }) }