X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8b8673b66d593742deb718ab5933fa2c2a1d8672..17f2b714df870dffc6320173d6a2348243ff7992:/services/fuse/tests/test_mount.py diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py index 5e818cc49e..2aba2e760d 100644 --- a/services/fuse/tests/test_mount.py +++ b/services/fuse/tests/test_mount.py @@ -15,6 +15,8 @@ import unittest import logging import multiprocessing import run_test_server +import mock +import re from mount_test_base import MountTestBase @@ -31,8 +33,8 @@ class FuseMountTest(MountTestBase): cw.write("data 1") cw.start_new_file('thing2.txt') cw.write("data 2") - cw.start_new_stream('dir1') + cw.start_new_stream('dir1') cw.start_new_file('thing3.txt') cw.write("data 3") cw.start_new_file('thing4.txt') @@ -52,11 +54,11 @@ class FuseMountTest(MountTestBase): cw.write("data 8") cw.start_new_stream('edgecases') - for f in ":/./../.../-/*/\x01\\/ ".split("/"): + for f in ":/.../-/*/\x01\\/ ".split("/"): cw.start_new_file(f) cw.write('x') - for f in ":/../.../-/*/\x01\\/ ".split("/"): + for f in ":/.../-/*/\x01\\/ ".split("/"): cw.start_new_stream('edgecases/dirs/' + f) cw.start_new_file('x/x') cw.write('x') @@ -73,9 +75,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/:/.../-/*/\x01\\/ ".split("/")) self.assertDirContents('edgecases/dirs', - ":/__/.../-/*/\x01\\/ ".split("/")) + ":/.../-/*/\x01\\/ ".split("/")) files = {'thing1.txt': 'data 1', 'thing2.txt': 'data 2', @@ -110,8 +112,8 @@ class FuseNoAPITest(MountTestBase): class FuseMagicTest(MountTestBase): - def setUp(self): - super(FuseMagicTest, self).setUp() + def setUp(self, api=None): + super(FuseMagicTest, self).setUp(api=api) cw = arvados.CollectionWriter() @@ -119,7 +121,8 @@ class FuseMagicTest(MountTestBase): cw.write("data 1") self.testcollection = cw.finish() - self.api.collections().create(body={"manifest_text":cw.manifest_text()}).execute() + self.test_manifest = cw.manifest_text() + self.api.collections().create(body={"manifest_text":self.test_manifest}).execute() def runTest(self): self.make_mount(fuse.MagicDirectory) @@ -425,12 +428,16 @@ class FuseWriteFileTest(MountTestBase): self.assertNotIn("file1.txt", collection) + self.assertEqual(0, self.operations.write_counter.get()) self.pool.apply(fuseWriteFileTestHelperWriteFile, (self.mounttmp,)) + self.assertEqual(12, self.operations.write_counter.get()) with collection.open("file1.txt") as f: self.assertEqual(f.read(), "Hello world!") + self.assertEqual(0, self.operations.read_counter.get()) self.pool.apply(fuseWriteFileTestHelperReadFile, (self.mounttmp,)) + self.assertEqual(12, self.operations.read_counter.get()) collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() self.assertRegexpMatches(collection2["manifest_text"], @@ -697,7 +704,7 @@ class FuseUpdateFromEventTest(MountTestBase): with llfuse.lock: m.new_collection(collection.api_response(), collection) - self.operations.listen_for_events(self.api) + self.operations.listen_for_events() d1 = llfuse.listdir(os.path.join(self.mounttmp)) self.assertEqual([], sorted(d1)) @@ -1009,6 +1016,25 @@ class FuseFsyncTest(FuseMagicTest): self.pool.apply(fuseFsyncTestHelper, (self.mounttmp, self.testcollection)) +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.keep.get.side_effect = Exception('Keep fail') + + def runTest(self): + self.make_mount(fuse.MagicDirectory) + + self.operations.inodes.inode_cache.cap = 1 + self.operations.inodes.inode_cache.min_entries = 2 + + with self.assertRaises(OSError): + llfuse.listdir(os.path.join(self.mounttmp, self.testcollection)) + + llfuse.listdir(os.path.join(self.mounttmp, self.testcollection)) + + class FuseUnitTest(unittest.TestCase): def test_sanitize_filename(self): acceptable = [ @@ -1039,3 +1065,66 @@ class FuseUnitTest(unittest.TestCase): self.assertEqual("_", fuse.sanitize_filename("")) self.assertEqual("_", fuse.sanitize_filename(".")) self.assertEqual("__", fuse.sanitize_filename("..")) + + +class FuseMagicTestPDHOnly(MountTestBase): + def setUp(self, api=None): + super(FuseMagicTestPDHOnly, self).setUp(api=api) + + cw = arvados.CollectionWriter() + + cw.start_new_file('thing1.txt') + cw.write("data 1") + + self.testcollection = cw.finish() + self.test_manifest = cw.manifest_text() + created = self.api.collections().create(body={"manifest_text":self.test_manifest}).execute() + self.testcollectionuuid = str(created['uuid']) + + def verify_pdh_only(self, pdh_only=False, skip_pdh_only=False): + if skip_pdh_only is True: + self.make_mount(fuse.MagicDirectory) # in this case, the default by_id applies + else: + self.make_mount(fuse.MagicDirectory, pdh_only=pdh_only) + + mount_ls = llfuse.listdir(self.mounttmp) + self.assertIn('README', mount_ls) + 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") + + # look up using pdh should succeed in all cases + self.assertDirContents(self.testcollection, ['thing1.txt']) + self.assertDirContents(os.path.join('by_id', self.testcollection), + ['thing1.txt']) + 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'))) + + files = {} + files[os.path.join(self.mounttmp, self.testcollection, 'thing1.txt')] = 'data 1' + + for k, v in files.items(): + with open(os.path.join(self.mounttmp, k)) as f: + self.assertEqual(v, f.read()) + + # look up using uuid should fail when pdh_only is set + if pdh_only is True: + with self.assertRaises(OSError): + self.assertDirContents(os.path.join('by_id', self.testcollectionuuid), + ['thing1.txt']) + else: + self.assertDirContents(os.path.join('by_id', self.testcollectionuuid), + ['thing1.txt']) + + def test_with_pdh_only_true(self): + self.verify_pdh_only(pdh_only=True) + + def test_with_pdh_only_false(self): + self.verify_pdh_only(pdh_only=False) + + def test_with_default_by_id(self): + self.verify_pdh_only(skip_pdh_only=True)