Skip to content

Commit dad39bf

Browse files
authored
Merge pull request kubernetes#127683 from mmorel-35/testifylint/[email protected]/apiserver
fix: enable error-nil and nil-compare rules from testifylint in module `k8s.io/apiserver`
2 parents 0661f1b + 0927418 commit dad39bf

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

staging/src/k8s.io/apiserver/pkg/util/proxy/streamtunnel_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -357,14 +357,14 @@ func TestTunnelingWebsocketUpgraderConn_LocalRemoteAddress(t *testing.T) {
357357
func TestTunnelingWebsocketUpgraderConn_SetDeadline(t *testing.T) {
358358
tc := &tunnelingWebsocketUpgraderConn{conn: &mockConn{}}
359359
expected := time.Now()
360-
assert.Nil(t, tc.SetDeadline(expected), "SetDeadline does not return error")
360+
assert.NoError(t, tc.SetDeadline(expected), "SetDeadline does not return error")
361361
assert.Equal(t, expected, tc.conn.(*mockConn).readDeadline, "SetDeadline() sets read deadline")
362362
assert.Equal(t, expected, tc.conn.(*mockConn).writeDeadline, "SetDeadline() sets write deadline")
363363
expected = time.Now()
364-
assert.Nil(t, tc.SetWriteDeadline(expected), "SetWriteDeadline does not return error")
364+
assert.NoError(t, tc.SetWriteDeadline(expected), "SetWriteDeadline does not return error")
365365
assert.Equal(t, expected, tc.conn.(*mockConn).writeDeadline, "Expected write deadline set")
366366
expected = time.Now()
367-
assert.Nil(t, tc.SetReadDeadline(expected), "SetReadDeadline does not return error")
367+
assert.NoError(t, tc.SetReadDeadline(expected), "SetReadDeadline does not return error")
368368
assert.Equal(t, expected, tc.conn.(*mockConn).readDeadline, "Expected read deadline set")
369369
expectedErr := fmt.Errorf("deadline error")
370370
tc = &tunnelingWebsocketUpgraderConn{conn: &mockConn{deadlineErr: expectedErr}}
@@ -373,9 +373,9 @@ func TestTunnelingWebsocketUpgraderConn_SetDeadline(t *testing.T) {
373373
assert.Equal(t, expectedErr, actualErr, "SetDeadline() expected error returned")
374374
// Connection nil, returns nil error.
375375
tc.conn = nil
376-
assert.Nil(t, tc.SetDeadline(expected), "SetDeadline() with nil connection always returns nil error")
377-
assert.Nil(t, tc.SetWriteDeadline(expected), "SetWriteDeadline() with nil connection always returns nil error")
378-
assert.Nil(t, tc.SetReadDeadline(expected), "SetReadDeadline() with nil connection always returns nil error")
376+
assert.NoError(t, tc.SetDeadline(expected), "SetDeadline() with nil connection always returns nil error")
377+
assert.NoError(t, tc.SetWriteDeadline(expected), "SetWriteDeadline() with nil connection always returns nil error")
378+
assert.NoError(t, tc.SetReadDeadline(expected), "SetReadDeadline() with nil connection always returns nil error")
379379
}
380380

381381
var expectedContentLengthHeaders = http.Header{

0 commit comments

Comments
 (0)