X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1b7ed029c3d9d50b275573b65e8fbf4943e76bcb..82baf2fc853329a602119a72b73b752621e2888a:/sdk/go/arvados/fs_site_test.go

diff --git a/sdk/go/arvados/fs_site_test.go b/sdk/go/arvados/fs_site_test.go
index e35ae4897e..51ca88764e 100644
--- a/sdk/go/arvados/fs_site_test.go
+++ b/sdk/go/arvados/fs_site_test.go
@@ -7,13 +7,43 @@ package arvados
 import (
 	"net/http"
 	"os"
+	"time"
 
-	"git.curoverse.com/arvados.git/sdk/go/arvadostest"
 	check "gopkg.in/check.v1"
 )
 
+const (
+	// Importing arvadostest would be an import cycle, so these
+	// fixtures are duplicated here [until fs moves to a separate
+	// package].
+	fixtureActiveToken                  = "3kg6k6lzmp9kj5cpkcoxie963cmvjahbt2fod9zru30k1jqdmi"
+	fixtureAProjectUUID                 = "zzzzz-j7d0g-v955i6s2oi1cbso"
+	fixtureThisFilterGroupUUID          = "zzzzz-j7d0g-thisfiltergroup"
+	fixtureAFilterGroupTwoUUID          = "zzzzz-j7d0g-afiltergrouptwo"
+	fixtureAFilterGroupThreeUUID        = "zzzzz-j7d0g-filtergroupthre"
+	fixtureAFilterGroupFourUUID         = "zzzzz-j7d0g-filtergroupfour"
+	fixtureAFilterGroupFiveUUID         = "zzzzz-j7d0g-filtergroupfive"
+	fixtureFooAndBarFilesInDirUUID      = "zzzzz-4zz18-foonbarfilesdir"
+	fixtureFooCollectionName            = "zzzzz-4zz18-fy296fx3hot09f7 added sometime"
+	fixtureFooCollectionPDH             = "1f4b0bc7583c2a7f9102c395f4ffc5e3+45"
+	fixtureFooCollection                = "zzzzz-4zz18-fy296fx3hot09f7"
+	fixtureNonexistentCollection        = "zzzzz-4zz18-totallynotexist"
+	fixtureStorageClassesDesiredArchive = "zzzzz-4zz18-3t236wr12769qqa"
+	fixtureBlobSigningKey               = "zfhgfenhffzltr9dixws36j1yhksjoll2grmku38mi7yxd66h5j4q9w4jzanezacp8s6q0ro3hxakfye02152hncy6zml2ed0uc"
+	fixtureBlobSigningTTL               = 336 * time.Hour
+)
+
 var _ = check.Suite(&SiteFSSuite{})
 
+func init() {
+	// Enable DebugLocksPanicMode sometimes. Don't enable it all
+	// the time, though -- it adds many calls to time.Sleep(),
+	// which could hide different bugs.
+	if time.Now().Second()&1 == 0 {
+		DebugLocksPanicMode = true
+	}
+}
+
 type SiteFSSuite struct {
 	client *Client
 	fs     CustomFileSystem
@@ -23,13 +53,17 @@ type SiteFSSuite struct {
 func (s *SiteFSSuite) SetUpTest(c *check.C) {
 	s.client = &Client{
 		APIHost:   os.Getenv("ARVADOS_API_HOST"),
-		AuthToken: arvadostest.ActiveToken,
+		AuthToken: fixtureActiveToken,
 		Insecure:  true,
 	}
 	s.kc = &keepClientStub{
 		blocks: map[string][]byte{
 			"3858f62230ac3c915f300c664312c63f": []byte("foobar"),
-		}}
+		},
+		sigkey:    fixtureBlobSigningKey,
+		sigttl:    fixtureBlobSigningTTL,
+		authToken: fixtureActiveToken,
+	}
 	s.fs = s.client.SiteFileSystem(s.kc)
 }
 
@@ -42,40 +76,69 @@ func (s *SiteFSSuite) TestByIDEmpty(c *check.C) {
 	f, err := s.fs.Open("/by_id")
 	c.Assert(err, check.IsNil)
 	fis, err := f.Readdir(-1)
+	c.Check(err, check.IsNil)
 	c.Check(len(fis), check.Equals, 0)
 }
 
