Skip to content

K
k3s
Unverified Commit a41483a8 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #60353 from WanLinghao/printer_clean

Automatic merge from submit-queue (batch tested with PRs 60189, 59542, 59931, 60621, 60353). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. clean testprinter **What this PR does / why we need it**: testPrinter became useless after patch #60117 This patch clean it **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
parents 8962c785 6eee5dd4
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 51 deletions
pkg/kubectl/cmd/cmd_test.go
View file @ a41483a8
...@@ -122,31 +122,6 @@ func testData() (*api.PodList, *api.ServiceList, *api.ReplicationControllerList) ...@@ -122,31 +122,6 @@ func testData() (*api.PodList, *api.ServiceList, *api.ReplicationControllerList)
return pods, svc, rc 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 { type testDescriber struct {
Name, Namespace string Name, Namespace string
Settings printers.DescriberSettings Settings printers.DescriberSettings
......
pkg/kubectl/cmd/resource/get_test.go
View file @ a41483a8
...@@ -82,31 +82,6 @@ func defaultClientConfig() *restclient.Config { ...@@ -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 { func objBody(codec runtime.Codec, obj runtime.Object) io.ReadCloser {
return ioutil.NopCloser(bytes.NewReader([]byte(runtime.EncodeOrDie(codec, obj)))) return ioutil.NopCloser(bytes.NewReader([]byte(runtime.EncodeOrDie(codec, obj))))
} }
...@@ -246,7 +221,6 @@ func TestGetUnknownSchemaObject(t *testing.T) { ...@@ -246,7 +221,6 @@ func TestGetUnknownSchemaObject(t *testing.T) {
expected := []runtime.Object{cmdtesting.NewInternalType("", "", "foo")} expected := []runtime.Object{cmdtesting.NewInternalType("", "", "foo")}
actual := []runtime.Object{} actual := []runtime.Object{}
//actual := tf.Printer.(*testPrinter).Objects
if len(actual) != len(expected) { if len(actual) != len(expected) {
t.Fatalf("expected: %#v, but actual: %#v", expected, actual) t.Fatalf("expected: %#v, but actual: %#v", expected, actual)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment