17755: Merge branch 'main' into 17755-add-singularity-to-compute-image

[arvados.git] / services / keepstore / unix_volume_test.go

diff --git a/services/keepstore/unix_volume_test.go b/services/keepstore/unix_volume_test.go
index 6b42dbc519ac933a0ddca0092fc1b14fb1b599d8..166085809848b862a734096a4f1ff9c28223fdde 100644 (file)
--- 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,.*`)