X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7f2569f2e9900348dc76b495c9a416fe339593ae..55ae59fab1e7fe21b51ab8ffb67fcebc2a64f138:/lib/config/cmd_test.go

diff --git a/lib/config/cmd_test.go b/lib/config/cmd_test.go
index af7c571203..fb1cba38b4 100644
--- a/lib/config/cmd_test.go
+++ b/lib/config/cmd_test.go
@@ -24,6 +24,12 @@ var (
 
 type CommandSuite struct{}
 
+func (s *CommandSuite) SetUpSuite(c *check.C) {
+	os.Unsetenv("ARVADOS_API_HOST")
+	os.Unsetenv("ARVADOS_API_HOST_INSECURE")
+	os.Unsetenv("ARVADOS_API_TOKEN")
+}
+
 func (s *CommandSuite) TestBadArg(c *check.C) {
 	var stderr bytes.Buffer
 	code := DumpCommand.RunCommand("arvados config-dump", []string{"-badarg"}, bytes.NewBuffer(nil), bytes.NewBuffer(nil), &stderr)
@@ -85,7 +91,7 @@ func (s *CommandSuite) TestCheckOldKeepstoreConfigFile(c *check.C) {
 	c.Assert(err, check.IsNil)
 	defer os.Remove(f.Name())
 
-	io.WriteString(f, "Debug: true\n")
+	io.WriteString(f, "Listen: :12345\nDebug: true\n")
 
 	var stdout, stderr bytes.Buffer
 	in := `
@@ -97,7 +103,7 @@ Clusters:
 	code := CheckCommand.RunCommand("arvados config-check", []string{"-config", "-", "-legacy-keepstore-config", f.Name()}, bytes.NewBufferString(in), &stdout, &stderr)
 	c.Check(code, check.Equals, 1)
 	c.Check(stdout.String(), check.Matches, `(?ms).*\n\- +.*LogLevel: info\n\+ +LogLevel: debug\n.*`)
-	c.Check(stderr.String(), check.Matches, `.*you should remove the legacy keepstore config file.*\n`)
+	c.Check(stderr.String(), check.Matches, `(?ms).*you should remove the legacy keepstore config file.*\n`)
 }
 
 func (s *CommandSuite) TestCheckUnknownKey(c *check.C) {