diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go index d58f6e05ab1..11d80a176ee 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go @@ -503,7 +503,7 @@ func TestSetEnvRemote(t *testing.T) { if err != nil { return nil, err } - assert.Contains(t, string(bytes), `"value":`+`"`+"prod"+`"`, fmt.Sprintf("env not updated for %#v", input.object)) + assert.Containsf(t, string(bytes), `"value":`+`"`+"prod"+`"`, "env not updated for %#v", input.object) return &http.Response{StatusCode: http.StatusOK, Header: cmdtesting.DefaultHeader(), Body: objBody(input.object)}, nil default: t.Errorf("%s: unexpected request: %s %#v\n%#v", "image", req.Method, req.URL, req) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go index 3a026e8d45b..08ac463c632 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go @@ -641,7 +641,7 @@ func TestSetImageRemote(t *testing.T) { if err != nil { return nil, err } - assert.Contains(t, string(bytes), `"image":`+`"`+"thingy"+`"`, fmt.Sprintf("image not updated for %#v", input.object)) + assert.Containsf(t, string(bytes), `"image":`+`"`+"thingy"+`"`, "image not updated for %#v", input.object) return &http.Response{StatusCode: http.StatusOK, Header: cmdtesting.DefaultHeader(), Body: objBody(input.object)}, nil default: t.Errorf("%s: unexpected request: %s %#v\n%#v", "image", req.Method, req.URL, req) @@ -753,8 +753,8 @@ func TestSetImageRemoteWithSpecificContainers(t *testing.T) { if err != nil { return nil, err } - assert.Contains(t, string(bytes), `"image":"`+"thingy"+`","name":`+`"nginx"`, fmt.Sprintf("image not updated for %#v", input.object)) - assert.NotContains(t, string(bytes), `"image":"`+"thingy"+`","name":`+`"busybox"`, fmt.Sprintf("image updated for %#v", input.object)) + assert.Containsf(t, string(bytes), `"image":"`+"thingy"+`","name":`+`"nginx"`, "image not updated for %#v", input.object) + assert.NotContainsf(t, string(bytes), `"image":"`+"thingy"+`","name":`+`"busybox"`, "image updated for %#v", input.object) return &http.Response{StatusCode: http.StatusOK, Header: cmdtesting.DefaultHeader(), Body: objBody(input.object)}, nil default: t.Errorf("%s: unexpected request: %s %#v\n%#v", "image", req.Method, req.URL, req) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go index 957c31edf5d..38845c9334f 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go @@ -487,7 +487,7 @@ func TestSetResourcesRemote(t *testing.T) { if err != nil { return nil, err } - assert.Contains(t, string(bytes), "200m", fmt.Sprintf("resources not updated for %#v", input.object)) + assert.Containsf(t, string(bytes), "200m", "resources not updated for %#v", input.object) return &http.Response{StatusCode: http.StatusOK, Header: cmdtesting.DefaultHeader(), Body: objBody(input.object)}, nil default: t.Errorf("%s: unexpected request: %s %#v\n%#v", "resources", req.Method, req.URL, req) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go index fbf2496d025..06a063be7b3 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go @@ -94,7 +94,7 @@ func TestSetServiceAccountLocal(t *testing.T) { assert.NoError(t, err) err = saConfig.Run() assert.NoError(t, err) - assert.Contains(t, buf.String(), "serviceAccountName: "+serviceAccount, fmt.Sprintf("serviceaccount not updated for %s", input.yaml)) + assert.Containsf(t, buf.String(), "serviceAccountName: "+serviceAccount, "serviceaccount not updated for %s", input.yaml) }) } } @@ -337,7 +337,7 @@ func TestSetServiceAccountRemote(t *testing.T) { if err != nil { return nil, err } - assert.Contains(t, string(bytes), `"serviceAccountName":`+`"`+serviceAccount+`"`, fmt.Sprintf("serviceaccount not updated for %#v", input.object)) + assert.Containsf(t, string(bytes), `"serviceAccountName":`+`"`+serviceAccount+`"`, "serviceaccount not updated for %#v", input.object) return &http.Response{StatusCode: http.StatusOK, Header: cmdtesting.DefaultHeader(), Body: objBody(input.object)}, nil default: t.Errorf("%s: unexpected request: %s %#v\n%#v", "serviceaccount", req.Method, req.URL, req)