X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4f1341cf015b21d95ec3475cbfe0ae82e73d8b2b..ffe48ca94f89f3d7b71305b394e1f57ee633efed:/lib/config/cmd_test.go diff --git a/lib/config/cmd_test.go b/lib/config/cmd_test.go index 7167982ccd..c2854895ca 100644 --- a/lib/config/cmd_test.go +++ b/lib/config/cmd_test.go @@ -33,7 +33,7 @@ func (s *CommandSuite) SetUpSuite(c *check.C) { func (s *CommandSuite) TestDump_BadArg(c *check.C) { var stderr bytes.Buffer code := DumpCommand.RunCommand("arvados config-dump", []string{"-badarg"}, bytes.NewBuffer(nil), bytes.NewBuffer(nil), &stderr) - c.Check(code, check.Equals, 2) + c.Check(code, check.Equals, cmd.EXIT_INVALIDARGUMENT) c.Check(stderr.String(), check.Equals, "error parsing command line arguments: flag provided but not defined: -badarg (try -help)\n") } @@ -69,8 +69,6 @@ Clusters: Type: select Options: fuchsia: {} - ApplicationMimetypesWithViewIcon: - whitespace: {} ` code := CheckCommand.RunCommand("arvados config-check", []string{"-config", "-"}, bytes.NewBufferString(in), &stdout, &stderr) c.Check(code, check.Equals, 0) @@ -124,8 +122,6 @@ Clusters: Type: select Options: fuchsia: {} - ApplicationMimetypesWithViewIcon: - whitespace: {} ` code := CheckCommand.RunCommand("arvados config-check", []string{"-config", "-"}, bytes.NewBufferString(in), &stdout, &stderr) c.Check(code, check.Equals, 1) @@ -217,7 +213,7 @@ Clusters: code := DumpCommand.RunCommand("arvados config-dump", []string{"-config", "-"}, bytes.NewBufferString(in), &stdout, &stderr) c.Check(code, check.Equals, 0) c.Check(stdout.String(), check.Matches, `(?ms).*TimeoutBooting: 10m\n.*`) - c.Check(stdout.String(), check.Matches, `(?ms).*http://localhost:12345/: {}\n.*`) + c.Check(stdout.String(), check.Matches, `(?ms).*http://localhost:12345/:\n +ListenURL: ""\n.*`) } func (s *CommandSuite) TestDump_UnknownKey(c *check.C) {