tests: fixes

Author: gsmolk

tests/delete.py

@@ -332,7 +332,7 @@ def test_delete_wal_between_multiple_timelines(self):
         node2.cleanup()
 
         self.restore_node(backup_dir, 'node', node2)
-        self.set_auto_conf(node, {'port': node2.port})
+        self.set_auto_conf(node2, {'port': node2.port})
         node2.slow_start()
 
         # load some more data to node
@@ -762,7 +762,7 @@ def test_delete_multiple_descendants_dry_run(self):
 
         self.assertIn(
             'On timeline 1 WAL segments between 0000000000000001 '
-            'and 0000000000000002 can be removed',
+            'and 0000000000000003 can be removed',
             output)
 
         self.assertEqual(len(self.show_pb(backup_dir, 'node')), 4)
@@ -787,10 +787,12 @@ def test_delete_multiple_descendants_dry_run(self):
 
         self.assertIn(
             'On timeline 1 WAL segments between 0000000000000001 '
-            'and 0000000000000002 will be removed',
+            'and 0000000000000003 will be removed',
             output)
 
         self.assertEqual(len(self.show_pb(backup_dir, 'node')), 1)
 
+        self.validate_pb(backup_dir, 'node')
+
         # Clean after yourself
         self.del_test_dir(module_name, fname)

tests/retention.py

@@ -1363,6 +1363,11 @@ def test_window_error_backups_2(self):
 
         page_id = self.show_pb(backup_dir, 'node')[1]['id']
 
+        if self.get_version(node) < 90600:
+            node.safe_psql(
+                'postgres',
+                'SELECT pg_catalog.pg_stop_backup()')
+
         # Take DELTA backup
         delta_id = self.backup_node(
             backup_dir, 'node', node, backup_type='delta',
@@ -2230,7 +2235,7 @@ def test_wal_purge(self):
 
         self.assertIn(
             'INFO: On timeline 4 WAL segments between 0000000000000002 '
-            'and 0000000000000005 can be removed',
+            'and 0000000000000006 can be removed',
             output)
 
         self.assertIn(
@@ -2255,7 +2260,7 @@ def test_wal_purge(self):
 
         self.assertIn(
             'INFO: On timeline 4 WAL segments between 0000000000000002 '
-            'and 0000000000000005 will be removed',
+            'and 0000000000000006 will be removed',
             output)
 
         self.assertIn(