55from .helpers .ptrack_helpers import ProbackupTest ,ProbackupException
66import shutil
77from datetime import datetime ,timedelta
8+ import time
89
910module_name = "merge"
1011
@@ -1704,6 +1705,9 @@ def test_failed_merge_after_delete(self):
17041705page_id = self .backup_node (
17051706backup_dir ,'node' ,node ,backup_type = 'page' )
17061707
1708+ page_id_2 = self .backup_node (
1709+ backup_dir ,'node' ,node ,backup_type = 'page' )
1710+
17071711gdb = self .merge_backup (
17081712backup_dir ,'node' ,page_id ,
17091713gdb = True ,options = ['--log-level-console=verbose' ])
@@ -1730,10 +1734,14 @@ def test_failed_merge_after_delete(self):
17301734backup_dir ,'backups' ,'node' ,
17311735full_id ,'database' ,'base' ,dboid )
17321736
1733- self .assertFalse (
1734- os .path .isdir (db_path ),
1735- 'Directory {0} should not exist' .format (
1736- db_path ,full_id ))
1737+ self .merge_backup (
1738+ backup_dir ,'node' ,page_id_2 ,
1739+ options = ['--log-level-console=verbose' ])
1740+
1741+ #self.assertFalse(
1742+ # os.path.isdir(db_path),
1743+ # 'Directory {0} should not exist'.format(
1744+ # db_path, full_id))
17371745
17381746self .del_test_dir (module_name ,fname )
17391747
@@ -1795,7 +1803,7 @@ def test_failed_merge_after_delete_1(self):
17951803
17961804# backup half-merged
17971805self .assertEqual (
1798- 'OK ' ,self .show_pb (backup_dir ,'node' )[0 ]['status' ])
1806+ 'MERGING ' ,self .show_pb (backup_dir ,'node' )[0 ]['status' ])
17991807
18001808self .assertEqual (
18011809full_id ,self .show_pb (backup_dir ,'node' )[0 ]['id' ])