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')
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)
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'
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,))
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):
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):