X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/949d940b5f75114f86d381c347f0ba8f26b3e9b9..a5b7b00aff9debab6607afb09b387de627bc2603:/services/fuse/tests/test_mount.py diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py index 6a00cdb6b4..f539b3f7d0 100644 --- a/services/fuse/tests/test_mount.py +++ b/services/fuse/tests/test_mount.py @@ -2,6 +2,11 @@ # # SPDX-License-Identifier: AGPL-3.0 +from __future__ import absolute_import +from future.utils import viewitems +from builtins import str +from builtins import object +from six import assertRegex import json import llfuse import logging @@ -13,9 +18,9 @@ import unittest import arvados import arvados_fuse as fuse -import run_test_server +from . import run_test_server -from mount_test_base import MountTestBase +from .mount_test_base import MountTestBase logger = logging.getLogger('arvados.arv-mount') @@ -31,7 +36,7 @@ class AssertWithTimeout(object): self.done = False return self - def next(self): + def __next__(self): if self.done: raise StopIteration return self.attempt @@ -78,11 +83,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 +104,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', @@ -112,9 +117,9 @@ class FuseMountTest(MountTestBase): 'dir2/dir3/thing7.txt': 'data 7', 'dir2/dir3/thing8.txt': 'data 8'} - for k, v in files.items(): - with open(os.path.join(self.mounttmp, k)) as f: - self.assertEqual(v, f.read()) + for k, v in viewitems(files): + with open(os.path.join(self.mounttmp, k), 'rb') as f: + self.assertEqual(v, f.read().decode()) class FuseMagicTest(MountTestBase): @@ -167,9 +172,9 @@ class FuseMagicTest(MountTestBase): 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()) + for k, v in viewitems(files): + with open(os.path.join(self.mounttmp, k), 'rb') as f: + self.assertEqual(v, f.read().decode()) class FuseTagsTest(MountTestBase): @@ -235,7 +240,7 @@ def fuseSharedTestHelper(mounttmp): # check mtime on collection st = os.stat(baz_path) try: - mtime = st.st_mtime_ns / 1000000000 + mtime = st.st_mtime_ns // 1000000000 except AttributeError: mtime = st.st_mtime self.assertEqual(mtime, 1391448174) @@ -271,7 +276,7 @@ class FuseSharedTest(MountTestBase): self.make_mount(fuse.SharedDirectory, exclude=self.api.users().current().execute()['uuid']) keep = arvados.keep.KeepClient() - keep.put("baz") + keep.put("baz".encode()) self.pool.apply(fuseSharedTestHelper, (self.mounttmp,)) @@ -289,7 +294,7 @@ class FuseHomeTest(MountTestBase): 'anonymously_accessible_project'] found_in = 0 found_not_in = 0 - for name, item in run_test_server.fixture('collections').iteritems(): + for name, item in viewitems(run_test_server.fixture('collections')): if 'name' not in item: pass elif item['owner_uuid'] == public_project['uuid']: @@ -424,7 +429,7 @@ class FuseCreateFileTest(MountTestBase): self.assertEqual(["file1.txt"], d1) collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() - self.assertRegexpMatches(collection2["manifest_text"], + assertRegex(self, collection2["manifest_text"], r'\. d41d8cd98f00b204e9800998ecf8427e\+0\+A\S+ 0:0:file1\.txt$') @@ -466,7 +471,7 @@ class FuseWriteFileTest(MountTestBase): self.assertEqual(12, self.operations.read_counter.get()) collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() - self.assertRegexpMatches(collection2["manifest_text"], + assertRegex(self, collection2["manifest_text"], r'\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$') @@ -504,7 +509,7 @@ class FuseUpdateFileTest(MountTestBase): self.pool.apply(fuseUpdateFileTestHelper, (self.mounttmp,)) collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() - self.assertRegexpMatches(collection2["manifest_text"], + assertRegex(self, collection2["manifest_text"], r'\. daaef200ebb921e011e3ae922dd3266b\+11\+A\S+ 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:11:file1\.txt 22:1:file1\.txt$') @@ -544,7 +549,7 @@ class FuseMkdirTest(MountTestBase): self.pool.apply(fuseMkdirTestHelper, (self.mounttmp,)) collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() - self.assertRegexpMatches(collection2["manifest_text"], + assertRegex(self, collection2["manifest_text"], r'\./testdir 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$') @@ -611,13 +616,13 @@ class FuseRmTest(MountTestBase): # Starting manifest collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() - self.assertRegexpMatches(collection2["manifest_text"], + assertRegex(self, collection2["manifest_text"], 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.assertRegexpMatches(collection2["manifest_text"], + assertRegex(self, collection2["manifest_text"], r'./testdir d41d8cd98f00b204e9800998ecf8427e\+0\+A\S+ 0:0:\\056\n') self.pool.apply(fuseRmTestHelperRmdir, (self.mounttmp,)) @@ -668,13 +673,13 @@ class FuseMvFileTest(MountTestBase): # Starting manifest collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() - self.assertRegexpMatches(collection2["manifest_text"], + assertRegex(self, collection2["manifest_text"], r'\./testdir 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$') self.pool.apply(fuseMvFileTestHelperMoveFile, (self.mounttmp,)) collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() - self.assertRegexpMatches(collection2["manifest_text"], + assertRegex(self, collection2["manifest_text"], r'\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt\n\./testdir d41d8cd98f00b204e9800998ecf8427e\+0\+A\S+ 0:0:\\056\n') @@ -702,7 +707,7 @@ class FuseRenameTest(MountTestBase): # Starting manifest collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() - self.assertRegexpMatches(collection2["manifest_text"], + assertRegex(self, collection2["manifest_text"], r'\./testdir 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$') d1 = llfuse.listdir(os.path.join(self.mounttmp)) @@ -718,7 +723,7 @@ class FuseRenameTest(MountTestBase): self.assertEqual(["file1.txt"], d1) collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() - self.assertRegexpMatches(collection2["manifest_text"], + assertRegex(self, collection2["manifest_text"], r'\./testdir2 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$') @@ -784,7 +789,7 @@ def fuseFileConflictTestHelper(mounttmp): with open(os.path.join(mounttmp, "file1.txt"), "r") as f: self.assertEqual(f.read(), "bar") - self.assertRegexpMatches(d1[1], + assertRegex(self, d1[1], r'file1\.txt~\d\d\d\d\d\d\d\d-\d\d\d\d\d\d~conflict~') with open(os.path.join(mounttmp, d1[1]), "r") as f: @@ -893,7 +898,7 @@ class FuseMvFileBetweenCollectionsTest(MountTestBase): collection1.update() collection2.update() - self.assertRegexpMatches(collection1.manifest_text(), r"\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$") + assertRegex(self, collection1.manifest_text(), r"\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$") self.assertEqual(collection2.manifest_text(), "") self.pool.apply(fuseMvFileBetweenCollectionsTest2, (self.mounttmp, @@ -904,7 +909,7 @@ class FuseMvFileBetweenCollectionsTest(MountTestBase): collection2.update() self.assertEqual(collection1.manifest_text(), "") - self.assertRegexpMatches(collection2.manifest_text(), r"\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file2\.txt$") + assertRegex(self, collection2.manifest_text(), r"\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file2\.txt$") collection1.stop_threads() collection2.stop_threads() @@ -964,7 +969,7 @@ class FuseMvDirBetweenCollectionsTest(MountTestBase): collection1.update() collection2.update() - self.assertRegexpMatches(collection1.manifest_text(), r"\./testdir 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$") + assertRegex(self, collection1.manifest_text(), r"\./testdir 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$") self.assertEqual(collection2.manifest_text(), "") self.pool.apply(fuseMvDirBetweenCollectionsTest2, (self.mounttmp, @@ -975,7 +980,7 @@ class FuseMvDirBetweenCollectionsTest(MountTestBase): collection2.update() self.assertEqual(collection1.manifest_text(), "") - self.assertRegexpMatches(collection2.manifest_text(), r"\./testdir2 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$") + assertRegex(self, collection2.manifest_text(), r"\./testdir2 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$") collection1.stop_threads() collection2.stop_threads() @@ -1081,15 +1086,16 @@ class MagicDirApiError(FuseMagicTest): api.keep.get.side_effect = Exception('Keep fail') def runTest(self): - self.make_mount(fuse.MagicDirectory) + with mock.patch('arvados_fuse.fresh.FreshBase._poll_time', new_callable=mock.PropertyMock, return_value=60) as mock_poll_time: + self.make_mount(fuse.MagicDirectory) - self.operations.inodes.inode_cache.cap = 1 - self.operations.inodes.inode_cache.min_entries = 2 + 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)) + with self.assertRaises(OSError): + llfuse.listdir(os.path.join(self.mounttmp, self.testcollection)) - llfuse.listdir(os.path.join(self.mounttmp, self.testcollection)) + llfuse.listdir(os.path.join(self.mounttmp, self.testcollection)) class FuseUnitTest(unittest.TestCase): @@ -1164,9 +1170,9 @@ class FuseMagicTestPDHOnly(MountTestBase): 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()) + for k, v in viewitems(files): + with open(os.path.join(self.mounttmp, k), 'rb') as f: + self.assertEqual(v, f.read().decode()) # look up using uuid should fail when pdh_only is set if pdh_only is True: