X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/fe8a7a83e41dbc236621d5cd90128b0cf6721203..ba34a22d9918ae97306472c04701e69090821c82:/services/fuse/tests/test_mount.py diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py index 54316bb9a9..df3d426341 100644 --- a/services/fuse/tests/test_mount.py +++ b/services/fuse/tests/test_mount.py @@ -15,6 +15,8 @@ import os import subprocess import time import unittest +import tempfile +import parameterized import arvados import arvados_fuse as fuse @@ -22,6 +24,7 @@ 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') @@ -52,7 +55,7 @@ class AssertWithTimeout(object): else: self.done = True - +@parameterized.parameterized_class([{"disk_cache": True}, {"disk_cache": False}]) class FuseMountTest(MountTestBase): def setUp(self): super(FuseMountTest, self).setUp() @@ -123,6 +126,7 @@ class FuseMountTest(MountTestBase): self.assertEqual(v, f.read().decode()) +@parameterized.parameterized_class([{"disk_cache": True}, {"disk_cache": False}]) class FuseMagicTest(MountTestBase): def setUp(self, api=None): super(FuseMagicTest, self).setUp(api=api) @@ -281,6 +285,7 @@ def fuseSharedTestHelper(mounttmp): Test().runTest() +@parameterized.parameterized_class([{"disk_cache": True}, {"disk_cache": False}]) class FuseSharedTest(MountTestBase): def runTest(self): self.make_mount(fuse.SharedDirectory, @@ -341,6 +346,7 @@ def fuseModifyFileTestHelperReadEndContents(mounttmp): self.assertEqual("plnp", f.read()) Test().runTest() +@parameterized.parameterized_class([{"disk_cache": True}, {"disk_cache": False}]) class FuseModifyFileTest(MountTestBase): def runTest(self): collection = arvados.collection.Collection(api_client=self.api) @@ -361,6 +367,7 @@ class FuseModifyFileTest(MountTestBase): self.pool.apply(fuseModifyFileTestHelperReadEndContents, (self.mounttmp,)) +@parameterized.parameterized_class([{"disk_cache": True}, {"disk_cache": False}]) class FuseAddFileToCollectionTest(MountTestBase): def runTest(self): collection = arvados.collection.Collection(api_client=self.api) @@ -383,6 +390,7 @@ class FuseAddFileToCollectionTest(MountTestBase): self.assertEqual(["file1.txt", "file2.txt"], sorted(d1)) +@parameterized.parameterized_class([{"disk_cache": True}, {"disk_cache": False}]) class FuseRemoveFileFromCollectionTest(MountTestBase): def runTest(self): collection = arvados.collection.Collection(api_client=self.api) @@ -414,6 +422,7 @@ def fuseCreateFileTestHelper(mounttmp): pass Test().runTest() +@parameterized.parameterized_class([{"disk_cache": True}, {"disk_cache": False}]) class FuseCreateFileTest(MountTestBase): def runTest(self): collection = arvados.collection.Collection(api_client=self.api) @@ -457,6 +466,7 @@ def fuseWriteFileTestHelperReadFile(mounttmp): self.assertEqual(f.read(), "Hello world!") Test().runTest() +@parameterized.parameterized_class([{"disk_cache": True}, {"disk_cache": False}]) class FuseWriteFileTest(MountTestBase): def runTest(self): collection = arvados.collection.Collection(api_client=self.api) @@ -505,6 +515,7 @@ def fuseUpdateFileTestHelper(mounttmp): Test().runTest() +@parameterized.parameterized_class([{"disk_cache": True}, {"disk_cache": False}]) class FuseUpdateFileTest(MountTestBase): def runTest(self): collection = arvados.collection.Collection(api_client=self.api) @@ -787,10 +798,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))) @@ -819,12 +835,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): @@ -1085,6 +1097,7 @@ class FuseFsyncTest(FuseMagicTest): class MagicDirApiError(FuseMagicTest): def setUp(self): api = mock.MagicMock() + api.keep.block_cache = mock.MagicMock(cache_max=1) super(MagicDirApiError, self).setUp(api=api) api.collections().get().execute.side_effect = iter([ Exception('API fail'), @@ -1110,7 +1123,7 @@ class MagicDirApiError(FuseMagicTest): class SanitizeFilenameTest(MountTestBase): def test_sanitize_filename(self): - pdir = fuse.ProjectDirectory(1, {}, self.api, 0, project_object=self.api.users().current().execute()) + pdir = fuse.ProjectDirectory(1, {}, self.api, 0, False, project_object=self.api.users().current().execute()) acceptable = [ "foo.txt", ".foo", @@ -1262,3 +1275,53 @@ class SlashSubstitutionTest(IntegrationTest): 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']) + +def _readonlyCollectionTestHelper(mounttmp): + f = open(os.path.join(mounttmp, 'thing1.txt'), 'rt') + # Testing that close() doesn't raise an error. + f.close() + +class ReadonlyCollectionTest(MountTestBase): + def setUp(self): + super(ReadonlyCollectionTest, self).setUp() + cw = arvados.collection.Collection() + with cw.open('thing1.txt', 'wt') as f: + f.write("data 1") + cw.save_new(owner_uuid=run_test_server.fixture("groups")["aproject"]["uuid"]) + self.testcollection = cw.api_response() + + def runTest(self): + settings = arvados.config.settings().copy() + settings["ARVADOS_API_TOKEN"] = run_test_server.fixture("api_client_authorizations")["project_viewer"]["api_token"] + self.api = arvados.safeapi.ThreadSafeApiCache(settings) + self.make_mount(fuse.CollectionDirectory, collection_record=self.testcollection, enable_write=False) + + self.pool.apply(_readonlyCollectionTestHelper, (self.mounttmp,))