replace deprecated setoutput

This commit is contained in:
xiaopeng 2022-04-05 14:04:22 +08:00
parent 3b5044fefd
commit 48629bcc05
9 changed files with 66 additions and 64 deletions

View File

@ -427,7 +427,7 @@ func TestAnnotateErrors(t *testing.T) {
iostreams, _, bufOut, bufErr := genericclioptions.NewTestIOStreams() iostreams, _, bufOut, bufErr := genericclioptions.NewTestIOStreams()
cmd := NewCmdAnnotate("kubectl", tf, iostreams) cmd := NewCmdAnnotate("kubectl", tf, iostreams)
cmd.SetOutput(bufOut) cmd.SetOut(bufOut)
for k, v := range testCase.flags { for k, v := range testCase.flags {
cmd.Flags().Set(k, v) cmd.Flags().Set(k, v)
@ -490,7 +490,7 @@ func TestAnnotateObject(t *testing.T) {
iostreams, _, bufOut, _ := genericclioptions.NewTestIOStreams() iostreams, _, bufOut, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdAnnotate("kubectl", tf, iostreams) cmd := NewCmdAnnotate("kubectl", tf, iostreams)
cmd.SetOutput(bufOut) cmd.SetOut(bufOut)
options := NewAnnotateOptions(iostreams) options := NewAnnotateOptions(iostreams)
args := []string{"pods/foo", "a=b", "c-"} args := []string{"pods/foo", "a=b", "c-"}
if err := options.Complete(tf, cmd, args); err != nil { if err := options.Complete(tf, cmd, args); err != nil {
@ -556,7 +556,7 @@ func TestAnnotateResourceVersion(t *testing.T) {
iostreams, _, bufOut, _ := genericclioptions.NewTestIOStreams() iostreams, _, bufOut, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdAnnotate("kubectl", tf, iostreams) cmd := NewCmdAnnotate("kubectl", tf, iostreams)
cmd.SetOutput(bufOut) cmd.SetOut(bufOut)
options := NewAnnotateOptions(iostreams) options := NewAnnotateOptions(iostreams)
options.resourceVersion = "10" options.resourceVersion = "10"
args := []string{"pods/foo", "a=b"} args := []string{"pods/foo", "a=b"}
@ -610,7 +610,7 @@ func TestAnnotateObjectFromFile(t *testing.T) {
iostreams, _, bufOut, _ := genericclioptions.NewTestIOStreams() iostreams, _, bufOut, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdAnnotate("kubectl", tf, iostreams) cmd := NewCmdAnnotate("kubectl", tf, iostreams)
cmd.SetOutput(bufOut) cmd.SetOut(bufOut)
options := NewAnnotateOptions(iostreams) options := NewAnnotateOptions(iostreams)
options.Filenames = []string{"../../../testdata/controller.yaml"} options.Filenames = []string{"../../../testdata/controller.yaml"}
args := []string{"a=b", "c-"} args := []string{"a=b", "c-"}
@ -696,7 +696,7 @@ func TestAnnotateMultipleObjects(t *testing.T) {
iostreams, _, _, _ := genericclioptions.NewTestIOStreams() iostreams, _, _, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdAnnotate("kubectl", tf, iostreams) cmd := NewCmdAnnotate("kubectl", tf, iostreams)
cmd.SetOutput(iostreams.Out) cmd.SetOut(iostreams.Out)
options := NewAnnotateOptions(iostreams) options := NewAnnotateOptions(iostreams)
options.all = true options.all = true
args := []string{"pods", "a=b", "c-"} args := []string{"pods", "a=b", "c-"}

View File

@ -250,7 +250,7 @@ func TestDescribeHelpMessage(t *testing.T) {
cmd := NewCmdDescribe("kubectl", tf, streams) cmd := NewCmdDescribe("kubectl", tf, streams)
cmd.SetArgs([]string{"-h"}) cmd.SetArgs([]string{"-h"})
cmd.SetOutput(buf) cmd.SetOut(buf)
_, err := cmd.ExecuteC() _, err := cmd.ExecuteC()
if err != nil { if err != nil {

View File

@ -660,7 +660,7 @@ func TestRunExposeService(t *testing.T) {
ioStreams, _, buf, _ := genericclioptions.NewTestIOStreams() ioStreams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdExposeService(tf, ioStreams) cmd := NewCmdExposeService(tf, ioStreams)
cmd.SetOutput(buf) cmd.SetOut(buf)
for flag, value := range test.flags { for flag, value := range test.flags {
cmd.Flags().Set(flag, value) cmd.Flags().Set(flag, value)
} }

View File

@ -111,7 +111,7 @@ func TestGetUnknownSchemaObject(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Run(cmd, []string{"type", "foo"}) cmd.Run(cmd, []string{"type", "foo"})
expected := []runtime.Object{cmdtesting.NewInternalType("", "", "foo")} expected := []runtime.Object{cmdtesting.NewInternalType("", "", "foo")}
@ -178,7 +178,7 @@ func TestGetObjectsWithOpenAPIOutputFormatPresent(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set(useOpenAPIPrintColumnFlagLabel, "true") cmd.Flags().Set(useOpenAPIPrintColumnFlagLabel, "true")
cmd.Run(cmd, []string{"pods", "foo"}) cmd.Run(cmd, []string{"pods", "foo"})
@ -231,7 +231,7 @@ func TestGetObjects(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Run(cmd, []string{"pods", "foo"}) cmd.Run(cmd, []string{"pods", "foo"})
expected := `NAME AGE expected := `NAME AGE
@ -256,7 +256,7 @@ func TestGetObjectSubresourceStatus(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("subresource", "status") cmd.Flags().Set("subresource", "status")
cmd.Run(cmd, []string{"replicationcontrollers", "rc1"}) cmd.Run(cmd, []string{"replicationcontrollers", "rc1"})
@ -283,7 +283,7 @@ func TestGetObjectSubresourceScale(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("subresource", "scale") cmd.Flags().Set("subresource", "scale")
cmd.Run(cmd, []string{"replicationcontrollers", "rc1"}) cmd.Run(cmd, []string{"replicationcontrollers", "rc1"})
@ -310,7 +310,7 @@ func TestGetTableObjects(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Run(cmd, []string{"pods", "foo"}) cmd.Run(cmd, []string{"pods", "foo"})
expected := `NAME READY STATUS RESTARTS AGE expected := `NAME READY STATUS RESTARTS AGE
@ -335,7 +335,7 @@ func TestGetV1TableObjects(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Run(cmd, []string{"pods", "foo"}) cmd.Run(cmd, []string{"pods", "foo"})
expected := `NAME READY STATUS RESTARTS AGE expected := `NAME READY STATUS RESTARTS AGE
@ -360,7 +360,7 @@ func TestGetObjectsShowKind(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("show-kind", "true") cmd.Flags().Set("show-kind", "true")
cmd.Run(cmd, []string{"pods", "foo"}) cmd.Run(cmd, []string{"pods", "foo"})
@ -386,7 +386,7 @@ func TestGetTableObjectsShowKind(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("show-kind", "true") cmd.Flags().Set("show-kind", "true")
cmd.Run(cmd, []string{"pods", "foo"}) cmd.Run(cmd, []string{"pods", "foo"})
@ -439,7 +439,7 @@ func TestGetMultipleResourceTypesShowKinds(t *testing.T) {
streams, _, buf, bufErr := genericclioptions.NewTestIOStreams() streams, _, buf, bufErr := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Run(cmd, []string{"all"}) cmd.Run(cmd, []string{"all"})
expected := `NAME AGE expected := `NAME AGE
@ -500,7 +500,7 @@ func TestGetMultipleTableResourceTypesShowKinds(t *testing.T) {
streams, _, buf, bufErr := genericclioptions.NewTestIOStreams() streams, _, buf, bufErr := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Run(cmd, []string{"all"}) cmd.Run(cmd, []string{"all"})
expected := `NAME READY STATUS RESTARTS AGE expected := `NAME READY STATUS RESTARTS AGE
@ -561,7 +561,7 @@ func TestNoBlankLinesForGetMultipleTableResource(t *testing.T) {
streams, _, buf, bufErr := genericclioptions.NewTestIOStreams() streams, _, buf, bufErr := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
expected := `NAME READY STATUS RESTARTS AGE expected := `NAME READY STATUS RESTARTS AGE
pod/foo 0/0 0 <unknown> pod/foo 0/0 0 <unknown>
@ -630,7 +630,7 @@ func TestNoBlankLinesForGetAll(t *testing.T) {
streams, _, buf, errbuf := genericclioptions.NewTestIOStreams() streams, _, buf, errbuf := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Run(cmd, []string{"all"}) cmd.Run(cmd, []string{"all"})
expected := `` expected := ``
@ -656,7 +656,7 @@ func TestNotFoundMessageForGetNonNamespacedResources(t *testing.T) {
streams, _, buf, errbuf := genericclioptions.NewTestIOStreams() streams, _, buf, errbuf := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Run(cmd, []string{"persistentvolumes"}) cmd.Run(cmd, []string{"persistentvolumes"})
expected := `` expected := ``
@ -684,7 +684,7 @@ func TestGetObjectsShowLabels(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("show-labels", "true") cmd.Flags().Set("show-labels", "true")
cmd.Run(cmd, []string{"pods", "foo"}) cmd.Run(cmd, []string{"pods", "foo"})
@ -710,7 +710,7 @@ func TestGetTableObjectsShowLabels(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("show-labels", "true") cmd.Flags().Set("show-labels", "true")
cmd.Run(cmd, []string{"pods", "foo"}) cmd.Run(cmd, []string{"pods", "foo"})
@ -745,7 +745,7 @@ func TestGetEmptyTable(t *testing.T) {
streams, _, buf, errbuf := genericclioptions.NewTestIOStreams() streams, _, buf, errbuf := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Run(cmd, []string{"pods"}) cmd.Run(cmd, []string{"pods"})
expected := `` expected := ``
@ -795,7 +795,7 @@ func TestGetObjectIgnoreNotFound(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("ignore-not-found", "true") cmd.Flags().Set("ignore-not-found", "true")
cmd.Flags().Set("output", "yaml") cmd.Flags().Set("output", "yaml")
cmd.Run(cmd, []string{"pods", "nonexistentpod"}) cmd.Run(cmd, []string{"pods", "nonexistentpod"})
@ -910,7 +910,7 @@ func TestGetSortedObjects(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
// sorting with metadata.name // sorting with metadata.name
cmd.Flags().Set("sort-by", ".metadata.name") cmd.Flags().Set("sort-by", ".metadata.name")
@ -949,7 +949,7 @@ func TestGetSortedObjectsUnstructuredTable(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
// sorting with metadata.name // sorting with metadata.name
cmd.Flags().Set("sort-by", ".metadata.name") cmd.Flags().Set("sort-by", ".metadata.name")
@ -1181,7 +1181,7 @@ func TestGetObjectsIdentifiedByFile(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("filename", "../../../testdata/controller.yaml") cmd.Flags().Set("filename", "../../../testdata/controller.yaml")
cmd.Run(cmd, []string{}) cmd.Run(cmd, []string{})
@ -1207,7 +1207,7 @@ func TestGetTableObjectsIdentifiedByFile(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("filename", "../../../testdata/controller.yaml") cmd.Flags().Set("filename", "../../../testdata/controller.yaml")
cmd.Run(cmd, []string{}) cmd.Run(cmd, []string{})
@ -1233,7 +1233,7 @@ func TestGetListObjects(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Run(cmd, []string{"pods"}) cmd.Run(cmd, []string{"pods"})
expected := `NAME AGE expected := `NAME AGE
@ -1259,7 +1259,7 @@ func TestGetListTableObjects(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Run(cmd, []string{"pods"}) cmd.Run(cmd, []string{"pods"})
expected := `NAME READY STATUS RESTARTS AGE expected := `NAME READY STATUS RESTARTS AGE
@ -1285,7 +1285,7 @@ func TestGetListComponentStatus(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Run(cmd, []string{"componentstatuses"}) cmd.Run(cmd, []string{"componentstatuses"})
expected := `NAME STATUS MESSAGE ERROR expected := `NAME STATUS MESSAGE ERROR
@ -1334,7 +1334,7 @@ func TestGetMixedGenericObjects(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("output", "json") cmd.Flags().Set("output", "json")
cmd.Run(cmd, []string{"pods"}) cmd.Run(cmd, []string{"pods"})
@ -1383,7 +1383,7 @@ func TestGetMultipleTypeObjects(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Run(cmd, []string{"pods,services"}) cmd.Run(cmd, []string{"pods,services"})
expected := `NAME AGE expected := `NAME AGE
@ -1422,7 +1422,7 @@ func TestGetMultipleTypeTableObjects(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Run(cmd, []string{"pods,services"}) cmd.Run(cmd, []string{"pods,services"})
expected := `NAME READY STATUS RESTARTS AGE expected := `NAME READY STATUS RESTARTS AGE
@ -1462,7 +1462,7 @@ func TestGetMultipleTypeObjectsAsList(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("output", "json") cmd.Flags().Set("output", "json")
cmd.Run(cmd, []string{"pods,services"}) cmd.Run(cmd, []string{"pods,services"})
@ -1564,7 +1564,7 @@ func TestGetMultipleTypeObjectsWithLabelSelector(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("selector", "a=b") cmd.Flags().Set("selector", "a=b")
cmd.Run(cmd, []string{"pods,services"}) cmd.Run(cmd, []string{"pods,services"})
@ -1608,7 +1608,7 @@ func TestGetMultipleTypeTableObjectsWithLabelSelector(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("selector", "a=b") cmd.Flags().Set("selector", "a=b")
cmd.Run(cmd, []string{"pods,services"}) cmd.Run(cmd, []string{"pods,services"})
@ -1652,7 +1652,7 @@ func TestGetMultipleTypeObjectsWithFieldSelector(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("field-selector", "a=b") cmd.Flags().Set("field-selector", "a=b")
cmd.Run(cmd, []string{"pods,services"}) cmd.Run(cmd, []string{"pods,services"})
@ -1696,7 +1696,7 @@ func TestGetMultipleTypeTableObjectsWithFieldSelector(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("field-selector", "a=b") cmd.Flags().Set("field-selector", "a=b")
cmd.Run(cmd, []string{"pods,services"}) cmd.Run(cmd, []string{"pods,services"})
@ -1742,7 +1742,7 @@ func TestGetMultipleTypeObjectsWithDirectReference(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Run(cmd, []string{"services/bar", "node/foo"}) cmd.Run(cmd, []string{"services/bar", "node/foo"})
@ -1786,7 +1786,7 @@ func TestGetMultipleTypeTableObjectsWithDirectReference(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Run(cmd, []string{"services/bar", "node/foo"}) cmd.Run(cmd, []string{"services/bar", "node/foo"})
@ -1941,7 +1941,7 @@ func TestWatchLabelSelector(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("watch", "true") cmd.Flags().Set("watch", "true")
cmd.Flags().Set("selector", "a=b") cmd.Flags().Set("selector", "a=b")
@ -1992,7 +1992,7 @@ func TestWatchTableLabelSelector(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("watch", "true") cmd.Flags().Set("watch", "true")
cmd.Flags().Set("selector", "a=b") cmd.Flags().Set("selector", "a=b")
@ -2043,7 +2043,7 @@ func TestWatchFieldSelector(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("watch", "true") cmd.Flags().Set("watch", "true")
cmd.Flags().Set("field-selector", "a=b") cmd.Flags().Set("field-selector", "a=b")
@ -2094,7 +2094,7 @@ func TestWatchTableFieldSelector(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("watch", "true") cmd.Flags().Set("watch", "true")
cmd.Flags().Set("field-selector", "a=b") cmd.Flags().Set("field-selector", "a=b")
@ -2139,7 +2139,7 @@ func TestWatchResource(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("watch", "true") cmd.Flags().Set("watch", "true")
cmd.Run(cmd, []string{"pods", "foo"}) cmd.Run(cmd, []string{"pods", "foo"})
@ -2183,7 +2183,7 @@ func TestWatchStatus(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("watch", "true") cmd.Flags().Set("watch", "true")
cmd.Run(cmd, []string{"pods", "foo"}) cmd.Run(cmd, []string{"pods", "foo"})
@ -2229,7 +2229,7 @@ func TestWatchTableResource(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("watch", "true") cmd.Flags().Set("watch", "true")
cmd.Run(cmd, []string{"pods", "foo"}) cmd.Run(cmd, []string{"pods", "foo"})
@ -2335,7 +2335,7 @@ func TestWatchResourceTable(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("watch", "true") cmd.Flags().Set("watch", "true")
cmd.Run(cmd, []string{"pods"}) cmd.Run(cmd, []string{"pods"})
@ -2547,7 +2547,7 @@ pod/foo
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("watch", "true") cmd.Flags().Set("watch", "true")
cmd.Flags().Set("all-namespaces", "true") cmd.Flags().Set("all-namespaces", "true")
@ -2593,7 +2593,7 @@ func TestWatchResourceIdentifiedByFile(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("watch", "true") cmd.Flags().Set("watch", "true")
cmd.Flags().Set("filename", "../../../testdata/controller.yaml") cmd.Flags().Set("filename", "../../../testdata/controller.yaml")
@ -2637,7 +2637,7 @@ func TestWatchOnlyResource(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("watch-only", "true") cmd.Flags().Set("watch-only", "true")
cmd.Run(cmd, []string{"pods", "foo"}) cmd.Run(cmd, []string{"pods", "foo"})
@ -2679,7 +2679,7 @@ func TestWatchOnlyTableResource(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("watch-only", "true") cmd.Flags().Set("watch-only", "true")
cmd.Run(cmd, []string{"pods", "foo"}) cmd.Run(cmd, []string{"pods", "foo"})
@ -2724,7 +2724,7 @@ func TestWatchOnlyList(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("watch-only", "true") cmd.Flags().Set("watch-only", "true")
cmd.Run(cmd, []string{"pods"}) cmd.Run(cmd, []string{"pods"})
@ -2769,7 +2769,7 @@ func TestWatchOnlyTableList(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdGet("kubectl", tf, streams) cmd := NewCmdGet("kubectl", tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("watch-only", "true") cmd.Flags().Set("watch-only", "true")
cmd.Run(cmd, []string{"pods"}) cmd.Run(cmd, []string{"pods"})

View File

@ -333,7 +333,7 @@ func TestLabelErrors(t *testing.T) {
ioStreams, _, _, _ := genericclioptions.NewTestIOStreams() ioStreams, _, _, _ := genericclioptions.NewTestIOStreams()
buf := bytes.NewBuffer([]byte{}) buf := bytes.NewBuffer([]byte{})
cmd := NewCmdLabel(tf, ioStreams) cmd := NewCmdLabel(tf, ioStreams)
cmd.SetOutput(buf) cmd.SetOut(buf)
for k, v := range testCase.flags { for k, v := range testCase.flags {
cmd.Flags().Set(k, v) cmd.Flags().Set(k, v)
@ -552,7 +552,7 @@ func TestLabelResourceVersion(t *testing.T) {
iostreams, _, bufOut, _ := genericclioptions.NewTestIOStreams() iostreams, _, bufOut, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdLabel(tf, iostreams) cmd := NewCmdLabel(tf, iostreams)
cmd.SetOutput(bufOut) cmd.SetOut(bufOut)
options := NewLabelOptions(iostreams) options := NewLabelOptions(iostreams)
options.resourceVersion = "10" options.resourceVersion = "10"
args := []string{"pods/foo", "a=b"} args := []string{"pods/foo", "a=b"}

View File

@ -48,7 +48,8 @@ func NewCmdOptions(out io.Writer) *cobra.Command {
// function call will fall back to stderr. // function call will fall back to stderr.
// //
// See https://github.com/kubernetes/kubernetes/pull/46394 for details. // See https://github.com/kubernetes/kubernetes/pull/46394 for details.
cmd.SetOutput(out) cmd.SetOut(out)
cmd.SetErr(out)
templates.UseOptionsTemplates(cmd) templates.UseOptionsTemplates(cmd)
return cmd return cmd

View File

@ -60,7 +60,7 @@ func TestImageLocal(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdImage(tf, streams) cmd := NewCmdImage(tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("output", outputFormat) cmd.Flags().Set("output", outputFormat)
cmd.Flags().Set("local", "true") cmd.Flags().Set("local", "true")
@ -172,7 +172,7 @@ func TestSetMultiResourcesImageLocal(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdImage(tf, streams) cmd := NewCmdImage(tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("output", outputFormat) cmd.Flags().Set("output", outputFormat)
cmd.Flags().Set("local", "true") cmd.Flags().Set("local", "true")

View File

@ -59,7 +59,7 @@ func TestResourcesLocal(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdResources(tf, streams) cmd := NewCmdResources(tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("output", outputFormat) cmd.Flags().Set("output", outputFormat)
cmd.Flags().Set("local", "true") cmd.Flags().Set("local", "true")
@ -107,7 +107,7 @@ func TestSetMultiResourcesLimitsLocal(t *testing.T) {
streams, _, buf, _ := genericclioptions.NewTestIOStreams() streams, _, buf, _ := genericclioptions.NewTestIOStreams()
cmd := NewCmdResources(tf, streams) cmd := NewCmdResources(tf, streams)
cmd.SetOutput(buf) cmd.SetOut(buf)
cmd.Flags().Set("output", outputFormat) cmd.Flags().Set("output", outputFormat)
cmd.Flags().Set("local", "true") cmd.Flags().Set("local", "true")

View File

@ -745,7 +745,8 @@ func IsSiblingCommandExists(cmd *cobra.Command, targetCmdName string) bool {
// arguments (sub-commands) are provided, or a usage error otherwise. // arguments (sub-commands) are provided, or a usage error otherwise.
func DefaultSubCommandRun(out io.Writer) func(c *cobra.Command, args []string) { func DefaultSubCommandRun(out io.Writer) func(c *cobra.Command, args []string) {
return func(c *cobra.Command, args []string) { return func(c *cobra.Command, args []string) {
c.SetOutput(out) c.SetOut(out)
c.SetErr(out)
RequireNoArguments(c, args) RequireNoArguments(c, args)
c.Help() c.Help()
CheckErr(ErrExit) CheckErr(ErrExit)