From: Tom Clegg <tclegg@veritasgenetics.com>
Date: Fri, 14 Jun 2019 18:28:49 +0000 (-0400)
Subject: Merge branch '15000-config-api'
X-Git-Tag: 2.0.0~298
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/5c1c5e34118a3867fca9e7f0150074ea18623939

Merge branch '15000-config-api'

refs #15000

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
---

5c1c5e34118a3867fca9e7f0150074ea18623939
diff --cc lib/config/cmd.go
index 858bfc2b26,39df4ec170..a41e4b0331
--- a/lib/config/cmd.go
+++ b/lib/config/cmd.go
@@@ -13,8 -12,6 +13,7 @@@ import 
  	"os"
  	"os/exec"
  
- 	"git.curoverse.com/arvados.git/lib/cmd"
 +	"git.curoverse.com/arvados.git/sdk/go/arvados"
  	"git.curoverse.com/arvados.git/sdk/go/ctxlog"
  	"github.com/ghodss/yaml"
  )
diff --cc lib/config/cmd_test.go
index d77003b478,fdcb6cc767..f2915a0391
--- a/lib/config/cmd_test.go
+++ b/lib/config/cmd_test.go
@@@ -50,9 -57,9 +57,9 @@@ Clusters
    RequestLimits:
      MaxItemsPerResponse: 1234
  `
 -	code := CheckCommand.RunCommand("arvados config-check", nil, bytes.NewBufferString(in), &stdout, &stderr)
 +	code := CheckCommand.RunCommand("arvados config-check", []string{"-config", "-"}, bytes.NewBufferString(in), &stdout, &stderr)
  	c.Check(code, check.Equals, 1)
- 	c.Check(stdout.String(), check.Matches, `(?ms).*API:\n\- +.*MaxItemsPerResponse: 1000\n\+ +MaxItemsPerResponse: 1234\n.*`)
+ 	c.Check(stdout.String(), check.Matches, `(?ms).*\n\- +.*MaxItemsPerResponse: 1000\n\+ +MaxItemsPerResponse: 1234\n.*`)
  }
  
  func (s *CommandSuite) TestCheckUnknownKey(c *check.C) {