@@ -1707,14 +1707,15 @@ def test_failed_merge_after_delete(self):
17071707gdb = self .merge_backup (
17081708backup_dir ,'node' ,page_id ,
17091709gdb = True ,options = ['--log-level-console=verbose' ])
1710+
17101711gdb .set_breakpoint ('delete_backup_files' )
17111712gdb .run_until_break ()
17121713
17131714gdb .set_breakpoint ('parray_bsearch' )
17141715gdb .continue_execution_until_break ()
17151716
17161717gdb .set_breakpoint ('pgFileDelete' )
1717- gdb .continue_execution_until_break (30 )
1718+ gdb .continue_execution_until_break (20 )
17181719
17191720gdb ._execute ('signal SIGKILL' )
17201721
@@ -1729,23 +1730,10 @@ def test_failed_merge_after_delete(self):
17291730backup_dir ,'backups' ,'node' ,
17301731full_id ,'database' ,'base' ,dboid )
17311732
1732- self .assertNotTrue (
1733- os .path .isdir (db_path ))
1734-
1735- exit (1 )
1736-
1737- # try to continue failed MERGE
1738- self .merge_backup (backup_dir ,"node" ,backup_id )
1739-
1740- self .assertEqual (
1741- 'OK' ,self .show_pb (backup_dir ,'node' )[0 ]['status' ])
1742-
1743- node .cleanup ()
1744-
1745- self .restore_node (backup_dir ,'node' ,node )
1746-
1747- pgdata_restored = self .pgdata_content (node .data_dir )
1748- self .compare_pgdata (pgdata ,pgdata_restored )
1733+ self .assertFalse (
1734+ os .path .isdir (db_path ),
1735+ 'Directory {0} should not exists' .format (
1736+ db_path ,full_id ))
17491737
17501738self .del_test_dir (module_name ,fname )
17511739
@@ -1785,6 +1773,7 @@ def test_failed_merge_after_delete_1(self):
17851773gdb = self .merge_backup (
17861774backup_dir ,'node' ,page_id ,
17871775gdb = True ,options = ['--log-level-console=verbose' ])
1776+
17881777gdb .set_breakpoint ('delete_backup_files' )
17891778gdb .run_until_break ()
17901779