Merge branch 'master' into 13804-no-shutdown-wanted-nodes

[arvados.git] / services / fuse / tests / test_mount.py

diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py
index ec8868af7d799857d0eba14e8478f3030d9969cd..fb282d1aaa76a91cd58b9a5a15a28e7b263a1c4c 100644 (file)
--- a/services/fuse/tests/test_mount.py
+++ b/services/fuse/tests/test_mount.py
@@ -117,28 +117,14 @@ class FuseMountTest(MountTestBase):
                 self.assertEqual(v, f.read())
 
 
-class FuseNoAPITest(MountTestBase):
-    def setUp(self):
-        super(FuseNoAPITest, self).setUp()
-        keep = arvados.keep.KeepClient(local_store=self.keeptmp)
-        self.file_data = "API-free text\n"
-        self.file_loc = keep.put(self.file_data)
-        self.coll_loc = keep.put(". {} 0:{}:api-free.txt\n".format(
-                self.file_loc, len(self.file_data)))
-
-    def runTest(self):
-        self.make_mount(fuse.MagicDirectory)
-        self.assertDirContents(self.coll_loc, ['api-free.txt'])
-        with open(os.path.join(
-                self.mounttmp, self.coll_loc, 'api-free.txt')) as keep_file:
-            actual = keep_file.read(-1)
-        self.assertEqual(self.file_data, actual)
-
-
 class FuseMagicTest(MountTestBase):
     def setUp(self, api=None):
         super(FuseMagicTest, self).setUp(api=api)
 
+        self.test_project = run_test_server.fixture('groups')['aproject']['uuid']
+        self.non_project_group = run_test_server.fixture('groups')['public']['uuid']
+        self.collection_in_test_project = run_test_server.fixture('collections')['foo_collection_in_aproject']['name']
+
         cw = arvados.CollectionWriter()
 
         cw.start_new_file('thing1.txt')
@@ -146,7 +132,8 @@ class FuseMagicTest(MountTestBase):
 
         self.testcollection = cw.finish()
         self.test_manifest = cw.manifest_text()
-        self.api.collections().create(body={"manifest_text":self.test_manifest}).execute()
+        coll = self.api.collections().create(body={"manifest_text":self.test_manifest}).execute()
+        self.test_manifest_pdh = coll['portable_data_hash']
 
     def runTest(self):
         self.make_mount(fuse.MagicDirectory)
@@ -156,15 +143,26 @@ class FuseMagicTest(MountTestBase):
         self.assertFalse(any(arvados.util.keep_locator_pattern.match(fn) or
                              arvados.util.uuid_pattern.match(fn)
                              for fn in mount_ls),
-                         "new FUSE MagicDirectory lists Collection")
+                         "new FUSE MagicDirectory has no collections or projects")
         self.assertDirContents(self.testcollection, ['thing1.txt'])
         self.assertDirContents(os.path.join('by_id', self.testcollection),
                                ['thing1.txt'])
+        self.assertIn(self.collection_in_test_project,
+                      llfuse.listdir(os.path.join(self.mounttmp, self.test_project)))
+        self.assertIn(self.collection_in_test_project,
+                      llfuse.listdir(os.path.join(self.mounttmp, 'by_id', self.test_project)))
+
         mount_ls = llfuse.listdir(self.mounttmp)
         self.assertIn('README', mount_ls)
         self.assertIn(self.testcollection, mount_ls)
         self.assertIn(self.testcollection,
                       llfuse.listdir(os.path.join(self.mounttmp, 'by_id')))
+        self.assertIn(self.test_project, mount_ls)
+        self.assertIn(self.test_project, 
+                      llfuse.listdir(os.path.join(self.mounttmp, 'by_id')))
+
+        with self.assertRaises(OSError):
+            llfuse.listdir(os.path.join(self.mounttmp, 'by_id', self.non_project_group))
 
         files = {}
         files[os.path.join(self.mounttmp, self.testcollection, 'thing1.txt')] = 'data 1'
@@ -745,6 +743,34 @@ class FuseUpdateFromEventTest(MountTestBase):
             attempt(self.assertEqual, ["file1.txt"], llfuse.listdir(os.path.join(self.mounttmp)))
 
 
+class FuseDeleteProjectEventTest(MountTestBase):
+    def runTest(self):
+
+        aproject = self.api.groups().create(body={
+            "name": "aproject",
+            "group_class": "project"
+        }).execute()
+
+        bproject = self.api.groups().create(body={
+            "name": "bproject",
+            "group_class": "project",
+            "owner_uuid": aproject["uuid"]
+        }).execute()
+
+        self.make_mount(fuse.ProjectDirectory,
+                        project_object=self.api.users().current().execute())
+
+        self.operations.listen_for_events()
+
+        d1 = llfuse.listdir(os.path.join(self.mounttmp, "aproject"))
+        self.assertEqual(["bproject"], sorted(d1))
+
+        self.api.groups().delete(uuid=bproject["uuid"]).execute()
+
+        for attempt in AssertWithTimeout(10):
+            attempt(self.assertEqual, [], llfuse.listdir(os.path.join(self.mounttmp, "aproject")))
+
+
 def fuseFileConflictTestHelper(mounttmp):
     class Test(unittest.TestCase):
         def runTest(self):
@@ -1044,7 +1070,13 @@ class MagicDirApiError(FuseMagicTest):
     def setUp(self):
         api = mock.MagicMock()
         super(MagicDirApiError, self).setUp(api=api)
-        api.collections().get().execute.side_effect = iter([Exception('API fail'), {"manifest_text": self.test_manifest}])
+        api.collections().get().execute.side_effect = iter([
+            Exception('API fail'),
+            {
+                "manifest_text": self.test_manifest,
+                "portable_data_hash": self.test_manifest_pdh,
+            },
+        ])
         api.keep.get.side_effect = Exception('Keep fail')
 
     def runTest(self):