tests: fixes

Author: gsmolk

tests/external.py

@@ -866,7 +866,7 @@ def test_external_merge_skip_external_dirs(self):
 
     # @unittest.expectedFailure
     # @unittest.skip("skip")
-    def test_external_merge_single(self):
+    def test_external_merge_1(self):
         """"""
         fname = self.id().split('.')[3]
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
@@ -1012,7 +1012,9 @@ def test_external_merge_3(self):
         pgdata = self.pgdata_content(
             node.base_dir, exclude_dirs=['logs'])
 
-        self.merge_backup(backup_dir, 'node', backup_id=backup_id)
+        self.merge_backup(
+            backup_dir, 'node', backup_id=backup_id,
+            options=['--log-level-file=verbose'])
 
         # RESTORE
         node.cleanup()
@@ -1040,7 +1042,7 @@ def test_external_merge_3(self):
 
     # @unittest.expectedFailure
     # @unittest.skip("skip")
-    def test_external_merge_double(self):
+    def test_external_merge_2(self):
         """"""
         fname = self.id().split('.')[3]
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
@@ -1446,7 +1448,6 @@ def test_merge_external_changed_data(self):
         # Clean after yourself
         self.del_test_dir(module_name, fname)
 
-
     # @unittest.expectedFailure
     # @unittest.skip("skip")
     def test_restore_skip_external(self):

tests/merge.py

@@ -1721,7 +1721,7 @@ def test_failed_merge_after_delete(self):
 
         # backup half-merged
         self.assertEqual(
-            'OK', self.show_pb(backup_dir, 'node')[0]['status'])
+            'MERGING', self.show_pb(backup_dir, 'node')[0]['status'])
 
         self.assertEqual(
             full_id, self.show_pb(backup_dir, 'node')[0]['id'])
@@ -1753,23 +1753,31 @@ def test_failed_merge_after_delete_1(self):
         self.set_archiving(backup_dir, 'node', node)
         node.slow_start()
 
-        # add database
-        node.pgbench_init(scale=1)
-
         # take FULL backup
         full_id = self.backup_node(
             backup_dir, 'node', node, options=['--stream'])
 
+        node.pgbench_init(scale=1)
+
+        page_1 = self.backup_node(
+            backup_dir, 'node', node, backup_type='page')
+
+        # Change FULL B backup status to ERROR
+        self.change_backup_status(backup_dir, 'node', page_1, 'ERROR')
+
         pgdata = self.pgdata_content(node.data_dir)
 
-        # drop database
+        # add data
         pgbench = node.pgbench(options=['-T', '10', '-c', '2', '--no-vacuum'])
         pgbench.wait()
 
         # take PAGE backup
         page_id = self.backup_node(
             backup_dir, 'node', node, backup_type='page')
 
+        # Change FULL B backup status to ERROR
+        self.change_backup_status(backup_dir, 'node', page_1, 'OK')
+
         gdb = self.merge_backup(
             backup_dir, 'node', page_id,
             gdb=True, options=['--log-level-console=verbose'])
@@ -1827,7 +1835,8 @@ def test_merge_backup_from_future(self):
         node.pgbench_init(scale=3)
 
         # Take PAGE from future
-        backup_id = self.backup_node(backup_dir, 'node', node, backup_type='page')
+        backup_id = self.backup_node(
+            backup_dir, 'node', node, backup_type='page')
 
         with open(
                 os.path.join(