luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

commands: cleanup catalog list services tests

This commit is contained in:
Frank Schroeder 2017-10-17 13:46:36 +02:00 committed by Frank Schröder
parent 915034da78
commit 0e059248e7
1 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
command/catalog/list/services/catalog_list_services_test.go
View File

@ -21,34 +21,12 @@ func TestCatalogListServicesCommand_Validation(t *testing.T) {
ui := cli.NewMockUi() ui := cli.NewMockUi()
c := New(ui) c := New(ui)
cases := map[string]struct { code := c.Run([]string{"foo"})
args []string if code == 0 {
output string t.Fatal("expected non-zero exit")
}{
"args": {
[]string{"foo"},
"Too many arguments",
},
} }
if got, want := ui.ErrorWriter.String(), "Too many arguments"; !strings.Contains(got, want) {
for name, tc := range cases { t.Fatalf("expected %q to contain %q", got, want)
// Ensure our buffer is always clear
if ui.ErrorWriter != nil {
ui.ErrorWriter.Reset()
}
if ui.OutputWriter != nil {
ui.OutputWriter.Reset()
}
code := c.Run(tc.args)
if code == 0 {
t.Errorf("%s: expected non-zero exit", name)
}
output := ui.ErrorWriter.String()
if !strings.Contains(output, tc.output) {
t.Errorf("%s: expected %q to contain %q", name, output, tc.output)
}
} }
} }
@ -77,7 +55,6 @@ func TestCatalogListServicesCommand_Run(t *testing.T) {
if code != 0 { if code != 0 {
t.Fatalf("bad exit code %d: %s", code, ui.ErrorWriter.String()) t.Fatalf("bad exit code %d: %s", code, ui.ErrorWriter.String())
} }
output := ui.OutputWriter.String() output := ui.OutputWriter.String()
if expected := "consul\ntesting\n"; output != expected { if expected := "consul\ntesting\n"; output != expected {
t.Errorf("expected %q to be %q", output, expected) t.Errorf("expected %q to be %q", output, expected)
@ -95,7 +72,6 @@ func TestCatalogListServicesCommand_Run(t *testing.T) {
if code != 0 { if code != 0 {
t.Fatalf("bad exit code %d: %s", code, ui.ErrorWriter.String()) t.Fatalf("bad exit code %d: %s", code, ui.ErrorWriter.String())
} }
output := ui.OutputWriter.String() output := ui.OutputWriter.String()
if expected := "bar,foo"; !strings.Contains(output, expected) { if expected := "bar,foo"; !strings.Contains(output, expected) {
t.Errorf("expected %q to contain %q", output, expected) t.Errorf("expected %q to contain %q", output, expected)
@ -113,7 +89,6 @@ func TestCatalogListServicesCommand_Run(t *testing.T) {
if code != 0 { if code != 0 {
t.Fatalf("bad exit code %d: %s", code, ui.ErrorWriter.String()) t.Fatalf("bad exit code %d: %s", code, ui.ErrorWriter.String())
} }
output := ui.ErrorWriter.String() output := ui.ErrorWriter.String()
if expected := "No services match the given query"; !strings.Contains(output, expected) { if expected := "No services match the given query"; !strings.Contains(output, expected) {
t.Errorf("expected %q to contain %q", output, expected) t.Errorf("expected %q to contain %q", output, expected)
@ -131,7 +106,6 @@ func TestCatalogListServicesCommand_Run(t *testing.T) {
if code != 0 { if code != 0 {
t.Fatalf("bad exit code %d: %s", code, ui.ErrorWriter.String()) t.Fatalf("bad exit code %d: %s", code, ui.ErrorWriter.String())
} }
output := ui.OutputWriter.String() output := ui.OutputWriter.String()
if expected := "consul\ntesting\n"; !strings.Contains(output, expected) { if expected := "consul\ntesting\n"; !strings.Contains(output, expected) {
t.Errorf("expected %q to contain %q", output, expected) t.Errorf("expected %q to contain %q", output, expected)
@ -149,7 +123,6 @@ func TestCatalogListServicesCommand_Run(t *testing.T) {
if code != 0 { if code != 0 {
t.Fatalf("bad exit code %d: %s", code, ui.ErrorWriter.String()) t.Fatalf("bad exit code %d: %s", code, ui.ErrorWriter.String())
} }
output := ui.ErrorWriter.String() output := ui.ErrorWriter.String()
if expected := "No services match the given query"; !strings.Contains(output, expected) { if expected := "No services match the given query"; !strings.Contains(output, expected) {
t.Errorf("expected %q to contain %q", output, expected) t.Errorf("expected %q to contain %q", output, expected)