[ARVADOS] updated: 2.1.0-2397-g35bb2d982

[Git user]

Summary of changes:
 sdk/go/health/aggregator_test.go             | 9 +++++++++
 services/api/test/integration/errors_test.rb | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

       via  35bb2d98244d40106c0493385f90cdd198c91447 (commit)
       via  1cbf3ce5f6bbb72b9c457e78ae406a557630bebe (commit)
      from  588358fc0aa03a5036a9aa21f15b604e9e5c98c7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 35bb2d98244d40106c0493385f90cdd198c91447
Author: Tom Clegg <tom at curii.com>
Date:   Wed Apr 27 13:33:40 2022 -0400

    18794: Fix "check" command test.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/sdk/go/health/aggregator_test.go b/sdk/go/health/aggregator_test.go
index 050b2c0fc..f9b6dc6ae 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.*`)
 }
 

commit 1cbf3ce5f6bbb72b9c457e78ae406a557630bebe
Author: Tom Clegg <tom at curii.com>
Date:   Wed Apr 27 13:21:14 2022 -0400

    18794: Fix routing test.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/services/api/test/integration/errors_test.rb b/services/api/test/integration/errors_test.rb
index a5359278e..8e9929117 100644
--- a/services/api/test/integration/errors_test.rb
+++ b/services/api/test/integration/errors_test.rb
@@ -24,7 +24,7 @@ class ErrorsTest < ActionDispatch::IntegrationTest
       # Generally, new routes should appear under /arvados/v1/. If
       # they appear elsewhere, that might have been caused by default
       # rails generator behavior that we don't want.
-      assert_match(/^\/(|\*a|arvados\/v1\/.*|auth\/.*|login|logout|database\/reset|discovery\/.*|static\/.*|sys\/trash_sweep|themes\/.*|assets|_health|metrics\/.*)(\(\.:format\))?$/,
+      assert_match(/^\/(|\*a|arvados\/v1\/.*|auth\/.*|login|logout|database\/reset|discovery\/.*|static\/.*|sys\/trash_sweep|themes\/.*|assets|_health\/.*|metrics)(\(\.:format\))?$/,
                    route.path.spec.to_s,
                    "Unexpected new route: #{route.path.spec}")
     end

-----------------------------------------------------------------------


hooks/post-receive
--