Merge branch '21815-trigrams-exclude-ids'

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

diff --git a/services/fuse/tests/test_command_args.py b/services/fuse/tests/test_command_args.py
index b08ab19335758be4c7ee4f72b91b4f3e26d04cea..51769af8f850aadf0c722a7d199d22c06fe98788 100644 (file)
--- a/services/fuse/tests/test_command_args.py
+++ b/services/fuse/tests/test_command_args.py
@@ -2,9 +2,6 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
 #
 # SPDX-License-Identifier: AGPL-3.0
 

-from __future__ import absolute_import
-from __future__ import print_function
-from six import assertRegex

 import arvados
 import arvados_fuse
 import arvados_fuse.command
 import arvados
 import arvados_fuse
 import arvados_fuse.command


@@ -14,14 +11,16 @@ import io
 import json
 import llfuse
 import logging
 import json
 import llfuse
 import logging

-import mock

 import os
 import os

-from . import run_test_server

 import sys
 import tempfile
 import unittest
 import resource
 
 import sys
 import tempfile
 import unittest
 import resource
 

+from unittest import mock
+
+from . import run_test_server
+

 def noexit(func):
     """If argparse or arvados_fuse tries to exit, fail the test instead"""
     class SystemExitCaught(Exception):
 def noexit(func):
     """If argparse or arvados_fuse tries to exit, fail the test instead"""
     class SystemExitCaught(Exception):


@@ -84,13 +83,13 @@ class MountArgsTest(unittest.TestCase):
 
         e = self.check_ent_type(arvados_fuse.StringFile, 'README')
         readme = e.readfrom(0, -1).decode()
 
         e = self.check_ent_type(arvados_fuse.StringFile, 'README')
         readme = e.readfrom(0, -1).decode()

-        assertRegex(self, readme, r'active-user@arvados\.local')
-        assertRegex(self, readme, r'\n$')
+        self.assertRegex(readme, r'active-user@arvados\.local')
+        self.assertRegex(readme, r'\n$')

 
         e = self.check_ent_type(arvados_fuse.StringFile, 'by_id', 'README')
         txt = e.readfrom(0, -1).decode()
 
         e = self.check_ent_type(arvados_fuse.StringFile, 'by_id', 'README')
         txt = e.readfrom(0, -1).decode()

-        assertRegex(self, txt, r'portable data hash')
-        assertRegex(self, txt, r'\n$')
+        self.assertRegex(txt, r'portable data hash')
+        self.assertRegex(txt, r'\n$')

 
     @noexit
     def test_by_id(self):
 
     @noexit
     def test_by_id(self):


@@ -199,7 +198,7 @@ class MountArgsTest(unittest.TestCase):
 
         with self.assertRaises(SystemExit):
             args = arvados_fuse.command.ArgumentParser().parse_args(['--version'])
 
         with self.assertRaises(SystemExit):
             args = arvados_fuse.command.ArgumentParser().parse_args(['--version'])

-        assertRegex(self, sys.stdout.getvalue(), "[0-9]+\.[0-9]+\.[0-9]+")
+        self.assertRegex(sys.stdout.getvalue(), r'[0-9]+\.[0-9]+\.[0-9]+')

         sys.stderr.close()
         sys.stderr = origerr
         sys.stdout = origout
         sys.stderr.close()
         sys.stderr = origerr
         sys.stdout = origout