X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8890d0fe46b0f0437aad15c9c2c7103ca8428ce1..8dedd02357a95a0ae2c7961c8f1d0896b6311b3b:/services/fuse/tests/test_tmp_collection.py diff --git a/services/fuse/tests/test_tmp_collection.py b/services/fuse/tests/test_tmp_collection.py index c59024267a..7ab6d52243 100644 --- a/services/fuse/tests/test_tmp_collection.py +++ b/services/fuse/tests/test_tmp_collection.py @@ -2,8 +2,6 @@ # # SPDX-License-Identifier: AGPL-3.0 -from builtins import range -from six import assertRegex import arvados import arvados_fuse import arvados_fuse.command @@ -18,7 +16,6 @@ from .mount_test_base import MountTestBase logger = logging.getLogger('arvados.arv-mount') - class TmpCollectionArgsTest(unittest.TestCase): def setUp(self): self.tmpdir = tempfile.mkdtemp() @@ -107,8 +104,7 @@ class TmpCollectionTest(IntegrationTest): def _test_tmp_onefile(self, tmpdir): with open(os.path.join(tmpdir, 'foo'), 'w') as f: f.write('foo') - assertRegex( - self, + self.assertRegex( current_manifest(tmpdir), r'^\. acbd18db4cc2f85cedef654fccc4a4d8\+3(\+\S+)? 0:3:foo\n$') @@ -137,7 +133,7 @@ class TmpCollectionTest(IntegrationTest): else: with open(path, 'w') as f: f.write(content) - assertRegex(self, current_manifest(tmpdir), expect) + self.assertRegex(current_manifest(tmpdir), expect) @IntegrationTest.mount(argv=mnt_args) def test_tmp_rewrite(self): @@ -150,4 +146,4 @@ class TmpCollectionTest(IntegrationTest): f.write("b2") with open(os.path.join(tmpdir, "b1"), 'w') as f: f.write("1b") - assertRegex(self, current_manifest(tmpdir), "^\. ed4f3f67c70b02b29c50ce1ea26666bd\+4(\+\S+)? 0:2:b1 2:2:b2\n$") + self.assertRegex(current_manifest(tmpdir), "^\. ed4f3f67c70b02b29c50ce1ea26666bd\+4(\+\S+)? 0:2:b1 2:2:b2\n$")