Merge branch '16601-new-tutorial' refs #16601
[arvados.git] / services / fuse / tests / test_exec.py
index 2111d535143307eac2b77359c8fc9cc9ac1658f9..c90e7fd8df96967d009b981067cfbacfb9b2d0d3 100644 (file)
@@ -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
@@ -37,7 +38,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
@@ -59,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')