From 09274182e225fcf4df9e4a3d54fd96fc03de3bdf Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Fri, 27 Sep 2024 07:29:09 +0200 Subject: [PATCH] fix: enable error-nil and nil-compare rules from testifylint in module `k8s.io/apiserver` Signed-off-by: Matthieu MOREL --- .../apiserver/pkg/util/proxy/streamtunnel_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/util/proxy/streamtunnel_test.go b/staging/src/k8s.io/apiserver/pkg/util/proxy/streamtunnel_test.go index 7185c35723f..9309165f0b9 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/proxy/streamtunnel_test.go +++ b/staging/src/k8s.io/apiserver/pkg/util/proxy/streamtunnel_test.go @@ -357,14 +357,14 @@ func TestTunnelingWebsocketUpgraderConn_LocalRemoteAddress(t *testing.T) { func TestTunnelingWebsocketUpgraderConn_SetDeadline(t *testing.T) { tc := &tunnelingWebsocketUpgraderConn{conn: &mockConn{}} expected := time.Now() - assert.Nil(t, tc.SetDeadline(expected), "SetDeadline does not return error") + assert.NoError(t, tc.SetDeadline(expected), "SetDeadline does not return error") assert.Equal(t, expected, tc.conn.(*mockConn).readDeadline, "SetDeadline() sets read deadline") assert.Equal(t, expected, tc.conn.(*mockConn).writeDeadline, "SetDeadline() sets write deadline") expected = time.Now() - assert.Nil(t, tc.SetWriteDeadline(expected), "SetWriteDeadline does not return error") + assert.NoError(t, tc.SetWriteDeadline(expected), "SetWriteDeadline does not return error") assert.Equal(t, expected, tc.conn.(*mockConn).writeDeadline, "Expected write deadline set") expected = time.Now() - assert.Nil(t, tc.SetReadDeadline(expected), "SetReadDeadline does not return error") + assert.NoError(t, tc.SetReadDeadline(expected), "SetReadDeadline does not return error") assert.Equal(t, expected, tc.conn.(*mockConn).readDeadline, "Expected read deadline set") expectedErr := fmt.Errorf("deadline error") tc = &tunnelingWebsocketUpgraderConn{conn: &mockConn{deadlineErr: expectedErr}} @@ -373,9 +373,9 @@ func TestTunnelingWebsocketUpgraderConn_SetDeadline(t *testing.T) { assert.Equal(t, expectedErr, actualErr, "SetDeadline() expected error returned") // Connection nil, returns nil error. tc.conn = nil - assert.Nil(t, tc.SetDeadline(expected), "SetDeadline() with nil connection always returns nil error") - assert.Nil(t, tc.SetWriteDeadline(expected), "SetWriteDeadline() with nil connection always returns nil error") - assert.Nil(t, tc.SetReadDeadline(expected), "SetReadDeadline() with nil connection always returns nil error") + assert.NoError(t, tc.SetDeadline(expected), "SetDeadline() with nil connection always returns nil error") + assert.NoError(t, tc.SetWriteDeadline(expected), "SetWriteDeadline() with nil connection always returns nil error") + assert.NoError(t, tc.SetReadDeadline(expected), "SetReadDeadline() with nil connection always returns nil error") } var expectedContentLengthHeaders = http.Header{