From 4e43345119df11e6c44bb409d643b52b486ffc8b Mon Sep 17 00:00:00 2001
From: Sourcery AI <>
Date: Tue, 25 Apr 2023 11:13:18 +0000
Subject: [PATCH] 'Refactored by Sourcery'

---
 test/conftest.py   | 28 ++++++++++++++++++----------
 test/test_sshfs.py | 22 +++++++++++++---------
 test/util.py       |  4 ++--
 3 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/test/conftest.py b/test/conftest.py
index 70cd0c62..359054dd 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -35,19 +35,27 @@ def check_test_output(capfd):
         if count == 0 or count - cnt > 0:
             stderr = cp.sub('', stderr, count=count - cnt)
 
-    patterns = [ r'\b{}\b'.format(x) for x in
-                 ('exception', 'error', 'warning', 'fatal', 'traceback',
-                    'fault', 'crash(?:ed)?', 'abort(?:ed)',
-                    'uninitiali[zs]ed') ]
+    patterns = [
+        f'\b{x}\b'
+        for x in (
+            'exception',
+            'error',
+            'warning',
+            'fatal',
+            'traceback',
+            'fault',
+            'crash(?:ed)?',
+            'abort(?:ed)',
+            'uninitiali[zs]ed',
+        )
+    ]
     patterns += ['^==[0-9]+== ']
     for pattern in patterns:
         cp = re.compile(pattern, re.IGNORECASE | re.MULTILINE)
-        hit = cp.search(stderr)
-        if hit:
-            raise AssertionError('Suspicious output to stderr (matched "%s")' % hit.group(0))
-        hit = cp.search(stdout)
-        if hit:
-            raise AssertionError('Suspicious output to stdout (matched "%s")' % hit.group(0))
+        if hit := cp.search(stderr):
+            raise AssertionError(f'Suspicious output to stderr (matched "{hit[0]}")')
+        if hit := cp.search(stdout):
+            raise AssertionError(f'Suspicious output to stdout (matched "{hit[0]}")')
 
 def register_output(self, pattern, count=1, flags=re.MULTILINE):
     '''Register *pattern* as false positive for output checking
diff --git a/test/test_sshfs.py b/test/test_sshfs.py
index 1724555d..b89a9c40 100755
--- a/test/test_sshfs.py
+++ b/test/test_sshfs.py
@@ -59,8 +59,12 @@ def test_sshfs(tmpdir, debug, cache_timeout, sync_rd, multiconn, capfd):
     mnt_dir = str(tmpdir.mkdir('mnt'))
     src_dir = str(tmpdir.mkdir('src'))
 
-    cmdline = base_cmdline + [ pjoin(basename, 'sshfs'),
-                               '-f', 'localhost:' + src_dir, mnt_dir ]
+    cmdline = base_cmdline + [
+        pjoin(basename, 'sshfs'),
+        '-f',
+        f'localhost:{src_dir}',
+        mnt_dir,
+    ]
     if debug:
         cmdline += [ '-o', 'sshfs_debug' ]
 
@@ -133,7 +137,7 @@ def os_create(name):
 
 def tst_unlink(src_dir, mnt_dir, cache_timeout):
     name = name_generator()
-    fullname = mnt_dir + "/" + name
+    fullname = f"{mnt_dir}/{name}"
     with open(pjoin(src_dir, name), 'wb') as fh:
         fh.write(b'hello')
     if cache_timeout:
@@ -148,7 +152,7 @@ def tst_unlink(src_dir, mnt_dir, cache_timeout):
 
 def tst_mkdir(mnt_dir):
     dirname = name_generator()
-    fullname = mnt_dir + "/" + dirname
+    fullname = f"{mnt_dir}/{dirname}"
     os.mkdir(fullname)
     fstat = os.stat(fullname)
     assert stat.S_ISDIR(fstat.st_mode)
@@ -158,7 +162,7 @@ def tst_mkdir(mnt_dir):
 
 def tst_rmdir(src_dir, mnt_dir, cache_timeout):
     name = name_generator()
-    fullname = mnt_dir + "/" + name
+    fullname = f"{mnt_dir}/{name}"
     os.mkdir(pjoin(src_dir, name))
     if cache_timeout:
         safe_sleep(cache_timeout+1)
@@ -172,7 +176,7 @@ def tst_rmdir(src_dir, mnt_dir, cache_timeout):
 
 def tst_symlink(mnt_dir):
     linkname = name_generator()
-    fullname = mnt_dir + "/" + linkname
+    fullname = f"{mnt_dir}/{linkname}"
     os.symlink("/imaginary/dest", fullname)
     fstat = os.lstat(fullname)
     assert stat.S_ISLNK(fstat.st_mode)
@@ -320,9 +324,9 @@ def tst_readdir(src_dir, mnt_dir):
     newdir = name_generator()
     src_newdir = pjoin(src_dir, newdir)
     mnt_newdir = pjoin(mnt_dir, newdir)
-    file_ = src_newdir + "/" + name_generator()
-    subdir = src_newdir + "/" + name_generator()
-    subfile = subdir + "/" + name_generator()
+    file_ = f"{src_newdir}/{name_generator()}"
+    subdir = f"{src_newdir}/{name_generator()}"
+    subfile = f"{subdir}/{name_generator()}"
 
     os.mkdir(src_newdir)
     shutil.copyfile(TEST_FILE, file_)
diff --git a/test/util.py b/test/util.py
index 261a1c68..d375a944 100644
--- a/test/util.py
+++ b/test/util.py
@@ -43,7 +43,7 @@ def umount(mount_process, mnt_dir):
         if code is not None:
             if code == 0:
                 return
-            pytest.fail('file system process terminated with code %s' % (code,))
+            pytest.fail(f'file system process terminated with code {code}')
         time.sleep(0.1)
         elapsed += 0.1
     pytest.fail('mount process did not terminate')
@@ -92,7 +92,7 @@ def fuse_test_marker():
     try:
         fd = os.open('/dev/fuse', os.O_RDWR)
     except OSError as exc:
-        return skip('Unable to open /dev/fuse: %s' % exc.strerror)
+        return skip(f'Unable to open /dev/fuse: {exc.strerror}')
     else:
         os.close(fd)