tests: fixes

Author: gsmolk

tests/config.py

@@ -110,3 +110,8 @@ def test_corrupt_backup_content(self):
                 e.message,
                 "\n Unexpected Error Message: {0}\n CMD: {1}".format(
                     repr(e.message), self.cmd))
+
+        self.show_pb(backup_dir, 'node', full1_id)['status']
+
+        self.assertEqual(self.show_pb(backup_dir, 'node')[0]['status'], 'CORRUPT')
+        self.assertEqual(self.show_pb(backup_dir, 'node')[1]['status'], 'OK')

tests/merge.py

@@ -1991,7 +1991,7 @@ def test_merge_backup_from_future(self):
         # Take FULL
         self.backup_node(backup_dir, 'node', node)
 
-        node.pgbench_init(scale=3)
+        node.pgbench_init(scale=5)
 
         # Take PAGE from future
         backup_id = self.backup_node(
@@ -2011,11 +2011,10 @@ def test_merge_backup_from_future(self):
             os.path.join(backup_dir, 'backups', 'node', backup_id),
             os.path.join(backup_dir, 'backups', 'node', new_id))
 
-        pgbench = node.pgbench(options=['-T', '3', '-c', '2', '--no-vacuum'])
+        pgbench = node.pgbench(options=['-T', '5', '-c', '1', '--no-vacuum'])
         pgbench.wait()
 
-        backup_id = self.backup_node(
-            backup_dir, 'node', node, backup_type='page')
+        backup_id = self.backup_node(backup_dir, 'node', node, backup_type='page')
         pgdata = self.pgdata_content(node.data_dir)
 
         result = node.safe_psql(

tests/restore.py

@@ -1747,7 +1747,7 @@ def test_restore_backup_from_future(self):
         # Take FULL
         self.backup_node(backup_dir, 'node', node)
 
-        node.pgbench_init(scale=3)
+        node.pgbench_init(scale=5)
         # pgbench = node.pgbench(options=['-T', '20', '-c', '2'])
         # pgbench.wait()
 
@@ -1769,11 +1769,10 @@ def test_restore_backup_from_future(self):
             os.path.join(backup_dir, 'backups', 'node', backup_id),
             os.path.join(backup_dir, 'backups', 'node', new_id))
 
-        pgbench = node.pgbench(options=['-T', '3', '-c', '2', '--no-vacuum'])
+        pgbench = node.pgbench(options=['-T', '7', '-c', '1', '--no-vacuum'])
         pgbench.wait()
 
-        backup_id = self.backup_node(
-            backup_dir, 'node', node, backup_type='page')
+        backup_id = self.backup_node(backup_dir, 'node', node, backup_type='page')
         pgdata = self.pgdata_content(node.data_dir)
 
         node.cleanup()