[Issue #113] improve test coverage

Author: gsmolk

tests/merge.py

@@ -111,17 +111,15 @@ def test_merge_compressed_backups(self):
         # Initialize instance and backup directory
         node = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node'),
-            initdb_params=["--data-checksums"]
-        )
+            initdb_params=["--data-checksums"])
 
         self.init_pb(backup_dir)
         self.add_instance(backup_dir, "node", node)
         self.set_archiving(backup_dir, "node", node)
         node.slow_start()
 
         # Do full compressed backup
-        self.backup_node(backup_dir, "node", node, options=[
-            '--compress-algorithm=zlib'])
+        self.backup_node(backup_dir, "node", node, options=['--compress'])
         show_backup = self.show_pb(backup_dir, "node")[0]
 
         self.assertEqual(show_backup["status"], "OK")
@@ -137,16 +135,15 @@ def test_merge_compressed_backups(self):
 
         # Do compressed page backup
         self.backup_node(
-            backup_dir, "node", node, backup_type="page",
-            options=['--compress-algorithm=zlib'])
+            backup_dir, "node", node, backup_type="page", options=['--compress'])
         show_backup = self.show_pb(backup_dir, "node")[1]
         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)
+        self.merge_backup(backup_dir, "node", page_id, options=['-j2'])
         show_backups = self.show_pb(backup_dir, "node")
 
         self.assertEqual(len(show_backups), 1)
@@ -191,8 +188,7 @@ def test_merge_compressed_backups_1(self):
         node.pgbench_init(scale=5)
 
         # Do compressed FULL backup
-        self.backup_node(backup_dir, "node", node, options=[
-            '--compress-algorithm=zlib', '--stream'])
+        self.backup_node(backup_dir, "node", node, options=['--compress', '--stream'])
         show_backup = self.show_pb(backup_dir, "node")[0]
 
         self.assertEqual(show_backup["status"], "OK")
@@ -204,17 +200,16 @@ def test_merge_compressed_backups_1(self):
 
         # Do compressed DELTA backup
         self.backup_node(
-            backup_dir, "node", node, backup_type="delta",
-            options=['--compress-algorithm=zlib', '--stream'])
+            backup_dir, "node", node,
+            backup_type="delta", options=['--compress', '--stream'])
 
         # Change data
         pgbench = node.pgbench(options=['-T', '20', '-c', '2', '--no-vacuum'])
         pgbench.wait()
 
         # Do compressed PAGE backup
         self.backup_node(
-            backup_dir, "node", node, backup_type="page",
-            options=['--compress-algorithm=zlib'])
+            backup_dir, "node", node, backup_type="page", options=['--compress'])
 
         pgdata = self.pgdata_content(node.data_dir)
 
@@ -225,7 +220,7 @@ def test_merge_compressed_backups_1(self):
         self.assertEqual(show_backup["backup-mode"], "PAGE")
 
         # Merge all backups
-        self.merge_backup(backup_dir, "node", page_id)
+        self.merge_backup(backup_dir, "node", page_id, options=['-j2'])
         show_backups = self.show_pb(backup_dir, "node")
 
         self.assertEqual(len(show_backups), 1)
@@ -282,15 +277,14 @@ def test_merge_compressed_and_uncompressed_backups(self):
         # Do compressed DELTA backup
         self.backup_node(
             backup_dir, "node", node, backup_type="delta",
-            options=['--compress-algorithm=zlib', '--stream'])
+            options=['--compress', '--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")
+        self.backup_node(backup_dir, "node", node, backup_type="page")
 
         pgdata = self.pgdata_content(node.data_dir)
 
@@ -301,7 +295,7 @@ def test_merge_compressed_and_uncompressed_backups(self):
         self.assertEqual(show_backup["backup-mode"], "PAGE")
 
         # Merge all backups
-        self.merge_backup(backup_dir, "node", page_id)
+        self.merge_backup(backup_dir, "node", page_id, options=['-j2'])
         show_backups = self.show_pb(backup_dir, "node")
 
         self.assertEqual(len(show_backups), 1)