X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9aff8a3624b463d3fd4d9302c4d41c7558df4a13..e22d3dc998f55e3c21125b1a1be7240f89c23dd6:/services/fuse/tests/test_exec.py diff --git a/services/fuse/tests/test_exec.py b/services/fuse/tests/test_exec.py index ab6e13136b..192b1b5dcb 100644 --- a/services/fuse/tests/test_exec.py +++ b/services/fuse/tests/test_exec.py @@ -2,11 +2,13 @@ # # SPDX-License-Identifier: AGPL-3.0 +from __future__ import absolute_import +from six import assertRegex import arvados_fuse.command import json import multiprocessing import os -import run_test_server +from . import run_test_server import tempfile import unittest @@ -58,6 +60,8 @@ class ExecMode(unittest.TestCase): quote(os.path.join(self.mnt, 'zzz', 'foo.txt')), quote(os.path.join(self.mnt, 'zzz', '.arvados#collection')), quote(os.path.join(self.okfile)))])) - self.assertRegexpMatches( - json.load(open(self.okfile))['manifest_text'], - r' 0:3:foo.txt\n') + with open(self.okfile) as f: + assertRegex( + self, + json.load(f)['manifest_text'], + r' 0:3:foo.txt\n')