17417: Merge branch 'main' into 17417-add-arm64

[arvados.git] / services / fuse / tests / test_exec.py

diff --git a/services/fuse/tests/test_exec.py b/services/fuse/tests/test_exec.py
index 35196033130261bb07bf2b595e97aa7f5025097f..6af60302bc788c796b50d5b57e33ee2bf3274332 100644 (file)
--- a/services/fuse/tests/test_exec.py
+++ b/services/fuse/tests/test_exec.py
@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: AGPL-3.0
 
 from __future__ import absolute_import
+from six import assertRegex
 import arvados_fuse.command
 import json
 import multiprocessing
@@ -20,6 +21,7 @@ except:
 
 def try_exec(mnt, cmd):
     try:
+        os.environ['KEEP_LOCAL_STORE'] = tempfile.mkdtemp()
         arvados_fuse.command.Mount(
             arvados_fuse.command.ArgumentParser().parse_args([
                 '--read-write',
@@ -37,7 +39,7 @@ class ExecMode(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         run_test_server.run()
-        run_test_server.run_keep(enforce_permissions=True, num_servers=2)
+        run_test_server.run_keep(blob_signing=True, num_servers=2)
         run_test_server.authorize_with('active')
 
     @classmethod
@@ -60,6 +62,7 @@ class ExecMode(unittest.TestCase):
                 quote(os.path.join(self.mnt, 'zzz', '.arvados#collection')),
                 quote(os.path.join(self.okfile)))]))
         with open(self.okfile) as f:
-            self.assertRegexpMatches(
+            assertRegex(
+                self,
                 json.load(f)['manifest_text'],
                 r' 0:3:foo.txt\n')