X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3a1fa40344388f851e28e2822780ae1a81a4ae44..873fcf181c037cc1e42419bfeaf5bb70c9d9e239:/services/fuse/tests/test_exec.py

diff --git a/services/fuse/tests/test_exec.py b/services/fuse/tests/test_exec.py
index 6af60302bc..c67cc55f34 100644
--- a/services/fuse/tests/test_exec.py
+++ b/services/fuse/tests/test_exec.py
@@ -2,23 +2,17 @@
 #
 # 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
-from . import run_test_server
+import shlex
 import tempfile
 import unittest
 
+from . import run_test_server
 from .integration_test import workerPool
 
-try:
-    from shlex import quote
-except:
-    from pipes import quote
-
 def try_exec(mnt, cmd):
     try:
         os.environ['KEEP_LOCAL_STORE'] = tempfile.mkdtemp()
@@ -56,13 +50,10 @@ class ExecMode(unittest.TestCase):
 
     def test_exec(self):
         workerPool().apply(try_exec, (self.mnt, [
-            'sh', '-c',
-            'echo -n foo >{}; cp {} {}'.format(
-                quote(os.path.join(self.mnt, 'zzz', 'foo.txt')),
-                quote(os.path.join(self.mnt, 'zzz', '.arvados#collection')),
-                quote(os.path.join(self.okfile)))]))
+            'sh', '-c', 'echo -n foo >{}; cp {} {}'.format(
+                shlex.quote(os.path.join(self.mnt, 'zzz', 'foo.txt')),
+                shlex.quote(os.path.join(self.mnt, 'zzz', '.arvados#collection')),
+                shlex.quote(os.path.join(self.okfile)),
+            )]))
         with open(self.okfile) as f:
-            assertRegex(
-                self,
-                json.load(f)['manifest_text'],
-                r' 0:3:foo.txt\n')
+            self.assertRegex(json.load(f)['manifest_text'], r' 0:3:foo.txt\n')