Merge pull request #113444 from weikhor/test_kubectl_clean_up

Clean up testing code of kubectl cmd section

Kubernetes-commit: 89ad7b37c5f0e52a970ad29b05b8cec6c1c3095c

pkg/cmd/annotate/annotate_test.go

@@ -399,7 +399,6 @@ func TestUpdateAnnotations(t *testing.T) {
 func TestAnnotateErrors(t *testing.T) {
 	testCases := map[string]struct {
 		args  []string
-		flags map[string]string
 		errFn func(error) bool
 	}{
 		"no args": {
@@ -446,9 +445,6 @@ func TestAnnotateErrors(t *testing.T) {
 			cmd.SetOut(bufOut)
 			cmd.SetErr(bufOut)
 
-			for k, v := range testCase.flags {
-				cmd.Flags().Set(k, v)
-			}
 			options := NewAnnotateOptions(iostreams)
 			err := options.Complete(tf, cmd, testCase.args)
 			if err == nil {
@@ -459,10 +455,10 @@ func TestAnnotateErrors(t *testing.T) {
 				return
 			}
 			if bufOut.Len() > 0 {
-				t.Errorf("buffer should be empty: %s", string(bufOut.Bytes()))
+				t.Errorf("buffer should be empty: %s", bufOut.String())
 			}
 			if bufErr.Len() > 0 {
-				t.Errorf("buffer should be empty: %s", string(bufErr.Bytes()))
+				t.Errorf("buffer should be empty: %s", bufErr.String())
 			}
 		})
 	}

pkg/cmd/clusterinfo/clusterinfo_dump_test.go

@@ -41,7 +41,6 @@ func TestSetupOutputWriterNoOp(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			_, _, buf, _ := genericclioptions.NewTestIOStreams()
 			f := cmdtesting.NewTestFactory()

pkg/cmd/label/label_test.go

@@ -301,7 +301,6 @@ func TestLabelFunc(t *testing.T) {
 func TestLabelErrors(t *testing.T) {
 	testCases := map[string]struct {
 		args  []string
-		flags map[string]string
 		errFn func(error) bool
 	}{
 		"no args": {
@@ -355,9 +354,6 @@ func TestLabelErrors(t *testing.T) {
 			cmd.SetOut(buf)
 			cmd.SetErr(buf)
 
-			for k, v := range testCase.flags {
-				cmd.Flags().Set(k, v)
-			}
 			opts := NewLabelOptions(ioStreams)
 			err := opts.Complete(tf, cmd, testCase.args)
 			if err == nil {