From: Tom Clegg <tom@curii.com>
Date: Wed, 27 Apr 2022 17:33:40 +0000 (-0400)
Subject: 18794: Fix "check" command test.
X-Git-Tag: 2.5.0~184^2~10
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/35bb2d98244d40106c0493385f90cdd198c91447

18794: Fix "check" command test.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
---

diff --git a/sdk/go/health/aggregator_test.go b/sdk/go/health/aggregator_test.go
index 050b2c0fcc..f9b6dc6ae0 100644
--- a/sdk/go/health/aggregator_test.go
+++ b/sdk/go/health/aggregator_test.go
@@ -245,10 +245,19 @@ func (s *AggregatorSuite) TestCheckCommand(c *check.C) {
 	confdata = regexp.MustCompile(`Source(Timestamp|SHA256): [^\n]+\n`).ReplaceAll(confdata, []byte{})
 	err = ioutil.WriteFile(tmpdir+"/config.yml", confdata, 0777)
 	c.Assert(err, check.IsNil)
+
 	var stdout, stderr bytes.Buffer
+
 	exitcode := CheckCommand.RunCommand("check", []string{"-config=" + tmpdir + "/config.yml"}, &bytes.Buffer{}, &stdout, &stderr)
 	c.Check(exitcode, check.Equals, 0)
 	c.Check(stderr.String(), check.Equals, "")
+	c.Check(stdout.String(), check.Equals, "")
+
+	stdout.Reset()
+	stderr.Reset()
+	exitcode = CheckCommand.RunCommand("check", []string{"-config=" + tmpdir + "/config.yml", "-yaml"}, &bytes.Buffer{}, &stdout, &stderr)
+	c.Check(exitcode, check.Equals, 0)
+	c.Check(stderr.String(), check.Equals, "")
 	c.Check(stdout.String(), check.Matches, `(?ms).*(\n|^)health: OK\n.*`)
 }