From ab9f9ac951ac62a92de42d4f4a50112924e2c2b9 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Fri, 27 Sep 2024 07:28:14 +0200 Subject: [PATCH] fix: enable error-nil and nil-compare rules from testifylint in module `k8s.io/cri-client` Signed-off-by: Matthieu MOREL --- staging/src/k8s.io/cri-client/pkg/util/util_unix_test.go | 8 ++++---- staging/src/k8s.io/cri-client/pkg/utils_test.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/staging/src/k8s.io/cri-client/pkg/util/util_unix_test.go b/staging/src/k8s.io/cri-client/pkg/util/util_unix_test.go index 3b5337f8336..2c93823d456 100644 --- a/staging/src/k8s.io/cri-client/pkg/util/util_unix_test.go +++ b/staging/src/k8s.io/cri-client/pkg/util/util_unix_test.go @@ -62,10 +62,10 @@ func TestParseEndpoint(t *testing.T) { protocol, addr, err := parseEndpoint(test.endpoint) assert.Equal(t, test.expectedProtocol, protocol) if test.expectError { - assert.NotNil(t, err, "Expect error during parsing %q", test.endpoint) + assert.Error(t, err, "Expect error during parsing %q", test.endpoint) continue } - assert.Nil(t, err, "Expect no error during parsing %q", test.endpoint) + assert.NoError(t, err, "Expect no error during parsing %q", test.endpoint) assert.Equal(t, test.expectedAddr, addr) } @@ -109,10 +109,10 @@ func TestGetAddressAndDialer(t *testing.T) { // just test addr and err addr, _, err := GetAddressAndDialer(test.endpoint) if test.expectError { - assert.NotNil(t, err, "expected error during parsing %s", test.endpoint) + assert.Error(t, err, "expected error during parsing %s", test.endpoint) continue } - assert.Nil(t, err, "expected no error during parsing %s", test.endpoint) + assert.NoError(t, err, "expected no error during parsing %s", test.endpoint) assert.Equal(t, test.expectedAddr, addr) } } diff --git a/staging/src/k8s.io/cri-client/pkg/utils_test.go b/staging/src/k8s.io/cri-client/pkg/utils_test.go index e007442d8fa..a5281ab94ba 100644 --- a/staging/src/k8s.io/cri-client/pkg/utils_test.go +++ b/staging/src/k8s.io/cri-client/pkg/utils_test.go @@ -102,7 +102,7 @@ func TestVerifySandboxStatus(t *testing.T) { if actual != nil { assert.EqualError(t, actual, status.expected.Error()) } else { - assert.Nil(t, status.expected) + assert.NoError(t, status.expected) } } } @@ -175,7 +175,7 @@ func TestVerifyContainerStatus(t *testing.T) { if actual != nil { assert.EqualError(t, actual, status.expected.Error()) } else { - assert.Nil(t, status.expected) + assert.NoError(t, status.expected) } } }