scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #127683 from mmorel-35/testifylint/nil-compare@k8s.io/apiserver

Browse Source 
fix: enable error-nil and nil-compare rules from testifylint in module `k8s.io/apiserver`
This commit is contained in:
Kubernetes Prow Robot
2024-09-28 20:24:08 +01:00
committed by GitHub
parent 0661f1b5b3 09274182e2
commit dad39bf435
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -357,14 +357,14 @@ func TestTunnelingWebsocketUpgraderConn_LocalRemoteAddress(t *testing.T) {
func TestTunnelingWebsocketUpgraderConn_SetDeadline(t *testing.T) { func TestTunnelingWebsocketUpgraderConn_SetDeadline(t *testing.T) {
tc := &tunnelingWebsocketUpgraderConn{conn: &mockConn{}} tc := &tunnelingWebsocketUpgraderConn{conn: &mockConn{}}
expected := time.Now() 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).readDeadline, "SetDeadline() sets read deadline")
assert.Equal(t, expected, tc.conn.(*mockConn).writeDeadline, "SetDeadline() sets write deadline") assert.Equal(t, expected, tc.conn.(*mockConn).writeDeadline, "SetDeadline() sets write deadline")
expected = time.Now() 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") assert.Equal(t, expected, tc.conn.(*mockConn).writeDeadline, "Expected write deadline set")
expected = time.Now() 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") assert.Equal(t, expected, tc.conn.(*mockConn).readDeadline, "Expected read deadline set")
expectedErr := fmt.Errorf("deadline error") expectedErr := fmt.Errorf("deadline error")
tc = &tunnelingWebsocketUpgraderConn{conn: &mockConn{deadlineErr: expectedErr}} 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") assert.Equal(t, expectedErr, actualErr, "SetDeadline() expected error returned")
// Connection nil, returns nil error. // Connection nil, returns nil error.
tc.conn = nil tc.conn = nil
assert.Nil(t, tc.SetDeadline(expected), "SetDeadline() with nil connection always returns nil error") assert.NoError(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.NoError(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.SetReadDeadline(expected), "SetReadDeadline() with nil connection always returns nil error")
} }
var expectedContentLengthHeaders = http.Header{ var expectedContentLengthHeaders = http.Header{