[PBCKP-220] removed inheritance GDBObj->ProbackupTest

Ivan Lazarev · Ivan Lazarev · commit 26939d67c444 · 2022-07-01T04:00:05.000+03:00
diff --git a/tests/helpers/ptrack_helpers.py b/tests/helpers/ptrack_helpers.py
@@ -810,8 +810,7 @@ def run_pb(self, command, asynchronous=False, gdb=False, old_binary=False, retur
             if self.verbose:
                 print(self.cmd)
             if gdb:
-                #TODO REVIEW XXX no self parameter
-                return GDBobj([binary_path] + command, self.verbose)
+                return GDBobj([binary_path] + command, self)
             if asynchronous:
                 return subprocess.Popen(
                     [binary_path] + command,
@@ -1862,8 +1861,7 @@ def compare_pgdata(self, original_pgdata, restored_pgdata, exclusion_dict = dict
         self.assertFalse(fail, error_message)
 
     def gdb_attach(self, pid):
-        #TODO REVIEW XXX no self parameter
-        return GDBobj([str(pid)], self.verbose, attach=True)
+        return GDBobj([str(pid)], self, attach=True)
 
     def _check_gdb_flag_or_skip_test(self):
         if not self.gdb:
@@ -1872,24 +1870,28 @@ def _check_gdb_flag_or_skip_test(self):
                 "optimizations for run this test"
             )
 
+
 class GdbException(Exception):
-    def __init__(self, message=False):
+    def __init__(self, message="False"):
         self.message = message
 
     def __str__(self):
         return '\n ERROR: {0}\n'.format(repr(self.message))
 
 
-class GDBobj(ProbackupTest):
-    def __init__(self, cmd, verbose, attach=False):
-        self.verbose = verbose
+#TODO REVIEW XXX no inheritance needed
+# class GDBobj(ProbackupTest):
+class GDBobj:
+    # TODO REVIEW XXX Type specification env:ProbackupTest is only for python3, is it ok?
+    def __init__(self, cmd, env: ProbackupTest, attach=False):
+        self.verbose = env.verbose
         self.output = ''
 
         # Check gdb flag is set up
-        # if not self.gdb:
-        #     raise GdbException("No `PGPROBACKUP_GDB=on` is set, "
-        #                        "test should call ProbackupTest::check_gdb_flag_or_skip_test() on its start "
-        #                        "and be skipped")
+        if not env.gdb:
+            raise GdbException("No `PGPROBACKUP_GDB=on` is set, "
+                               "test should call ProbackupTest::check_gdb_flag_or_skip_test() on its start "
+                               "and be skipped")
         # Check gdb presense
         try:
             gdb_version, _ = subprocess.Popen(
diff --git a/tests/replica.py b/tests/replica.py
@@ -719,7 +719,6 @@ def test_replica_stop_lsn_null_offset(self):
     def test_replica_stop_lsn_null_offset_next_record(self):
         """
         """
-        self._check_gdb_flag_or_skip_test()
 
         fname = self.id().split('.')[3]
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
@@ -743,7 +742,6 @@ def test_replica_stop_lsn_null_offset_next_record(self):
 
         # freeze bgwriter to get rid of RUNNING XACTS records
         bgwriter_pid = master.auxiliary_pids[ProcessType.BackgroundWriter][0]
-        gdb_checkpointer = self.gdb_attach(bgwriter_pid)
 
         self.backup_node(backup_dir, 'master', master)
 
@@ -1097,7 +1095,6 @@ def test_replica_toast(self):
     def test_start_stop_lsn_in_the_same_segno(self):
         """
         """
-        self._check_gdb_flag_or_skip_test()
 
         fname = self.id().split('.')[3]
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
@@ -1121,7 +1118,6 @@ def test_start_stop_lsn_in_the_same_segno(self):
 
         # freeze bgwriter to get rid of RUNNING XACTS records
         bgwriter_pid = master.auxiliary_pids[ProcessType.BackgroundWriter][0]
-        gdb_checkpointer = self.gdb_attach(bgwriter_pid)
 
         self.backup_node(backup_dir, 'master', master, options=['--stream'])
 
