[ARVADOS] updated: 2.1.0-753-ge79655656

[Git user]

Summary of changes:
 build/run-tests.sh                     | 8 ++++++++
 lib/boot/passenger.go                  | 1 -
 sdk/go/arvados/duration.go             | 2 +-
 sdk/go/arvados/duration_test.go        | 8 ++++----
 services/keepstore/unix_volume_test.go | 2 +-
 5 files changed, 14 insertions(+), 7 deletions(-)

       via  e7965565638c3b995b7888bc33baee0a6875c6d4 (commit)
       via  51d072fb24a69336c09fe4320102f5797db0d5e0 (commit)
      from  921047b7c9c1935117f375543dd131bdbd08102c (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 e7965565638c3b995b7888bc33baee0a6875c6d4
Author: Tom Clegg <tom at curii.com>
Date:   Tue May 4 13:52:22 2021 -0400

    Don't ask nginx to log to stderr when using setuid.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/boot/passenger.go b/lib/boot/passenger.go
index 0340ebc8c..d77a4d76e 100644
--- a/lib/boot/passenger.go
+++ b/lib/boot/passenger.go
@@ -132,7 +132,6 @@ func (runner runPassenger) Run(ctx context.Context, fail func(error), super *Sup
 			"passenger", "start",
 			"--address", host,
 			"--port", port,
-			"--log-file", "/dev/stderr",
 			"--log-level", loglevel,
 			"--no-friendly-error-pages",
 			"--disable-anonymous-telemetry",

commit 51d072fb24a69336c09fe4320102f5797db0d5e0
Author: Tom Clegg <tom at curii.com>
Date:   Tue May 4 13:52:08 2021 -0400

    Update tests for go 1.16.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/build/run-tests.sh b/build/run-tests.sh
index d6dc43416..e309d2401 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -1147,6 +1147,14 @@ test_all() {
     do_test apps/workbench_profile
 }
 
+test_go() {
+    do_test gofmt
+    for g in "${gostuff[@]}"
+    do
+        do_test "$g" go
+    done
+}
+
 help_interactive() {
     echo "== Interactive commands:"
     echo "TARGET                 (short for 'test DIR')"
diff --git a/sdk/go/arvados/duration.go b/sdk/go/arvados/duration.go
index ee482fdf3..c922f0a30 100644
--- a/sdk/go/arvados/duration.go
+++ b/sdk/go/arvados/duration.go
@@ -22,7 +22,7 @@ func (d *Duration) UnmarshalJSON(data []byte) error {
 	}
 	// Mimic error message returned by ParseDuration for a number
 	// without units.
-	return fmt.Errorf("missing unit in duration %s", data)
+	return fmt.Errorf("missing unit in duration %q", data)
 }
 
 // MarshalJSON implements json.Marshaler.
diff --git a/sdk/go/arvados/duration_test.go b/sdk/go/arvados/duration_test.go
index 86fe218c3..fa0ef0aec 100644
--- a/sdk/go/arvados/duration_test.go
+++ b/sdk/go/arvados/duration_test.go
@@ -50,13 +50,13 @@ func (s *DurationSuite) TestUnmarshalJSON(c *check.C) {
 		D Duration
 	}
 	err := json.Unmarshal([]byte(`{"D":1.234}`), &d)
-	c.Check(err, check.ErrorMatches, `missing unit in duration 1.234`)
+	c.Check(err, check.ErrorMatches, `.*missing unit in duration "?1\.234"?`)
 	err = json.Unmarshal([]byte(`{"D":"1.234"}`), &d)
-	c.Check(err, check.ErrorMatches, `.*missing unit in duration 1.234`)
+	c.Check(err, check.ErrorMatches, `.*missing unit in duration "?1\.234"?`)
 	err = json.Unmarshal([]byte(`{"D":"1"}`), &d)
-	c.Check(err, check.ErrorMatches, `.*missing unit in duration 1`)
+	c.Check(err, check.ErrorMatches, `.*missing unit in duration "?1"?`)
 	err = json.Unmarshal([]byte(`{"D":"foobar"}`), &d)
-	c.Check(err, check.ErrorMatches, `.*invalid duration foobar`)
+	c.Check(err, check.ErrorMatches, `.*invalid duration "foobar"`)
 	err = json.Unmarshal([]byte(`{"D":"60s"}`), &d)
 	c.Check(err, check.IsNil)
 	c.Check(d.D.Duration(), check.Equals, time.Minute)
diff --git a/services/keepstore/unix_volume_test.go b/services/keepstore/unix_volume_test.go
index 6b42dbc51..166085809 100644
--- a/services/keepstore/unix_volume_test.go
+++ b/services/keepstore/unix_volume_test.go
@@ -395,7 +395,7 @@ func (s *UnixVolumeSuite) TestStats(c *check.C) {
 	c.Check(err, check.NotNil)
 	c.Check(stats(), check.Matches, `.*"StatOps":[^0],.*`)
 	c.Check(stats(), check.Matches, `.*"Errors":[^0],.*`)
-	c.Check(stats(), check.Matches, `.*"\*os\.PathError":[^0].*`)
+	c.Check(stats(), check.Matches, `.*"\*(fs|os)\.PathError":[^0].*`) // os.PathError changed to fs.PathError in Go 1.16
 	c.Check(stats(), check.Matches, `.*"InBytes":0,.*`)
 	c.Check(stats(), check.Matches, `.*"OpenOps":0,.*`)
 	c.Check(stats(), check.Matches, `.*"CreateOps":0,.*`)

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


hooks/post-receive
--