X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f8067ef415fd66a92f9a0e957e8384445af92a6a..3d7e21293962aac93f195ab02bf29d60039387bb:/services/fuse/tests/test_mount.py diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py index bef7d27f79..d25ab714d6 100644 --- a/services/fuse/tests/test_mount.py +++ b/services/fuse/tests/test_mount.py @@ -78,11 +78,11 @@ class FuseMountTest(MountTestBase): cw.write("data 8") cw.start_new_stream('edgecases') - for f in ":/.../-/*/\x01\\/ ".split("/"): + for f in ":/.../-/*/ ".split("/"): cw.start_new_file(f) cw.write('x') - for f in ":/.../-/*/\x01\\/ ".split("/"): + for f in ":/.../-/*/ ".split("/"): cw.start_new_stream('edgecases/dirs/' + f) cw.start_new_file('x/x') cw.write('x') @@ -99,9 +99,9 @@ class FuseMountTest(MountTestBase): self.assertDirContents('dir2', ['thing5.txt', 'thing6.txt', 'dir3']) self.assertDirContents('dir2/dir3', ['thing7.txt', 'thing8.txt']) self.assertDirContents('edgecases', - "dirs/:/.../-/*/\x01\\/ ".split("/")) + "dirs/:/.../-/*/ ".split("/")) self.assertDirContents('edgecases/dirs', - ":/.../-/*/\x01\\/ ".split("/")) + ":/.../-/*/ ".split("/")) files = {'thing1.txt': 'data 1', 'thing2.txt': 'data 2', @@ -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' @@ -617,9 +615,10 @@ class FuseRmTest(MountTestBase): r'\./testdir 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$') self.pool.apply(fuseRmTestHelperDeleteFile, (self.mounttmp,)) - # Can't have empty directories :-( so manifest will be empty. + # Empty directories are represented by an empty file named "." collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() - self.assertEqual(collection2["manifest_text"], "") + self.assertRegexpMatches(collection2["manifest_text"], + r'./testdir d41d8cd98f00b204e9800998ecf8427e\+0\+A\S+ 0:0:\\056\n') self.pool.apply(fuseRmTestHelperRmdir, (self.mounttmp,)) @@ -676,7 +675,7 @@ class FuseMvFileTest(MountTestBase): collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() self.assertRegexpMatches(collection2["manifest_text"], - r'\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$') + r'\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt\n\./testdir d41d8cd98f00b204e9800998ecf8427e\+0\+A\S+ 0:0:\\056\n') def fuseRenameTestHelper(mounttmp): @@ -1072,7 +1071,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):