testgres-pg-probackup2 0.9.1__tar.gz → 0.9.2__tar.gz

{testgres_pg_probackup2-0.9.1 → testgres_pg_probackup2-0.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testgres_pg_probackup2
-Version: 0.9.1
+Version: 0.9.2
 Summary: Plugin for testgres that manages pg_probackup2
 Home-page: https://github.com/postgrespro/testgres
 Author: Postgres Professional

{testgres_pg_probackup2-0.9.1 → testgres_pg_probackup2-0.9.2}/pg_probackup2/app.py

@@ -126,7 +126,7 @@ class ProbackupApp:
         if self.verbose:
             print(self.test_class.cmd)
 
-        cmdline = self._form_cmdline(binary_path, command)
+        cmdline = self._form_cmdline(binary_path, command, use_valgrind=gdb is False)
 
         if gdb is True:
             # general test flow for using GDBObj
@@ -168,35 +168,37 @@ class ProbackupApp:
 
         return command, strcommand
 
-    def _form_cmdline(self, binary_path, command):
+    def _form_cmdline(self, binary_path, command, use_valgrind=True):
         cmdline = [binary_path, *command]
 
-        if (self.valgrind == 'y' or self.valgrind_sup_path) and command[0] != "--version":
-            os.makedirs(self.pb_log_path, exist_ok=True)
-            valgrind_cmd = [
-                "valgrind",
-                "--gen-suppressions=all",
-                "--leak-check=full",
-                "--show-reachable=yes",
-                "--error-limit=no",
-                "--show-leak-kinds=all",
-                "--errors-for-leak-kinds=all",
-                "--error-exitcode=0",
-                f"--log-file={os.path.join(self.pb_log_path, f'valgrind-{command[0]}-%p.log')}"
-            ]
-            if self.valgrind_sup_path:
-                if os.path.isfile(self.valgrind_sup_path):
-                    valgrind_cmd += [f"--suppressions={self.valgrind_sup_path}"]
-                else:
-                    raise FileNotFoundError(f"PG_PROBACKUP_VALGRIND_SUP must be the path to a valgrind suppression file, "
-                                            f"but found: {self.valgrind_sup_path}")
+        if not use_valgrind or command[0] == "--version":
+            return cmdline
+        if self.valgrind != 'y' and not self.valgrind_sup_path:
+            return cmdline
+
+        os.makedirs(self.pb_log_path, exist_ok=True)
+        valgrind_cmd = [
+            "valgrind",
+            "--gen-suppressions=all",
+            "--leak-check=full",
+            "--show-reachable=yes",
+            "--error-limit=no",
+            "--show-leak-kinds=all",
+            "--errors-for-leak-kinds=all",
+            "--error-exitcode=0",
+            f"--log-file={os.path.join(self.pb_log_path, f'valgrind-{command[0]}-%p.log')}"
+        ]
+        if self.valgrind_sup_path:
+            if os.path.isfile(self.valgrind_sup_path):
+                valgrind_cmd += [f"--suppressions={self.valgrind_sup_path}"]
             else:
-                # Assume the tests are started from the root of pg_probackup repository
-                valgrind_cmd += [f"--suppressions=.valgrind.supp"]
-
-            cmdline = valgrind_cmd + cmdline
+                raise FileNotFoundError(f"PG_PROBACKUP_VALGRIND_SUP must be the path to a valgrind suppression file, "
+                                        f"but found: {self.valgrind_sup_path}")
+        else:
+            # Assume the tests are started from the root of pg_probackup repository
+            valgrind_cmd += [f"--suppressions=.valgrind.supp"]
 
-        return cmdline
+        return valgrind_cmd + cmdline
 
     def _execute_command(self, cmdline, env, command, gdb, expect_error, return_id, daemonize):
         try:

{testgres_pg_probackup2-0.9.1 → testgres_pg_probackup2-0.9.2}/pg_probackup2/gdb.py

@@ -134,6 +134,8 @@ class GDBobj:
         )
 
     def remove_all_breakpoints(self):
+        if self._did_quit:
+            return
         if not self.has_breakpoint:
             return
 
