github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-08 03:33:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #127536 from mmorel-35/testifylint/contains@k8s.io/apiserver

Browse Source 
fix: enable contains rule from testifylint in module `k8s.io/apiserver`
This commit is contained in:
Kubernetes Prow Robot 2024-09-28 03:56:25 +01:00 committed by GitHub
commit 65ee79ee2c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,7 +170,7 @@ func TestTunnelingHandler_BadHandshakeError(t *testing.T) {
// Handshake fails. // Handshake fails.
_, err := httpstream.Handshake(req, w, []string{constants.PortForwardV1Name}) _, err := httpstream.Handshake(req, w, []string{constants.PortForwardV1Name})
require.Error(t, err, "handshake should have returned an error") require.Error(t, err, "handshake should have returned an error")
assert.True(t, strings.Contains(err.Error(), "unable to negotiate protocol")) assert.ErrorContains(t, err, "unable to negotiate protocol")
w.WriteHeader(http.StatusForbidden) w.WriteHeader(http.StatusForbidden)
})) }))
defer spdyServer.Close() defer spdyServer.Close()
@ -279,12 +279,12 @@ func TestTunnelingResponseWriter_Hijack(t *testing.T) {
trw = &tunnelingResponseWriter{written: true} trw = &tunnelingResponseWriter{written: true}
_, _, err = trw.Hijack() _, _, err = trw.Hijack()
assert.Error(t, err, "Hijack after writing to response writer is error") assert.Error(t, err, "Hijack after writing to response writer is error")
assert.True(t, strings.Contains(err.Error(), "connection has already been written to")) assert.ErrorContains(t, err, "connection has already been written to")
// Hijacking after already hijacked is an error. // Hijacking after already hijacked is an error.
trw = &tunnelingResponseWriter{hijacked: true} trw = &tunnelingResponseWriter{hijacked: true}
_, _, err = trw.Hijack() _, _, err = trw.Hijack()
assert.Error(t, err, "Hijack after writing to response writer is error") assert.Error(t, err, "Hijack after writing to response writer is error")
assert.True(t, strings.Contains(err.Error(), "connection has already been hijacked")) assert.ErrorContains(t, err, "connection has already been hijacked")
} }
func TestTunnelingResponseWriter_DelegateResponseWriter(t *testing.T) { func TestTunnelingResponseWriter_DelegateResponseWriter(t *testing.T) {