db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2026-06-21 01:34:15 +02:00
Code Issues Releases Activity

tests: fixes

Browse Source
This commit is contained in:
Grigory Smolkin
2019-10-23 11:32:23 +03:00
parent 2df5d27a66
commit dd37757049
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/delete.py
+5 -3
View File
@@ -332,7 +332,7 @@ class DeleteTest(ProbackupTest, unittest.TestCase):
node2.cleanup() node2.cleanup()
self.restore_node(backup_dir, 'node', node2) 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() node2.slow_start()
# load some more data to node # load some more data to node
@@ -762,7 +762,7 @@ class DeleteTest(ProbackupTest, unittest.TestCase):
self.assertIn( self.assertIn(
'On timeline 1 WAL segments between 0000000000000001 ' 'On timeline 1 WAL segments between 0000000000000001 '
'and 0000000000000002 can be removed', 'and 0000000000000003 can be removed',
output) output)
self.assertEqual(len(self.show_pb(backup_dir, 'node')), 4) self.assertEqual(len(self.show_pb(backup_dir, 'node')), 4)
@@ -787,10 +787,12 @@ class DeleteTest(ProbackupTest, unittest.TestCase):
self.assertIn( self.assertIn(
'On timeline 1 WAL segments between 0000000000000001 ' 'On timeline 1 WAL segments between 0000000000000001 '
'and 0000000000000002 will be removed', 'and 0000000000000003 will be removed',
output) output)
self.assertEqual(len(self.show_pb(backup_dir, 'node')), 1) self.assertEqual(len(self.show_pb(backup_dir, 'node')), 1)
self.validate_pb(backup_dir, 'node')
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname) self.del_test_dir(module_name, fname)
tests/retention.py
+7 -2
View File
@@ -1363,6 +1363,11 @@ class RetentionTest(ProbackupTest, unittest.TestCase):
page_id = self.show_pb(backup_dir, 'node')[1]['id'] 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 # Take DELTA backup
delta_id = self.backup_node( delta_id = self.backup_node(
backup_dir, 'node', node, backup_type='delta', backup_dir, 'node', node, backup_type='delta',
@@ -2230,7 +2235,7 @@ class RetentionTest(ProbackupTest, unittest.TestCase):
self.assertIn( self.assertIn(
'INFO: On timeline 4 WAL segments between 0000000000000002 ' 'INFO: On timeline 4 WAL segments between 0000000000000002 '
'and 0000000000000005 can be removed', 'and 0000000000000006 can be removed',
output) output)
self.assertIn( self.assertIn(
@@ -2255,7 +2260,7 @@ class RetentionTest(ProbackupTest, unittest.TestCase):
self.assertIn( self.assertIn(
'INFO: On timeline 4 WAL segments between 0000000000000002 ' 'INFO: On timeline 4 WAL segments between 0000000000000002 '
'and 0000000000000005 will be removed', 'and 0000000000000006 will be removed',
output) output)
self.assertIn( self.assertIn(