@@ -631,8 +631,7 @@ def test_backward_compatibility_merge_1(self):
631631node .pgbench_init (scale = 20 )
632632
633633# FULL backup with OLD binary
634- self .backup_node (
635- backup_dir ,'node' ,node ,old_binary = True )
634+ self .backup_node (backup_dir ,'node' ,node ,old_binary = True )
636635
637636pgbench = node .pgbench (
638637stdout = subprocess .PIPE ,
@@ -643,8 +642,7 @@ def test_backward_compatibility_merge_1(self):
643642
644643# PAGE1 backup with OLD binary
645644self .backup_node (
646- backup_dir ,'node' ,node ,
647- backup_type = 'page' ,old_binary = True ,options = ['--log-level-file=LOG' ])
645+ backup_dir ,'node' ,node ,backup_type = 'page' ,old_binary = True )
648646
649647node .safe_psql (
650648'postgres' ,
@@ -655,20 +653,13 @@ def test_backward_compatibility_merge_1(self):
655653'VACUUM pgbench_accounts' )
656654
657655# PAGE2 backup with OLD binary
658- self .backup_node (
659- backup_dir ,'node' ,node ,
660- backup_type = 'page' ,old_binary = True ,options = ['--log-level-file=LOG' ])
661-
662- # PAGE3 backup with OLD binary
663656backup_id = self .backup_node (
664- backup_dir ,'node' ,node ,
665- backup_type = 'page' ,old_binary = True ,options = ['--log-level-file=LOG' ])
657+ backup_dir ,'node' ,node ,backup_type = 'page' ,old_binary = True )
666658
667659pgdata = self .pgdata_content (node .data_dir )
668660
669661# merge chain created by old binary with new binary
670- output = self .merge_backup (
671- backup_dir ,"node" ,backup_id ,options = ['--log-level-file=LOG' ])
662+ output = self .merge_backup (backup_dir ,"node" ,backup_id )
672663
673664# check that in-place is disabled
674665self .assertIn (
@@ -680,8 +671,7 @@ def test_backward_compatibility_merge_1(self):
680671base_dir = os .path .join (module_name ,fname ,'node_restored' ))
681672node_restored .cleanup ()
682673
683- self .restore_node (
684- backup_dir ,'node' ,node_restored ,options = ["-j" ,"4" ])
674+ self .restore_node (backup_dir ,'node' ,node_restored )
685675
686676pgdata_restored = self .pgdata_content (node_restored .data_dir )
687677self .compare_pgdata (pgdata ,pgdata_restored )