Skip to content

Commit 8f755aa

Browse files
authored
Merge pull request kubernetes#110745 from AllenZMC/improve_printers
Check for errors ahead of time
2 parents 6269784 + 711896b commit 8f755aa

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

pkg/printers/tablegenerator_test.go

+10-3
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,10 @@ func ErrorPrintHandler(obj *TestPrintType, options GenerateOptions) ([]metav1bet
5151
func TestCustomTypePrinting(t *testing.T) {
5252
columns := []metav1beta1.TableColumnDefinition{{Name: "Data"}}
5353
generator := NewTableGenerator()
54-
generator.TableHandler(columns, PrintCustomType)
54+
err := generator.TableHandler(columns, PrintCustomType)
55+
if err != nil {
56+
t.Fatalf("An error occurred when adds a print handler with a given set of columns: %#v", err)
57+
}
5558

5659
obj := TestPrintType{"test object"}
5760
table, err := generator.GenerateTable(&obj, GenerateOptions{})
@@ -71,9 +74,13 @@ func TestCustomTypePrinting(t *testing.T) {
7174
func TestPrintHandlerError(t *testing.T) {
7275
columns := []metav1beta1.TableColumnDefinition{{Name: "Data"}}
7376
generator := NewTableGenerator()
74-
generator.TableHandler(columns, ErrorPrintHandler)
77+
err := generator.TableHandler(columns, ErrorPrintHandler)
78+
if err != nil {
79+
t.Fatalf("An error occurred when adds a print handler with a given set of columns: %#v", err)
80+
}
81+
7582
obj := TestPrintType{"test object"}
76-
_, err := generator.GenerateTable(&obj, GenerateOptions{})
83+
_, err = generator.GenerateTable(&obj, GenerateOptions{})
7784
if err == nil || err.Error() != "ErrorPrintHandler error" {
7885
t.Errorf("Did not get the expected error: %#v", err)
7986
}

0 commit comments

Comments
 (0)