-func (s *SiteFSSuite) TestByUUID(c *check.C) {
+func (s *SiteFSSuite) TestUpdateStorageClasses(c *check.C) {
+	f, err := s.fs.OpenFile("/by_id/"+fixtureStorageClassesDesiredArchive+"/newfile", os.O_CREATE|os.O_RDWR, 0777)
+	c.Assert(err, check.IsNil)
+	_, err = f.Write([]byte("nope"))
+	c.Assert(err, check.IsNil)
+	err = f.Close()
+	c.Assert(err, check.IsNil)
+	err = s.fs.Sync()
+	c.Assert(err, check.ErrorMatches, `.*stub does not write storage class "archive"`)
+}
+
+func (s *SiteFSSuite) TestByUUIDAndPDH(c *check.C) {
 	f, err := s.fs.Open("/by_id")
 	c.Assert(err, check.IsNil)
 	fis, err := f.Readdir(-1)
 	c.Check(err, check.IsNil)
 	c.Check(len(fis), check.Equals, 0)
 
-	err = s.fs.Mkdir("/by_id/"+arvadostest.FooCollection, 0755)
+	err = s.fs.Mkdir("/by_id/"+fixtureFooCollection, 0755)
 	c.Check(err, check.Equals, os.ErrExist)
 
-	f, err = s.fs.Open("/by_id/" + arvadostest.NonexistentCollection)
+	f, err = s.fs.Open("/by_id/" + fixtureNonexistentCollection)
 	c.Assert(err, check.Equals, os.ErrNotExist)
 
-	f, err = s.fs.Open("/by_id/" + arvadostest.FooCollection)
+	for _, path := range []string{
+		fixtureFooCollection,
+		fixtureFooCollectionPDH,
+		fixtureAProjectUUID + "/" + fixtureFooCollectionName,
+	} {
+		f, err = s.fs.Open("/by_id/" + path)
+		c.Assert(err, check.IsNil)
+		fis, err = f.Readdir(-1)
+		c.Assert(err, check.IsNil)
+		var names []string
+		for _, fi := range fis {
+			names = append(names, fi.Name())
+		}
+		c.Check(names, check.DeepEquals, []string{"foo"})
+	}
+
+	f, err = s.fs.Open("/by_id/" + fixtureAProjectUUID + "/A Subproject/baz_file")
 	c.Assert(err, check.IsNil)
 	fis, err = f.Readdir(-1)
+	c.Assert(err, check.IsNil)
 	var names []string
 	for _, fi := range fis {
 		names = append(names, fi.Name())
 	}
-	c.Check(names, check.DeepEquals, []string{"foo"})
+	c.Check(names, check.DeepEquals, []string{"baz"})
 
-	_, err = s.fs.OpenFile("/by_id/"+arvadostest.NonexistentCollection, os.O_RDWR|os.O_CREATE, 0755)
-	c.Check(err, check.Equals, ErrInvalidOperation)
-	err = s.fs.Rename("/by_id/"+arvadostest.FooCollection, "/by_id/beep")
+	_, err = s.fs.OpenFile("/by_id/"+fixtureNonexistentCollection, os.O_RDWR|os.O_CREATE, 0755)
+	c.Check(err, check.Equals, ErrInvalidArgument)
+	err = s.fs.Rename("/by_id/"+fixtureFooCollection, "/by_id/beep")
 	c.Check(err, check.Equals, ErrInvalidArgument)
-	err = s.fs.Rename("/by_id/"+arvadostest.FooCollection+"/foo", "/by_id/beep")
+	err = s.fs.Rename("/by_id/"+fixtureFooCollection+"/foo", "/by_id/beep")
 	c.Check(err, check.Equals, ErrInvalidArgument)
 	_, err = s.fs.Stat("/by_id/beep")
 	c.Check(err, check.Equals, os.ErrNotExist)
-	err = s.fs.Rename("/by_id/"+arvadostest.FooCollection+"/foo", "/by_id/"+arvadostest.FooCollection+"/bar")
+	err = s.fs.Rename("/by_id/"+fixtureFooCollection+"/foo", "/by_id/"+fixtureFooCollection+"/bar")
 	c.Check(err, check.IsNil)
 
 	err = s.fs.Rename("/by_id", "/beep")