17590: Merge branch 'master'

[arvados.git] / lib / config / load_test.go

diff --git a/lib/config/load_test.go b/lib/config/load_test.go
index 4cdebf62bc5f49648fbff3e73cdb5e7ae009a8b9..6c11ee7803116ab2df30f2050f23f7ce6580a9fc 100644 (file)
--- a/lib/config/load_test.go
+++ b/lib/config/load_test.go
@@ -351,7 +351,7 @@ Clusters:
     Proxy: true
 `, `
 Clusters:
- abcdef:
+ abcde:
   ManagementToken: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
   SystemRootToken: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
   Collections:
@@ -437,10 +437,12 @@ Clusters:
 `)
 }
 
-func checkEquivalent(c *check.C, goty, expectedy string) {
-       gotldr := testLoader(c, goty, nil)
+func checkEquivalent(c *check.C, goty, expectedy string) string {
+       var logbuf bytes.Buffer
+       gotldr := testLoader(c, goty, &logbuf)
        expectedldr := testLoader(c, expectedy, nil)
        checkEquivalentLoaders(c, gotldr, expectedldr)
+       return logbuf.String()
 }
 
 func checkEqualYAML(c *check.C, got, expected interface{}) {