From 6eee5dd42167d8f33d04be0063d7563cd9e5f5ed Mon Sep 17 00:00:00 2001 From: WanLinghao Date: Sat, 24 Feb 2018 13:41:42 +0800 Subject: [PATCH] clean testprinter after commit: https://github.com/kubernetes/kubernetes/pull/60117 modified: pkg/kubectl/cmd/cmd_test.go modified: pkg/kubectl/cmd/resource/get_test.go --- pkg/kubectl/cmd/cmd_test.go | 25 ------------------------- pkg/kubectl/cmd/resource/get_test.go | 26 -------------------------- 2 files changed, 51 deletions(-) diff --git a/pkg/kubectl/cmd/cmd_test.go b/pkg/kubectl/cmd/cmd_test.go index f61042dbca6..171f569431b 100644 --- a/pkg/kubectl/cmd/cmd_test.go +++ b/pkg/kubectl/cmd/cmd_test.go @@ -122,31 +122,6 @@ func testData() (*api.PodList, *api.ServiceList, *api.ReplicationControllerList) return pods, svc, rc } -type testPrinter struct { - Objects []runtime.Object - Err error - GenericPrinter bool -} - -func (t *testPrinter) PrintObj(obj runtime.Object, out io.Writer) error { - t.Objects = append(t.Objects, obj) - fmt.Fprintf(out, "%#v", obj) - return t.Err -} - -// TODO: implement HandledResources() -func (t *testPrinter) HandledResources() []string { - return []string{} -} - -func (t *testPrinter) AfterPrint(output io.Writer, res string) error { - return nil -} - -func (t *testPrinter) IsGeneric() bool { - return t.GenericPrinter -} - type testDescriber struct { Name, Namespace string Settings printers.DescriberSettings diff --git a/pkg/kubectl/cmd/resource/get_test.go b/pkg/kubectl/cmd/resource/get_test.go index a56f18f15e7..beaad95da27 100644 --- a/pkg/kubectl/cmd/resource/get_test.go +++ b/pkg/kubectl/cmd/resource/get_test.go @@ -82,31 +82,6 @@ func defaultClientConfig() *restclient.Config { } } -type testPrinter struct { - Objects []runtime.Object - Err error - GenericPrinter bool -} - -func (t *testPrinter) PrintObj(obj runtime.Object, out io.Writer) error { - t.Objects = append(t.Objects, obj) - fmt.Fprintf(out, "%#v", obj) - return t.Err -} - -// TODO: implement HandledResources() -func (t *testPrinter) HandledResources() []string { - return []string{} -} - -func (t *testPrinter) AfterPrint(output io.Writer, res string) error { - return nil -} - -func (t *testPrinter) IsGeneric() bool { - return t.GenericPrinter -} - func objBody(codec runtime.Codec, obj runtime.Object) io.ReadCloser { return ioutil.NopCloser(bytes.NewReader([]byte(runtime.EncodeOrDie(codec, obj)))) } @@ -245,7 +220,6 @@ func TestGetUnknownSchemaObject(t *testing.T) { expected := []runtime.Object{cmdtesting.NewInternalType("", "", "foo")} actual := []runtime.Object{} - //actual := tf.Printer.(*testPrinter).Objects if len(actual) != len(expected) { t.Fatalf("expected: %#v, but actual: %#v", expected, actual) }