postgrespro
diff --git a/‎tests/merge.py
Lines changed: 79 additions & 7 deletions b/‎tests/merge.py
Lines changed: 79 additions & 7 deletions
@@ -163,9 +163,9 @@ def test_merge_compressed_backups(self):
         node.cleanup()
         self.del_test_dir(module_name, fname)
 
-    def test_merge_compressed_and_uncompressed_backups(self):
+    def test_merge_compressed_backups_1(self):
         """
-        Test MERGE command with compressed and uncompressed backups
+        Test MERGE command with compressed backups
         """
         fname = self.id().split(".")[3]
         backup_dir = os.path.join(self.tmp_path, module_name, fname, "backup")
@@ -203,16 +203,12 @@ def test_merge_compressed_and_uncompressed_backups(self):
         self.backup_node(
             backup_dir, "node", node, backup_type="delta",
             options=['--compress-algorithm=zlib', '--stream'])
-        show_backup = self.show_pb(backup_dir, "node")[1]
-
-        self.assertEqual(show_backup["status"], "OK")
-        self.assertEqual(show_backup["backup-mode"], "DELTA")
 
         # Change data
         pgbench = node.pgbench(options=['-T', '20', '-c', '2', '--no-vacuum'])
         pgbench.wait()
 
-        # Do not compressed PAGE backup
+        # Do compressed PAGE backup
         self.backup_node(
             backup_dir, "node", node, backup_type="page",
             options=['--compress-algorithm=zlib'])
@@ -244,6 +240,82 @@ def test_merge_compressed_and_uncompressed_backups(self):
         node.cleanup()
         self.del_test_dir(module_name, fname)
 
+    def test_merge_compressed_and_uncompressed_backups(self):
+        """
+        Test MERGE command with compressed and uncompressed backups
+        """
+        fname = self.id().split(".")[3]
+        backup_dir = os.path.join(self.tmp_path, module_name, fname, "backup")
+
+        # Initialize instance and backup directory
+        node = self.make_simple_node(
+            base_dir="{0}/{1}/node".format(module_name, fname),
+            initdb_params=["--data-checksums"],
+            pg_options={
+                'autovacuum': 'off'
+            }
+        )
+
+        self.init_pb(backup_dir)
+        self.add_instance(backup_dir, "node", node)
+        self.set_archiving(backup_dir, "node", node)
+        node.slow_start()
+
+        # Fill with data
+        node.pgbench_init(scale=5)
+
+        # Do compressed FULL backup
+        self.backup_node(backup_dir, "node", node, options=[
+            '--compress-algorithm=zlib', '--stream'])
+        show_backup = self.show_pb(backup_dir, "node")[0]
+
+        self.assertEqual(show_backup["status"], "OK")
+        self.assertEqual(show_backup["backup-mode"], "FULL")
+
+        # Change data
+        pgbench = node.pgbench(options=['-T', '20', '-c', '2', '--no-vacuum'])
+        pgbench.wait()
+
+        # Do compressed DELTA backup
+        self.backup_node(
+            backup_dir, "node", node, backup_type="delta",
+            options=['--compress-algorithm=zlib', '--stream'])
+
+        # Change data
+        pgbench = node.pgbench(options=['-T', '20', '-c', '2', '--no-vacuum'])
+        pgbench.wait()
+
+        # Do uncompressed PAGE backup
+        self.backup_node(
+            backup_dir, "node", node, backup_type="page")
+
+        pgdata = self.pgdata_content(node.data_dir)
+
+        show_backup = self.show_pb(backup_dir, "node")[2]
+        page_id = show_backup["id"]
+
+        self.assertEqual(show_backup["status"], "OK")
+        self.assertEqual(show_backup["backup-mode"], "PAGE")
+
+        # Merge all backups
+        self.merge_backup(backup_dir, "node", page_id)
+        show_backups = self.show_pb(backup_dir, "node")
+
+        self.assertEqual(len(show_backups), 1)
+        self.assertEqual(show_backups[0]["status"], "OK")
+        self.assertEqual(show_backups[0]["backup-mode"], "FULL")
+
+        # Drop node and restore it
+        node.cleanup()
+        self.restore_node(backup_dir, 'node', node)
+
+        pgdata_restored = self.pgdata_content(node.data_dir)
+        self.compare_pgdata(pgdata, pgdata_restored)
+
+        # Clean after yourself
+        node.cleanup()
+        self.del_test_dir(module_name, fname)
+
     # @unittest.skip("skip")
     def test_merge_tablespaces(self):
         """