Merge branch '15107-google-login'

[arvados.git] / 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 058eb408610db365fa2ff49932c3b643cf9634a2..91b8222cdc631d6ac80bf005c3f07c84fe641b92 100644 (file)
--- a/sdk/go/arvados/fs_project_test.go
+++ b/sdk/go/arvados/fs_project_test.go
@@ -12,7 +12,6 @@ import (
        "path/filepath"
        "strings"
 
-       "git.curoverse.com/arvados.git/sdk/go/arvadostest"
        check "gopkg.in/check.v1"
 )
 
@@ -67,15 +66,15 @@ func (s *SiteFSSuite) testHomeProject(c *check.C, path string) {
        f, err = s.fs.Open(path + "/A Project/..")
        c.Assert(err, check.IsNil)
        fi, err := f.Stat()
-       c.Check(err, check.IsNil)
+       c.Assert(err, check.IsNil)
        c.Check(fi.IsDir(), check.Equals, true)
        _, basename := filepath.Split(path)
        c.Check(fi.Name(), check.Equals, basename)
 
        f, err = s.fs.Open(path + "/A Project/A Subproject")
-       c.Check(err, check.IsNil)
+       c.Assert(err, check.IsNil)
        fi, err = f.Stat()
-       c.Check(err, check.IsNil)
+       c.Assert(err, check.IsNil)
        c.Check(fi.IsDir(), check.Equals, true)
 
        for _, nx := range []string{
@@ -90,26 +89,58 @@ func (s *SiteFSSuite) testHomeProject(c *check.C, path string) {
        }
 }
 
-func (s *SiteFSSuite) TestSlashInName(c *check.C) {
-       badCollection := Collection{
-               Name:      "bad/collection",
-               OwnerUUID: arvadostest.AProjectUUID,
+func (s *SiteFSSuite) TestProjectReaddirAfterLoadOne(c *check.C) {
+       f, err := s.fs.Open("/users/active/A Project/A Subproject")
+       c.Assert(err, check.IsNil)
+       defer f.Close()
+       f, err = s.fs.Open("/users/active/A Project/Project does not exist")
+       c.Assert(err, check.NotNil)
+       f, err = s.fs.Open("/users/active/A Project/A Subproject")
+       c.Assert(err, check.IsNil)
+       defer f.Close()
+       f, err = s.fs.Open("/users/active/A Project")
+       c.Assert(err, check.IsNil)
+       defer f.Close()
+       fis, err := f.Readdir(-1)
+       c.Assert(err, check.IsNil)
+       c.Logf("%#v", fis)
+       var foundSubproject, foundCollection bool
+       for _, fi := range fis {
+               switch fi.Name() {
+               case "A Subproject":
+                       foundSubproject = true
+               case "collection_to_move_around":
+                       foundCollection = true
+               }
        }
-       err := s.client.RequestAndDecode(&badCollection, "POST", "arvados/v1/collections", s.client.UpdateBody(&badCollection), nil)
+       c.Check(foundSubproject, check.Equals, true)
+       c.Check(foundCollection, check.Equals, true)
+}
+
+func (s *SiteFSSuite) TestSlashInName(c *check.C) {
+       var badCollection Collection
+       err := s.client.RequestAndDecode(&badCollection, "POST", "arvados/v1/collections", nil, map[string]interface{}{
+               "collection": map[string]string{
+                       "name":       "bad/collection",
+                       "owner_uuid": fixtureAProjectUUID,
+               },
+       })
        c.Assert(err, check.IsNil)
        defer s.client.RequestAndDecode(nil, "DELETE", "arvados/v1/collections/"+badCollection.UUID, nil, nil)
 
-       badProject := Group{
-               Name:       "bad/project",
-               GroupClass: "project",
-               OwnerUUID:  arvadostest.AProjectUUID,
-       }
-       err = s.client.RequestAndDecode(&badProject, "POST", "arvados/v1/groups", s.client.UpdateBody(&badProject), nil)
+       var badProject Group
+       err = s.client.RequestAndDecode(&badProject, "POST", "arvados/v1/groups", nil, map[string]interface{}{
+               "group": map[string]string{
+                       "name":        "bad/project",
+                       "group_class": "project",
+                       "owner_uuid":  fixtureAProjectUUID,
+               },
+       })
        c.Assert(err, check.IsNil)
        defer s.client.RequestAndDecode(nil, "DELETE", "arvados/v1/groups/"+badProject.UUID, nil, nil)
 
        dir, err := s.fs.Open("/users/active/A Project")
-       c.Check(err, check.IsNil)
+       c.Assert(err, check.IsNil)
        fis, err := dir.Readdir(-1)
        c.Check(err, check.IsNil)
        for _, fi := range fis {
@@ -122,16 +153,18 @@ func (s *SiteFSSuite) TestProjectUpdatedByOther(c *check.C) {
        s.fs.MountProject("home", "")
 
        project, err := s.fs.OpenFile("/home/A Project", 0, 0)
-       c.Check(err, check.IsNil)
+       c.Assert(err, check.IsNil)
 
        _, err = s.fs.Open("/home/A Project/oob")
        c.Check(err, check.NotNil)
 
-       oob := Collection{
-               Name:      "oob",
-               OwnerUUID: arvadostest.AProjectUUID,
-       }
-       err = s.client.RequestAndDecode(&oob, "POST", "arvados/v1/collections", s.client.UpdateBody(&oob), nil)
+       var oob Collection
+       err = s.client.RequestAndDecode(&oob, "POST", "arvados/v1/collections", nil, map[string]interface{}{
+               "collection": map[string]string{
+                       "name":       "oob",
+                       "owner_uuid": fixtureAProjectUUID,
+               },
+       })
        c.Assert(err, check.IsNil)
        defer s.client.RequestAndDecode(nil, "DELETE", "arvados/v1/collections/"+oob.UUID, nil, nil)
 
@@ -140,6 +173,7 @@ func (s *SiteFSSuite) TestProjectUpdatedByOther(c *check.C) {
        f, err := s.fs.Open("/home/A Project/oob")
        c.Assert(err, check.IsNil)
        fi, err := f.Stat()
+       c.Assert(err, check.IsNil)
        c.Check(fi.IsDir(), check.Equals, true)
        f.Close()
 
@@ -151,8 +185,13 @@ func (s *SiteFSSuite) TestProjectUpdatedByOther(c *check.C) {
        c.Check(err, check.IsNil)
 
        // Delete test.txt behind s.fs's back by updating the
-       // collection record with the old (empty) ManifestText.
-       err = s.client.RequestAndDecode(nil, "PATCH", "arvados/v1/collections/"+oob.UUID, s.client.UpdateBody(&oob), nil)
+       // collection record with an empty ManifestText.
+       err = s.client.RequestAndDecode(nil, "PATCH", "arvados/v1/collections/"+oob.UUID, nil, map[string]interface{}{
+               "collection": map[string]string{
+                       "manifest_text":      "",
+                       "portable_data_hash": "d41d8cd98f00b204e9800998ecf8427e+0",
+               },
+       })
        c.Assert(err, check.IsNil)
 
        err = project.Sync()