13111: Merge branch 'master' into 12308-go-fuse

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --combined sdk/go/arvados/fs_collection_test.go
index 8d32eb2473fcfc4945a3ceffc7ea5a99fd721981,5b9d0e2effc153ca5322a8ffea3955301def2000..cb0f4b786581ce2674693d33a1444c3b28971c99
--- 1/sdk/go/arvados/fs_collection_test.go
--- 2/sdk/go/arvados/collection_fs_test.go
+++ b/sdk/go/arvados/fs_collection_test.go
@@@ -433,7 -433,7 +433,7 @@@ func (s *CollectionFSSuite) TestMkdir(
        err = s.fs.Remove("foo/bar")
        c.Check(err, check.IsNil)
  
-       // mkdir succeds after the file is deleted
+       // mkdir succeeds after the file is deleted
        err = s.fs.Mkdir("foo/bar", 0755)
        c.Check(err, check.IsNil)
  
@@@ -465,10 -465,6 +465,10 @@@
  }
  
  func (s *CollectionFSSuite) TestConcurrentWriters(c *check.C) {
 +      if testing.Short() {
 +              c.Skip("slow")
 +      }
 +
        maxBlockSize = 8
        defer func() { maxBlockSize = 2 << 26 }()
  
@@@ -688,13 -684,13 +688,13 @@@ func (s *CollectionFSSuite) TestRename(
                                err = fs.Rename(
                                        fmt.Sprintf("dir%d/file%d/patherror", i, j),
                                        fmt.Sprintf("dir%d/irrelevant", i))
 -                              c.Check(err, check.ErrorMatches, `.*does not exist`)
 +                              c.Check(err, check.ErrorMatches, `.*not a directory`)
  
                                // newname parent dir is a file
                                err = fs.Rename(
                                        fmt.Sprintf("dir%d/dir%d/file%d", i, j, j),
                                        fmt.Sprintf("dir%d/file%d/patherror", i, inner-j-1))
 -                              c.Check(err, check.ErrorMatches, `.*does not exist`)
 +                              c.Check(err, check.ErrorMatches, `.*not a directory`)
                        }(i, j)
                }
        }
@@@ -1018,10 -1014,6 +1018,10 @@@ var _ = check.Suite(&CollectionFSUnitSu
  
  // expect ~2 seconds to load a manifest with 256K files
  func (s *CollectionFSUnitSuite) TestLargeManifest(c *check.C) {
 +      if testing.Short() {
 +              c.Skip("slow")
 +      }
 +
        const (
                dirCount  = 512
                fileCount = 512