X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7653054635e3f4f84da3f2b6862cd2c02fbe3fd4..6ddd57f1da6139b76db95ad16cccbb95eab01e5d:/sdk/go/arvados/fs_project_test.go diff --git a/sdk/go/arvados/fs_project_test.go b/sdk/go/arvados/fs_project_test.go index 91b8222cdc..d3dac7a14f 100644 --- a/sdk/go/arvados/fs_project_test.go +++ b/sdk/go/arvados/fs_project_test.go @@ -7,9 +7,9 @@ package arvados import ( "bytes" "encoding/json" + "errors" "io" "os" - "path/filepath" "strings" check "gopkg.in/check.v1" @@ -39,19 +39,82 @@ func (sc *spyingClient) RequestAndDecode(dst interface{}, method, path string, b return sc.Client.RequestAndDecode(dst, method, path, body, params) } +func (s *SiteFSSuite) TestFilterGroup(c *check.C) { + // Make sure that a collection and group that match the filter are present, + // and that a group that does not match the filter is not present. + s.fs.MountProject("fg", fixtureThisFilterGroupUUID) + + _, err := s.fs.OpenFile("/fg/baz_file", 0, 0) + c.Assert(err, check.IsNil) + + _, err = s.fs.OpenFile("/fg/A Subproject", 0, 0) + c.Assert(err, check.IsNil) + + _, err = s.fs.OpenFile("/fg/A Project", 0, 0) + c.Assert(err, check.Not(check.IsNil)) + + // An empty filter means everything that is visible should be returned. + s.fs.MountProject("fg2", fixtureAFilterGroupTwoUUID) + + _, err = s.fs.OpenFile("/fg2/baz_file", 0, 0) + c.Assert(err, check.IsNil) + + _, err = s.fs.OpenFile("/fg2/A Subproject", 0, 0) + c.Assert(err, check.IsNil) + + _, err = s.fs.OpenFile("/fg2/A Project", 0, 0) + c.Assert(err, check.IsNil) + + // An 'is_a' 'arvados#collection' filter means only collections should be returned. + s.fs.MountProject("fg3", fixtureAFilterGroupThreeUUID) + + _, err = s.fs.OpenFile("/fg3/baz_file", 0, 0) + c.Assert(err, check.IsNil) + + _, err = s.fs.OpenFile("/fg3/A Subproject", 0, 0) + c.Assert(err, check.Not(check.IsNil)) + + // An 'exists' 'arvados#collection' filter means only collections with certain properties should be returned. + s.fs.MountProject("fg4", fixtureAFilterGroupFourUUID) + + _, err = s.fs.Stat("/fg4/collection with list property with odd values") + c.Assert(err, check.IsNil) + + _, err = s.fs.Stat("/fg4/collection with list property with even values") + c.Assert(err, check.IsNil) + + // A 'contains' 'arvados#collection' filter means only collections with certain properties should be returned. + s.fs.MountProject("fg5", fixtureAFilterGroupFiveUUID) + + _, err = s.fs.Stat("/fg5/collection with list property with odd values") + c.Assert(err, check.IsNil) + + _, err = s.fs.Stat("/fg5/collection with list property with string value") + c.Assert(err, check.IsNil) + + _, err = s.fs.Stat("/fg5/collection with prop2 5") + c.Assert(err, check.Not(check.IsNil)) + + _, err = s.fs.Stat("/fg5/collection with list property with even values") + c.Assert(err, check.Not(check.IsNil)) +} + func (s *SiteFSSuite) TestCurrentUserHome(c *check.C) { s.fs.MountProject("home", "") - s.testHomeProject(c, "/home") + s.testHomeProject(c, "/home", "home") } func (s *SiteFSSuite) TestUsersDir(c *check.C) { - s.testHomeProject(c, "/users/active") + // /users/active is a hardlink to a dir whose name is the UUID + // of the active user + s.testHomeProject(c, "/users/active", fixtureActiveUserUUID) } -func (s *SiteFSSuite) testHomeProject(c *check.C, path string) { +func (s *SiteFSSuite) testHomeProject(c *check.C, path, expectRealName string) { f, err := s.fs.Open(path) c.Assert(err, check.IsNil) fis, err := f.Readdir(-1) + c.Assert(err, check.IsNil) c.Check(len(fis), check.Not(check.Equals), 0) ok := false @@ -68,8 +131,7 @@ func (s *SiteFSSuite) testHomeProject(c *check.C, path string) { fi, err := f.Stat() c.Assert(err, check.IsNil) c.Check(fi.IsDir(), check.Equals, true) - _, basename := filepath.Split(path) - c.Check(fi.Name(), check.Equals, basename) + c.Check(fi.Name(), check.Equals, expectRealName) f, err = s.fs.Open(path + "/A Project/A Subproject") c.Assert(err, check.IsNil) @@ -147,6 +209,21 @@ func (s *SiteFSSuite) TestSlashInName(c *check.C) { c.Logf("fi.Name() == %q", fi.Name()) c.Check(strings.Contains(fi.Name(), "/"), check.Equals, false) } + + // Make a new fs (otherwise content will still be cached from + // above) and enable "/" replacement string. + s.fs = s.client.SiteFileSystem(s.kc) + s.fs.ForwardSlashNameSubstitution("___") + dir, err = s.fs.Open("/users/active/A Project/bad___collection") + if c.Check(err, check.IsNil) { + _, err = dir.Readdir(-1) + c.Check(err, check.IsNil) + } + dir, err = s.fs.Open("/users/active/A Project/bad___project") + if c.Check(err, check.IsNil) { + _, err = dir.Readdir(-1) + c.Check(err, check.IsNil) + } } func (s *SiteFSSuite) TestProjectUpdatedByOther(c *check.C) { @@ -184,6 +261,19 @@ func (s *SiteFSSuite) TestProjectUpdatedByOther(c *check.C) { err = wf.Close() c.Check(err, check.IsNil) + err = project.Sync() + c.Check(err, check.IsNil) + f, err = s.fs.Open("/home/A Project/oob/test.txt") + if c.Check(err, check.IsNil) { + f.Close() + } + + // Ensure collection was flushed by Sync + var latest Collection + err = s.client.RequestAndDecode(&latest, "GET", "arvados/v1/collections/"+oob.UUID, nil, nil) + c.Check(err, check.IsNil) + c.Check(latest.ManifestText, check.Matches, `.*:test.txt.*\n`) + // Delete test.txt behind s.fs's back by updating the // collection record with an empty ManifestText. err = s.client.RequestAndDecode(nil, "PATCH", "arvados/v1/collections/"+oob.UUID, nil, map[string]interface{}{ @@ -194,18 +284,68 @@ func (s *SiteFSSuite) TestProjectUpdatedByOther(c *check.C) { }) c.Assert(err, check.IsNil) + // Sync again to reload collection. err = project.Sync() c.Check(err, check.IsNil) + + // Check test.txt deletion is reflected in fs. _, err = s.fs.Open("/home/A Project/oob/test.txt") c.Check(err, check.NotNil) - _, err = s.fs.Open("/home/A Project/oob") - c.Check(err, check.IsNil) + f, err = s.fs.Open("/home/A Project/oob") + if c.Check(err, check.IsNil) { + f.Close() + } err = s.client.RequestAndDecode(nil, "DELETE", "arvados/v1/collections/"+oob.UUID, nil, nil) c.Assert(err, check.IsNil) - err = project.Sync() + wf, err = s.fs.OpenFile("/home/A Project/oob/test.txt", os.O_CREATE|os.O_RDWR, 0700) + c.Assert(err, check.IsNil) + err = wf.Close() c.Check(err, check.IsNil) + + err = project.Sync() + c.Check(err, check.NotNil) // can't update the deleted collection _, err = s.fs.Open("/home/A Project/oob") - c.Check(err, check.NotNil) + c.Check(err, check.IsNil) // parent dir still has old collection -- didn't reload, because Sync failed +} + +func (s *SiteFSSuite) TestProjectUnsupportedOperations(c *check.C) { + s.fs.MountByID("by_id") + s.fs.MountProject("home", "") + + _, err := s.fs.OpenFile("/home/A Project/newfilename", os.O_CREATE|os.O_RDWR, 0) + c.Check(err, ErrorIs, ErrInvalidOperation) + + err = s.fs.Mkdir("/home/A Project/newdirname", 0) + c.Check(err, ErrorIs, ErrInvalidOperation) + + err = s.fs.Mkdir("/by_id/newdirname", 0) + c.Check(err, ErrorIs, ErrInvalidOperation) + + err = s.fs.Mkdir("/by_id/"+fixtureAProjectUUID+"/newdirname", 0) + c.Check(err, ErrorIs, ErrInvalidOperation) + + _, err = s.fs.OpenFile("/home/A Project", 0, 0) + c.Check(err, check.IsNil) +} + +type errorIsChecker struct { + *check.CheckerInfo +} + +var ErrorIs check.Checker = errorIsChecker{ + &check.CheckerInfo{Name: "ErrorIs", Params: []string{"value", "target"}}, +} + +func (checker errorIsChecker) Check(params []interface{}, names []string) (result bool, errStr string) { + err, ok := params[0].(error) + if !ok { + return false, "" + } + target, ok := params[1].(error) + if !ok { + return false, "" + } + return errors.Is(err, target), "" }