From 3b92b9f84d62550a62890d8d3f6a57d96fc70ccc Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Sun, 22 Sep 2024 11:57:24 +0200 Subject: [PATCH] fix: enable contains rule from testifylint in module `k8s.io/apiserver` Signed-off-by: Matthieu MOREL --- .../k8s.io/apiserver/pkg/util/proxy/streamtunnel_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 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..cebf9bc047c 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 @@ -170,7 +170,7 @@ func TestTunnelingHandler_BadHandshakeError(t *testing.T) { // Handshake fails. _, err := httpstream.Handshake(req, w, []string{constants.PortForwardV1Name}) 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) })) defer spdyServer.Close() @@ -279,12 +279,12 @@ func TestTunnelingResponseWriter_Hijack(t *testing.T) { trw = &tunnelingResponseWriter{written: true} _, _, err = trw.Hijack() 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. trw = &tunnelingResponseWriter{hijacked: true} _, _, err = trw.Hijack() 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) {