tests: fixes

Author: gsmolk

tests/archive.py

@@ -256,15 +256,16 @@ def test_pgpro434_3(self):
         with open(log_file, 'r') as f:
             log_content = f.read()
 
-        self.assertIn(
-            "ERROR: Switched WAL segment 000000010000000000000002 "
-            "could not be archived in 60 seconds",
-            log_content)
-
-        self.assertIn(
-            "ERROR: Switched WAL segment 000000010000000000000002 "
-            "could not be archived in 60 seconds",
-            log_content)
+        # in PG =< 9.6 pg_stop_backup always wait
+        if self.get_version(node) < 100000:
+            self.assertIn(
+                "ERROR: pg_stop_backup doesn't answer in 60 seconds, cancel it",
+                log_content)
+        else:
+            self.assertIn(
+                "ERROR: Switched WAL segment 000000010000000000000002 "
+                "could not be archived in 60 seconds",
+                log_content)
 
         log_file = os.path.join(node.logs_dir, 'postgresql.log')
         with open(log_file, 'r') as f:

tests/merge.py

@@ -1540,8 +1540,8 @@ def test_crash_after_opening_backup_control_2(self):
         gdb.set_breakpoint('write_backup_filelist')
         gdb.run_until_break()
 
-        gdb.set_breakpoint('print_file_list')
-        gdb.continue_execution_until_break()
+        gdb.set_breakpoint('fio_fwrite')
+        gdb.continue_execution_until_break(2)
 
         gdb._execute('signal SIGKILL')
 
@@ -1631,9 +1631,11 @@ def test_losing_file_after_failed_merge(self):
         gdb.set_breakpoint('write_backup_filelist')
         gdb.run_until_break()
 
-        gdb.set_breakpoint('print_file_list')
+        gdb.set_breakpoint('fio_fwrite')
         gdb.continue_execution_until_break()
 
+        gdb._execute('bt')
+
         gdb._execute('signal SIGKILL')
 
         print(self.show_pb(