From 78cca63817936d03dfc5e7f176f7c3a33c55a80e Mon Sep 17 00:00:00 2001 From: Alexandre Garnier Date: Wed, 11 May 2022 09:17:56 +0200 Subject: [PATCH] Check expected error value in annotate_test.TestUpdateAnnotations --- .../k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go index 02addbcabd6..c3ea155afae 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go @@ -227,7 +227,7 @@ func TestUpdateAnnotations(t *testing.T) { annotations map[string]string remove []string expected runtime.Object - expectErr bool + expectedErr string }{ { obj: &v1.Pod{ @@ -249,7 +249,7 @@ func TestUpdateAnnotations(t *testing.T) { }, }, annotations: map[string]string{"a": "c"}, - expectErr: true, + expectedErr: "--overwrite is false but found the following declared annotation(s): 'a' already has a value (b)", }, { obj: &v1.Pod{ @@ -378,13 +378,16 @@ func TestUpdateAnnotations(t *testing.T) { resourceVersion: test.version, } err := options.updateAnnotations(test.obj) - if test.expectErr { + if test.expectedErr != "" { if err == nil { t.Errorf("unexpected non-error: %v", test) } + if err.Error() != test.expectedErr { + t.Errorf("error expected: %v, got: %v", test.expectedErr, err.Error()) + } continue } - if !test.expectErr && err != nil { + if test.expectedErr == "" && err != nil { t.Errorf("unexpected error: %v %v", err, test) } if !reflect.DeepEqual(test.obj, test.expected) {