@@ -149,6 +151,8 @@ class GDBobj:
         )
 
     def run_until_break(self):
+        if self._did_quit:
+            return
         result = self._execute('run', False)
         for line in result:
             if line.startswith('*stopped,reason="breakpoint-hit"'):
@@ -158,6 +162,8 @@ class GDBobj:
         )
 
     def continue_execution_until_running(self):
+        if self._did_quit:
+            return
         result = self._execute('continue')
 
         for line in result:
@@ -175,9 +181,23 @@ class GDBobj:
     def signal(self, sig):
         if 'KILL' in sig:
             self.remove_all_breakpoints()
+            # Avoid GDB 15.x SIGABRT: kill inferior directly, not via `signal`.
+            try:
+                pids = subprocess.check_output(
+                    ['pgrep', '-P', str(self.gdb_pid)],
+                    text=True
+                ).strip().split()
+                for pid in pids:
+                    os.kill(int(pid), 9)
+            except (subprocess.CalledProcessError, ValueError, OSError):
+                pass
+            self.kill()
+            return
         self._execute(f'signal {sig}')
 
     def continue_execution_until_exit(self):
+        if self._did_quit:
+            return
         self.remove_all_breakpoints()
         result = self._execute('continue', False)
 
@@ -195,6 +215,8 @@ class GDBobj:
         )
 
     def continue_execution_until_error(self):
+        if self._did_quit:
+            return
         self.remove_all_breakpoints()
         result = self._execute('continue', False)
 
@@ -211,6 +233,8 @@ class GDBobj:
             'Failed to continue execution until error.\n')
 
     def continue_execution_until_break(self, ignore_count=0):
+        if self._did_quit:
+            return
         if ignore_count > 0:
             result = self._execute(
                 'continue ' + str(ignore_count),
@@ -253,6 +277,8 @@ class GDBobj:
 
     # use for breakpoint, run, continue
     def _execute(self, cmd, running=True):
+        if self._did_quit:
+            return []
         output = []
         self.proc.stdin.flush()
         self.proc.stdin.write(cmd + '\n')
@@ -320,9 +346,9 @@ def needs_gdb(func):
     check = _check_gdb_flag_or_skip_test()
     if not check:
         @functools.wraps(func)
-        def ok_wrapped(self):
+        def ok_wrapped(self, *args, **kwargs):
             self._gdb_decorated = True
-            func(self)
+            return func(self, *args, **kwargs)
 
         return ok_wrapped
     reason = check[1]
@@ -330,7 +356,7 @@ def needs_gdb(func):
         return unittest.skip(reason)(func)
     elif check[0] == "fail":
         @functools.wraps(func)
-        def fail_wrapper(self):
+        def fail_wrapper(self, *args, **kwargs):
             self.fail(reason)
 
         return fail_wrapper

{testgres_pg_probackup2-0.9.1 → testgres_pg_probackup2-0.9.2}/pg_probackup2/init_helpers.py

@@ -211,7 +211,7 @@ class Init(object):
                     self.probackup_path = probackup_path_tmp
 
         if not self.probackup_path:
-            raise Exception('pg_probackup binary is not found')
+            raise Exception('pg_probackup binary is not found, add it to PATH or point PGPROBACKUPBIN')
 
         if os_name == 'posix':
             self.EXTERNAL_DIRECTORY_DELIMITER = ':'

{testgres_pg_probackup2-0.9.1 → testgres_pg_probackup2-0.9.2}/setup.py

@@ -4,7 +4,7 @@ except ImportError:
     from distutils.core import setup
 
 setup(
-    version='0.9.1',
+    version='0.9.2',
     name='testgres_pg_probackup2',
     packages=['pg_probackup2', 'pg_probackup2.storage'],
     description='Plugin for testgres that manages pg_probackup2',

{testgres_pg_probackup2-0.9.1 → testgres_pg_probackup2-0.9.2}/testgres_pg_probackup2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testgres_pg_probackup2
-Version: 0.9.1
+Version: 0.9.2
 Summary: Plugin for testgres that manages pg_probackup2
 Home-page: https://github.com/postgrespro/testgres
 Author: Postgres Professional