X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/67e4024755b7871b7f6dcc30ff094bb3291e1631..7aaf9f22aa646077b4b7fd961d6b731185b88137:/services/fuse/tests/test_mount.py diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py index f539b3f7d0..157f55e4a4 100644 --- a/services/fuse/tests/test_mount.py +++ b/services/fuse/tests/test_mount.py @@ -15,12 +15,15 @@ import os import subprocess import time import unittest +import tempfile import arvados import arvados_fuse as fuse from . import run_test_server +from .integration_test import IntegrationTest from .mount_test_base import MountTestBase +from .test_tmp_collection import storage_classes_desired logger = logging.getLogger('arvados.arv-mount') @@ -127,8 +130,10 @@ class FuseMagicTest(MountTestBase): 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.non_project_group = run_test_server.fixture('groups')['public_role']['uuid'] + self.filter_group = run_test_server.fixture('groups')['afiltergroup']['uuid'] self.collection_in_test_project = run_test_server.fixture('collections')['foo_collection_in_aproject']['name'] + self.collection_in_filter_group = run_test_server.fixture('collections')['baz_file']['name'] cw = arvados.CollectionWriter() @@ -156,6 +161,11 @@ class FuseMagicTest(MountTestBase): 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))) + self.assertIn(self.collection_in_filter_group, + llfuse.listdir(os.path.join(self.mounttmp, self.filter_group))) + self.assertIn(self.collection_in_filter_group, + llfuse.listdir(os.path.join(self.mounttmp, 'by_id', self.filter_group))) + mount_ls = llfuse.listdir(self.mounttmp) self.assertIn('README', mount_ls) @@ -165,6 +175,8 @@ class FuseMagicTest(MountTestBase): self.assertIn(self.test_project, mount_ls) self.assertIn(self.test_project, llfuse.listdir(os.path.join(self.mounttmp, 'by_id'))) + self.assertIn(self.filter_group, + 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)) @@ -777,10 +789,15 @@ class FuseDeleteProjectEventTest(MountTestBase): attempt(self.assertEqual, [], llfuse.listdir(os.path.join(self.mounttmp, "aproject"))) -def fuseFileConflictTestHelper(mounttmp): +def fuseFileConflictTestHelper(mounttmp, uuid, keeptmp, settings): class Test(unittest.TestCase): def runTest(self): + os.environ['KEEP_LOCAL_STORE'] = keeptmp + with open(os.path.join(mounttmp, "file1.txt"), "w") as f: + with arvados.collection.Collection(uuid, api_client=arvados.api_from_config('v1', apiconfig=settings)) as collection2: + with collection2.open("file1.txt", "w") as f2: + f2.write("foo") f.write("bar") d1 = sorted(llfuse.listdir(os.path.join(mounttmp))) @@ -809,12 +826,8 @@ class FuseFileConflictTest(MountTestBase): d1 = llfuse.listdir(os.path.join(self.mounttmp)) self.assertEqual([], sorted(d1)) - with arvados.collection.Collection(collection.manifest_locator(), api_client=self.api) as collection2: - with collection2.open("file1.txt", "w") as f: - f.write("foo") - # See note in MountTestBase.setUp - self.pool.apply(fuseFileConflictTestHelper, (self.mounttmp,)) + self.pool.apply(fuseFileConflictTestHelper, (self.mounttmp, collection.manifest_locator(), self.keeptmp, arvados.config.settings())) def fuseUnlinkOpenFileTest(mounttmp): @@ -1098,8 +1111,9 @@ class MagicDirApiError(FuseMagicTest): llfuse.listdir(os.path.join(self.mounttmp, self.testcollection)) -class FuseUnitTest(unittest.TestCase): +class SanitizeFilenameTest(MountTestBase): def test_sanitize_filename(self): + pdir = fuse.ProjectDirectory(1, {}, self.api, 0, project_object=self.api.users().current().execute()) acceptable = [ "foo.txt", ".foo", @@ -1119,15 +1133,15 @@ class FuseUnitTest(unittest.TestCase): "//", ] for f in acceptable: - self.assertEqual(f, fuse.sanitize_filename(f)) + self.assertEqual(f, pdir.sanitize_filename(f)) for f in unacceptable: - self.assertNotEqual(f, fuse.sanitize_filename(f)) + self.assertNotEqual(f, pdir.sanitize_filename(f)) # The sanitized filename should be the same length, though. - self.assertEqual(len(f), len(fuse.sanitize_filename(f))) + self.assertEqual(len(f), len(pdir.sanitize_filename(f))) # Special cases - self.assertEqual("_", fuse.sanitize_filename("")) - self.assertEqual("_", fuse.sanitize_filename(".")) - self.assertEqual("__", fuse.sanitize_filename("..")) + self.assertEqual("_", pdir.sanitize_filename("")) + self.assertEqual("_", pdir.sanitize_filename(".")) + self.assertEqual("__", pdir.sanitize_filename("..")) class FuseMagicTestPDHOnly(MountTestBase): @@ -1191,3 +1205,91 @@ class FuseMagicTestPDHOnly(MountTestBase): def test_with_default_by_id(self): self.verify_pdh_only(skip_pdh_only=True) + + +class SlashSubstitutionTest(IntegrationTest): + mnt_args = [ + '--read-write', + '--mount-home', 'zzz', + ] + + def setUp(self): + super(SlashSubstitutionTest, self).setUp() + self.api = arvados.safeapi.ThreadSafeApiCache(arvados.config.settings()) + self.api.config = lambda: {"Collections": {"ForwardSlashNameSubstitution": "[SLASH]"}} + self.testcoll = self.api.collections().create(body={"name": "foo/bar/baz"}).execute() + self.testcolleasy = self.api.collections().create(body={"name": "foo-bar-baz"}).execute() + self.fusename = 'foo[SLASH]bar[SLASH]baz' + + @IntegrationTest.mount(argv=mnt_args) + @mock.patch('arvados.util.get_config_once') + def test_slash_substitution_before_listing(self, get_config_once): + get_config_once.return_value = {"Collections": {"ForwardSlashNameSubstitution": "[SLASH]"}} + self.pool_test(os.path.join(self.mnt, 'zzz'), self.fusename) + self.checkContents() + @staticmethod + def _test_slash_substitution_before_listing(self, tmpdir, fusename): + with open(os.path.join(tmpdir, 'foo-bar-baz', 'waz'), 'w') as f: + f.write('xxx') + with open(os.path.join(tmpdir, fusename, 'waz'), 'w') as f: + f.write('foo') + + @IntegrationTest.mount(argv=mnt_args) + @mock.patch('arvados.util.get_config_once') + def test_slash_substitution_after_listing(self, get_config_once): + get_config_once.return_value = {"Collections": {"ForwardSlashNameSubstitution": "[SLASH]"}} + self.pool_test(os.path.join(self.mnt, 'zzz'), self.fusename) + self.checkContents() + @staticmethod + def _test_slash_substitution_after_listing(self, tmpdir, fusename): + with open(os.path.join(tmpdir, 'foo-bar-baz', 'waz'), 'w') as f: + f.write('xxx') + os.listdir(tmpdir) + with open(os.path.join(tmpdir, fusename, 'waz'), 'w') as f: + f.write('foo') + + def checkContents(self): + self.assertRegexpMatches(self.api.collections().get(uuid=self.testcoll['uuid']).execute()['manifest_text'], ' acbd18db') # md5(foo) + self.assertRegexpMatches(self.api.collections().get(uuid=self.testcolleasy['uuid']).execute()['manifest_text'], ' f561aaf6') # md5(xxx) + + @IntegrationTest.mount(argv=mnt_args) + @mock.patch('arvados.util.get_config_once') + def test_slash_substitution_conflict(self, get_config_once): + self.testcollconflict = self.api.collections().create(body={"name": self.fusename}).execute() + get_config_once.return_value = {"Collections": {"ForwardSlashNameSubstitution": "[SLASH]"}} + self.pool_test(os.path.join(self.mnt, 'zzz'), self.fusename) + self.assertRegexpMatches(self.api.collections().get(uuid=self.testcollconflict['uuid']).execute()['manifest_text'], ' acbd18db') # md5(foo) + # foo/bar/baz collection unchanged, because it is masked by foo[SLASH]bar[SLASH]baz + self.assertEqual(self.api.collections().get(uuid=self.testcoll['uuid']).execute()['manifest_text'], '') + @staticmethod + def _test_slash_substitution_conflict(self, tmpdir, fusename): + with open(os.path.join(tmpdir, fusename, 'waz'), 'w') as f: + f.write('foo') + +class StorageClassesTest(IntegrationTest): + mnt_args = [ + '--read-write', + '--mount-home', 'homedir', + ] + + def setUp(self): + super(StorageClassesTest, self).setUp() + self.api = arvados.safeapi.ThreadSafeApiCache(arvados.config.settings()) + + @IntegrationTest.mount(argv=mnt_args) + def test_collection_default_storage_classes(self): + coll_path = os.path.join(self.mnt, 'homedir', 'a_collection') + self.api.collections().create(body={'name':'a_collection'}).execute() + self.pool_test(coll_path) + @staticmethod + def _test_collection_default_storage_classes(self, coll): + self.assertEqual(storage_classes_desired(coll), ['default']) + + @IntegrationTest.mount(argv=mnt_args+['--storage-classes', 'foo']) + def test_collection_custom_storage_classes(self): + coll_path = os.path.join(self.mnt, 'homedir', 'new_coll') + os.mkdir(coll_path) + self.pool_test(coll_path) + @staticmethod + def _test_collection_custom_storage_classes(self, coll): + self.assertEqual(storage_classes_desired(coll), ['foo'])