tests: fix gdbobject method continue_execution_until_break()

gsmolk · gsmolk · commit 2466e5187150 · 2019-03-02T02:29:58.000+03:00
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -2,7 +2,7 @@
 
 from . import init_test, merge, option_test, show_test, compatibility, \
     backup_test, delete_test, delta, restore_test, validate_test, \
-    retention_test, pgpro560, pgpro589, false_positive, replica, \
+    retention_test, pgpro560, pgpro589, pgpro2068, false_positive, replica, \
     compression, page, ptrack, archive, exclude, cfs_backup, cfs_restore, \
     cfs_validate_backup, auth_test, time_stamp, snapfs, logging, \
     locking, remote
@@ -47,18 +47,8 @@ def load_tests(loader, tests, pattern):
 # ToDo:
 #  archive:
 #    discrepancy of instance`s SYSTEMID and node`s SYSTEMID should lead to archive-push refusal to work
-#  replica:
-#    backup should exit with correct error message if some master* option is missing
-#    --master* options shoukd not work when backuping master
 #  logging:
 #     https://jira.postgrespro.ru/browse/PGPRO-584
 #     https://jira.postgrespro.ru/secure/attachment/20420/20420_doc_logging.md
 # archive:
 #      immediate recovery and full recovery
-# backward compatibility:
-#      previous version catalog must be readable by newer version
-#      incremental chain from previous version can be continued
-#      backups from previous version can be restored
-# 10vanilla_1.3ptrack +
-# 10vanilla+
-# 9.6vanilla_1.3ptrack +
diff --git a/tests/delta.py b/tests/delta.py
@@ -562,9 +562,7 @@ def test_delta_vacuum_full(self):
         acurs.execute("VACUUM FULL t_heap")
 
         if gdb.stopped_in_breakpoint():
-            if gdb.continue_execution_until_break(20) != 'breakpoint-hit':
-                print('Failed to hit breakpoint')
-                exit(1)
+            gdb.continue_execution_until_break(20)
 
         self.backup_node(
             backup_dir, 'node', node,
diff --git a/tests/helpers/ptrack_helpers.py b/tests/helpers/ptrack_helpers.py
@@ -1412,17 +1412,14 @@ def continue_execution_until_break(self, ignore_count=0):
         else:
             result = self._execute('continue', False)
 
-        running = False
         for line in result:
-            if line.startswith('*running'):
-                running = True
             if line.startswith('*stopped,reason="breakpoint-hit"'):
-                return 'breakpoint-hit'
+                return
             if line.startswith('*stopped,reason="exited-normally"'):
-                return 'exited-normally'
+                break
 
-        if running:
-            return 'running'
+        raise GdbException(
+            'Failed to continue execution until break.\n')
 
     def stopped_in_breakpoint(self):
         output = []
diff --git a/tests/locking.py b/tests/locking.py
@@ -37,8 +37,7 @@ def test_locking_running_validate_1(self):
         gdb.set_breakpoint('copy_file')
         gdb.run_until_break()
 
-        if gdb.continue_execution_until_break(20) != 'breakpoint-hit':
-            self.AssertTrue(False, 'Failed to hit breakpoint')
+        gdb.continue_execution_until_break(20)
 
         self.assertEqual(
             'OK', self.show_pb(backup_dir, 'node')[0]['status'])
@@ -93,8 +92,7 @@ def test_locking_running_validate_2(self):
         gdb.set_breakpoint('copy_file')
         gdb.run_until_break()
 
-        if gdb.continue_execution_until_break(20) != 'breakpoint-hit':
-            self.AssertTrue(False, 'Failed to hit breakpoint')
+        gdb.continue_execution_until_break(20)
 
         gdb._execute('signal SIGKILL')
         gdb.continue_execution_until_error()
@@ -164,8 +162,7 @@ def test_locking_running_validate_2_specific_id(self):
         gdb.set_breakpoint('copy_file')
         gdb.run_until_break()
 
-        if gdb.continue_execution_until_break(20) != 'breakpoint-hit':
-            self.AssertTrue(False, 'Failed to hit breakpoint')
+        gdb.continue_execution_until_break(20)
 
         gdb._execute('signal SIGKILL')
         gdb.continue_execution_until_error()
@@ -263,8 +260,7 @@ def test_locking_running_3(self):
         gdb.set_breakpoint('copy_file')
         gdb.run_until_break()
 
-        if gdb.continue_execution_until_break(20) != 'breakpoint-hit':
-            self.AssertTrue(False, 'Failed to hit breakpoint')
+        gdb.continue_execution_until_break(20)
 
         gdb._execute('signal SIGKILL')
         gdb.continue_execution_until_error()
diff --git a/tests/merge.py b/tests/merge.py
@@ -1071,9 +1071,7 @@ def test_continue_failed_merge(self):
         gdb.set_breakpoint('copy_file')
         gdb.run_until_break()
 
-        if gdb.continue_execution_until_break(20) != 'breakpoint-hit':
-            print('Failed to hit breakpoint')
-            exit(1)
+        gdb.continue_execution_until_break(20)
 
         gdb._execute('signal SIGKILL')
 
@@ -1154,9 +1152,7 @@ def test_continue_failed_merge_with_corrupted_delta_backup(self):
         gdb.set_breakpoint('copy_file')
         gdb.run_until_break()
 
-        if gdb.continue_execution_until_break(2) != 'breakpoint-hit':
-            print('Failed to hit breakpoint')
-            exit(1)
+        gdb.continue_execution_until_break(2)
 
         gdb._execute('signal SIGKILL')
 
@@ -1252,9 +1248,7 @@ def test_continue_failed_merge_2(self):
         gdb.set_breakpoint('pgFileDelete')
         gdb.run_until_break()
 
-        if gdb.continue_execution_until_break(20) != 'breakpoint-hit':
-            print('Failed to hit breakpoint')
-            exit(1)
+        gdb.continue_execution_until_break(20)
 
         gdb._execute('signal SIGKILL')
 
diff --git a/tests/ptrack.py b/tests/ptrack.py
@@ -241,9 +241,7 @@ def test_ptrack_vacuum_full(self):
         acurs.execute("VACUUM FULL t_heap")
 
         if gdb.stopped_in_breakpoint():
-            if gdb.continue_execution_until_break(20) != 'breakpoint-hit':
-                print('Failed to hit breakpoint')
-                exit(1)
+            gdb.continue_execution_until_break(20)
 
         self.backup_node(
             backup_dir, 'node', node, backup_type='ptrack')
