fix flake8 problems

vshepard · vshepard · commit 48f989247e4a · 2023-11-09T21:31:46.000+01:00
diff --git a/testgres/plugins/probackup/app.py b/testgres/plugins/probackup/app.py
@@ -132,14 +132,12 @@ def run(self, command, gdb=False, old_binary=False, return_id=True, env=None,
     def init(self, options=None, old_binary=False, skip_log_directory=False, expect_error=False, use_backup_dir=True):
         if options is None:
             options = []
-        return self.run([
-                     'init',
-                 ] + options,
-                 old_binary=old_binary,
-                 skip_log_directory=skip_log_directory,
-                 expect_error=expect_error,
-                 use_backup_dir=use_backup_dir
-                 )
+        return self.run(['init', ] + options,
+                        old_binary=old_binary,
+                        skip_log_directory=skip_log_directory,
+                        expect_error=expect_error,
+                        use_backup_dir=use_backup_dir
+                        )
 
     def add_instance(self, instance, node, old_binary=False, options=None, expect_error=False):
         if options is None:
@@ -535,7 +533,6 @@ def show_archive(
                         break
 
                 if tli > 0:
-                    timeline_data = None
                     for timeline in instance_timelines:
                         if timeline['tli'] == tli:
                             return timeline
@@ -664,7 +661,7 @@ def set_archiving(
                 archive_command += ' --remote-proto=ssh --remote-host=localhost'
 
             if init_params.archive_compress and compress:
-                archive_command += ' --compress-algorithm='+init_params.archive_compress
+                archive_command += ' --compress-algorithm=' + init_params.archive_compress
 
             if overwrite:
                 archive_command += ' --overwrite'
diff --git a/testgres/plugins/probackup/gdb.py b/testgres/plugins/probackup/gdb.py
@@ -191,10 +191,7 @@ def continue_execution_until_exit(self):
                 continue
             if line.startswith('*stopped,reason="breakpoint-hit"'):
                 continue
-            if (
-                    line.startswith('*stopped,reason="exited') or
-                    line == '*stopped\n'
-            ):
+            if line.startswith('*stopped,reason="exited') or line == '*stopped\n':
                 self.quit()
                 return
 
diff --git a/testgres/plugins/probackup/init_helpers.py b/testgres/plugins/probackup/init_helpers.py
@@ -8,14 +8,16 @@
 import testgres
 
 try:
-    import lz4.frame
+    import lz4.frame  # noqa: F401
+
     HAVE_LZ4 = True
 except ImportError as e:
     HAVE_LZ4 = False
     LZ4_error = e
 
 try:
-    import zstd
+    import zstd  # noqa: F401
+
     HAVE_ZSTD = True
 except ImportError as e:
     HAVE_ZSTD = False
@@ -28,8 +30,8 @@
         cache_initdb=False,
         cached_initdb_dir=False,
         node_cleanup_full=delete_logs)
-except:
-    pass
+except Exception as e:
+    print("Can't configure testgres: {0}".format(e))
 
 
 class Init(object):
@@ -46,7 +48,7 @@ def __init__(self):
         version = self._pg_config['VERSION'].rstrip('develalphabetapre')
         parts = [*version.split(' ')[1].split('.'), '0', '0'][:3]
         parts[0] = re.match(r'\d+', parts[0]).group()
-        self.pg_config_version = reduce(lambda v, x: v*100+int(x), parts, 0)
+        self.pg_config_version = reduce(lambda v, x: v * 100 + int(x), parts, 0)
 
         test_env = os.environ.copy()
         envs_list = [
@@ -133,10 +135,7 @@ def __init__(self):
 
         self.probackup_old_path = None
         if 'PGPROBACKUPBIN_OLD' in test_env:
-            if (
-                    os.path.isfile(test_env['PGPROBACKUPBIN_OLD']) and
-                    os.access(test_env['PGPROBACKUPBIN_OLD'], os.X_OK)
-            ):
+            if (os.path.isfile(test_env['PGPROBACKUPBIN_OLD']) and os.access(test_env['PGPROBACKUPBIN_OLD'], os.X_OK)):
                 self.probackup_old_path = test_env['PGPROBACKUPBIN_OLD']
             else:
                 if self.verbose:
@@ -166,8 +165,7 @@ def __init__(self):
                                                    ).group(0)
 
         self.remote = test_env.get('PGPROBACKUP_SSH_REMOTE', None) == 'ON'
-        self.ptrack = test_env.get('PG_PROBACKUP_PTRACK', None) == 'ON' and \
-                        self.pg_config_version >= 110000
+        self.ptrack = test_env.get('PG_PROBACKUP_PTRACK', None) == 'ON' and self.pg_config_version >= 110000
 
         self.paranoia = test_env.get('PG_PROBACKUP_PARANOIA', None) == 'ON'
         env_compress = test_env.get('ARCHIVE_COMPRESSION', None)
@@ -200,4 +198,5 @@ def __init__(self):
     def test_env(self):
         return self._test_env.copy()
 
+
 init_params = Init()
