tests: minor fixes

Author: gsmolk

tests/__init__.py

@@ -16,6 +16,10 @@ def load_tests(loader, tests, pattern):
         if os.environ['PG_PROBACKUP_TEST_BASIC'] == 'ON':
             loader.testMethodPrefix = 'test_basic'
 
+    if 'PG_PROBACKUP_PTRACK' in os.environ:
+        if os.environ['PG_PROBACKUP_PTRACK'] == 'ON':
+            suite.addTests(loader.loadTestsFromModule(ptrack))
+
 #    suite.addTests(loader.loadTestsFromModule(auth_test))
     suite.addTests(loader.loadTestsFromModule(archive))
     suite.addTests(loader.loadTestsFromModule(backup))
@@ -49,10 +53,6 @@ def load_tests(loader, tests, pattern):
     suite.addTests(loader.loadTestsFromModule(time_stamp))
     suite.addTests(loader.loadTestsFromModule(validate))
 
-    if 'PG_PROBACKUP_PTRACK' in os.environ:
-        if os.environ['PG_PROBACKUP_PTRACK'] == 'ON':
-            suite.addTests(loader.loadTestsFromModule(ptrack))
-
     return suite
 
 #   test_pgpro434_2 unexpected success

tests/merge.py

@@ -1632,9 +1632,7 @@ def test_losing_file_after_failed_merge(self):
         gdb.run_until_break()
 
         gdb.set_breakpoint('fio_fwrite')
-        gdb.continue_execution_until_break()
-
-        gdb._execute('bt')
+        gdb.continue_execution_until_break(2)
 
         gdb._execute('signal SIGKILL')