Skip to content

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

Merge pull request #39428 from shiywang/refactor_wideColumns_printer

Automatic merge from submit-queue (batch tested with PRs 39132, 39428) Move wideHeader [] strings into handlerEntry To adress this problem: https://github.com/openshift/origin/pull/12354, make `-o wide` more flexible to be used by OpenShift
parents 5fc2b352 31c4d158
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
pkg/kubectl/resource_printer_test.go
View file @ 0d93a4c3
...@@ -256,7 +256,7 @@ func ErrorPrintHandler(obj *TestPrintType, w io.Writer, options PrintOptions) er ...@@ -256,7 +256,7 @@ func ErrorPrintHandler(obj *TestPrintType, w io.Writer, options PrintOptions) er
func TestCustomTypePrinting(t *testing.T) { func TestCustomTypePrinting(t *testing.T) {
columns := []string{"Data"} columns := []string{"Data"}
printer := NewHumanReadablePrinter(PrintOptions{}) printer := NewHumanReadablePrinter(PrintOptions{})
printer.Handler(columns, PrintCustomType) printer.Handler(columns, nil, PrintCustomType)
obj := TestPrintType{"test object"} obj := TestPrintType{"test object"}
buffer := &bytes.Buffer{} buffer := &bytes.Buffer{}
...@@ -273,7 +273,7 @@ func TestCustomTypePrinting(t *testing.T) { ...@@ -273,7 +273,7 @@ func TestCustomTypePrinting(t *testing.T) {
func TestCustomTypePrintingWithKind(t *testing.T) { func TestCustomTypePrintingWithKind(t *testing.T) {
columns := []string{"Data"} columns := []string{"Data"}
printer := NewHumanReadablePrinter(PrintOptions{}) printer := NewHumanReadablePrinter(PrintOptions{})
printer.Handler(columns, PrintCustomType) printer.Handler(columns, nil, PrintCustomType)
printer.EnsurePrintWithKind("test") printer.EnsurePrintWithKind("test")
obj := TestPrintType{"test object"} obj := TestPrintType{"test object"}
...@@ -291,7 +291,7 @@ func TestCustomTypePrintingWithKind(t *testing.T) { ...@@ -291,7 +291,7 @@ func TestCustomTypePrintingWithKind(t *testing.T) {
func TestPrintHandlerError(t *testing.T) { func TestPrintHandlerError(t *testing.T) {
columns := []string{"Data"} columns := []string{"Data"}
printer := NewHumanReadablePrinter(PrintOptions{}) printer := NewHumanReadablePrinter(PrintOptions{})
printer.Handler(columns, ErrorPrintHandler) printer.Handler(columns, nil, ErrorPrintHandler)
obj := TestPrintType{"test object"} obj := TestPrintType{"test object"}
buffer := &bytes.Buffer{} buffer := &bytes.Buffer{}
err := printer.PrintObj(&obj, buffer) err := printer.PrintObj(&obj, buffer)
......
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