db/pg_probackup
db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2025-01-25 11:53:32 +02:00
Code Issues Releases Activity

Merge branch 'master' into issue_115

Browse Source
This commit is contained in:
Grigory Smolkin 2019-09-05 11:12:41 +03:00
commit 71715d62dc
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/delta.py
View File

@ -1278,7 +1278,7 @@ class DeltaTest(ProbackupTest, unittest.TestCase):
"LOG: File: {0} blknum 1, empty page".format(file), "LOG: File: {0} blknum 1, empty page".format(file),
content) content)
self.assertNotIn( self.assertNotIn(
"Skipping blknum: 1 in file: {0}".format(file), "Skipping blknum 1 in file: {0}".format(file),
content) content)
# Restore DELTA backup # Restore DELTA backup

1
tests/exclude.py
View File

@ -26,7 +26,6 @@ class ExcludeTest(ProbackupTest, unittest.TestCase):
self.add_instance(backup_dir, 'node', node) self.add_instance(backup_dir, 'node', node)
node.slow_start() node.slow_start()
conn = node.connect()
with node.connect("postgres") as conn: with node.connect("postgres") as conn:
conn.execute( conn.execute(

2
tests/helpers/ptrack_helpers.py
View File

@ -326,6 +326,8 @@ class ProbackupTest(object):
node.append_conf('postgresql.auto.conf', 'max_connections = 100') node.append_conf('postgresql.auto.conf', 'max_connections = 100')
node.append_conf('postgresql.auto.conf', 'shared_buffers = 10MB') node.append_conf('postgresql.auto.conf', 'shared_buffers = 10MB')
node.append_conf('postgresql.auto.conf', 'fsync = off') node.append_conf('postgresql.auto.conf', 'fsync = off')
if 'wal_level' not in pg_options:
node.append_conf('postgresql.auto.conf', 'wal_level = logical') node.append_conf('postgresql.auto.conf', 'wal_level = logical')
node.append_conf('postgresql.auto.conf', 'hot_standby = off') node.append_conf('postgresql.auto.conf', 'hot_standby = off')

7
tests/restore.py
View File

@ -2771,7 +2771,8 @@ class RestoreTest(ProbackupTest, unittest.TestCase):
self.output, self.cmd)) self.output, self.cmd))
except ProbackupException as e: except ProbackupException as e:
self.assertIn( self.assertIn(
"ERROR: Backup {0} has missing database_map".format(backup_id), "ERROR: Backup {0} doesn't contain a database_map, "
"partial restore is impossible".format(backup_id),
e.message, e.message,
'\n Unexpected Error Message: {0}\n CMD: {1}'.format( '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
repr(e.message), self.cmd)) repr(e.message), self.cmd))
@ -2823,6 +2824,7 @@ class RestoreTest(ProbackupTest, unittest.TestCase):
node_restored_1, options=[ node_restored_1, options=[
"--db-exclude=db5", "--db-exclude=db5",
"--db-exclude=db14"]) "--db-exclude=db14"])
pgdata_restored_1 = self.pgdata_content(node_restored_1.data_dir) pgdata_restored_1 = self.pgdata_content(node_restored_1.data_dir)
self.compare_pgdata(pgdata_restored, pgdata_restored_1) self.compare_pgdata(pgdata_restored, pgdata_restored_1)
@ -2871,7 +2873,8 @@ class RestoreTest(ProbackupTest, unittest.TestCase):
self.output, self.cmd)) self.output, self.cmd))
except ProbackupException as e: except ProbackupException as e:
self.assertIn( self.assertIn(
"ERROR: Backup {0} has missing database_map".format(backup_id), "ERROR: Backup {0} doesn't contain a database_map, "
"partial restore is impossible.".format(backup_id),
e.message, e.message,
'\n Unexpected Error Message: {0}\n CMD: {1}'.format( '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
repr(e.message), self.cmd)) repr(e.message), self.cmd))

3
tests/validate.py
View File

@ -3623,6 +3623,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname) self.del_test_dir(module_name, fname)
@unittest.skip("skip")
def test_partial_validate_empty_and_mangled_database_map(self): def test_partial_validate_empty_and_mangled_database_map(self):
""" """
""" """
@ -3696,6 +3697,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname) self.del_test_dir(module_name, fname)
@unittest.skip("skip")
def test_partial_validate_exclude(self): def test_partial_validate_exclude(self):
"""""" """"""
fname = self.id().split('.')[3] fname = self.id().split('.')[3]
@ -3767,6 +3769,7 @@ class ValidateTest(ProbackupTest, unittest.TestCase):
# Clean after yourself # Clean after yourself
self.del_test_dir(module_name, fname) self.del_test_dir(module_name, fname)
@unittest.skip("skip")
def test_partial_validate_include(self): def test_partial_validate_include(self):
""" """
""" """