db/pg_probackup
db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2025-02-03 14:01:57 +02:00
Code Issues Releases Activity

tests: fixes

Browse Source
This commit is contained in:
Grigory Smolkin 2019-05-23 11:29:00 +03:00
parent 5cf1556984
commit 00cbcc8160
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/external.py
View File

@ -866,7 +866,7 @@ class ExternalTest(ProbackupTest, unittest.TestCase):
# @unittest.expectedFailure
# @unittest.skip("skip")
def test_external_merge_single(self):
def test_external_merge_1(self):
""""""
fname = self.id().split('.')[3]
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
@ -1012,7 +1012,9 @@ class ExternalTest(ProbackupTest, unittest.TestCase):
pgdata = self.pgdata_content(
node.base_dir, exclude_dirs=['logs'])
self.merge_backup(backup_dir, 'node', backup_id=backup_id)
self.merge_backup(
backup_dir, 'node', backup_id=backup_id,
options=['--log-level-file=verbose'])
# RESTORE
node.cleanup()
@ -1040,7 +1042,7 @@ class ExternalTest(ProbackupTest, unittest.TestCase):
# @unittest.expectedFailure
# @unittest.skip("skip")
def test_external_merge_double(self):
def test_external_merge_2(self):
""""""
fname = self.id().split('.')[3]
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
@ -1446,7 +1448,6 @@ class ExternalTest(ProbackupTest, unittest.TestCase):
# Clean after yourself
self.del_test_dir(module_name, fname)
# @unittest.expectedFailure
# @unittest.skip("skip")
def test_restore_skip_external(self):

21
tests/merge.py
View File

@ -1721,7 +1721,7 @@ class MergeTest(ProbackupTest, unittest.TestCase):
# backup half-merged
self.assertEqual(
'OK', self.show_pb(backup_dir, 'node')[0]['status'])
'MERGING', self.show_pb(backup_dir, 'node')[0]['status'])
self.assertEqual(
full_id, self.show_pb(backup_dir, 'node')[0]['id'])
@ -1753,16 +1753,21 @@ class MergeTest(ProbackupTest, unittest.TestCase):
self.set_archiving(backup_dir, 'node', node)
node.slow_start()
# add database
node.pgbench_init(scale=1)
# take FULL backup
full_id = self.backup_node(
backup_dir, 'node', node, options=['--stream'])
node.pgbench_init(scale=1)
page_1 = self.backup_node(
backup_dir, 'node', node, backup_type='page')
# Change FULL B backup status to ERROR
self.change_backup_status(backup_dir, 'node', page_1, 'ERROR')
pgdata = self.pgdata_content(node.data_dir)
# drop database
# add data
pgbench = node.pgbench(options=['-T', '10', '-c', '2', '--no-vacuum'])
pgbench.wait()
@ -1770,6 +1775,9 @@ class MergeTest(ProbackupTest, unittest.TestCase):
page_id = self.backup_node(
backup_dir, 'node', node, backup_type='page')
# Change FULL B backup status to ERROR
self.change_backup_status(backup_dir, 'node', page_1, 'OK')
gdb = self.merge_backup(
backup_dir, 'node', page_id,
gdb=True, options=['--log-level-console=verbose'])
@ -1827,7 +1835,8 @@ class MergeTest(ProbackupTest, unittest.TestCase):
node.pgbench_init(scale=3)
# Take PAGE from future
backup_id = self.backup_node(backup_dir, 'node', node, backup_type='page')
backup_id = self.backup_node(
backup_dir, 'node', node, backup_type='page')
with open(
os.path.join(