diff --git a/tests/delta.py b/tests/delta.py index d5c3a03f..8a091e42 100644 --- a/tests/delta.py +++ b/tests/delta.py @@ -1254,9 +1254,8 @@ class DeltaTest(ProbackupTest, unittest.TestCase): fname = self.id().split('.')[3] node = self.make_simple_node( base_dir=os.path.join(module_name, fname, 'node'), - initdb_params=['--data-checksums'], - pg_options={'wal_level': 'replica'} - ) + initdb_params=['--data-checksums']) + backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup') self.init_pb(backup_dir) self.add_instance(backup_dir, 'node', node) @@ -1292,22 +1291,21 @@ class DeltaTest(ProbackupTest, unittest.TestCase): if self.paranoia: pgdata = self.pgdata_content(node.data_dir) - log_file_path = os.path.join(backup_dir, "log", "pg_probackup.log") - with open(log_file_path) as f: - self.assertTrue("LOG: File: {0} blknum 1, empty page".format( - file) in f.read()) - self.assertFalse("Skipping blknum: 1 in file: {0}".format( - file) in f.read()) + if not self.remote: + log_file_path = os.path.join(backup_dir, "log", "pg_probackup.log") + with open(log_file_path) as f: + self.assertTrue("LOG: File: {0} blknum 1, empty page".format( + file) in f.read()) + self.assertFalse("Skipping blknum: 1 in file: {0}".format( + file) in f.read()) # Restore DELTA backup node_restored = self.make_simple_node( - base_dir=os.path.join(module_name, fname, 'node_restored'), - ) + base_dir=os.path.join(module_name, fname, 'node_restored')) node_restored.cleanup() self.restore_node( - backup_dir, 'node', node_restored - ) + backup_dir, 'node', node_restored) if self.paranoia: pgdata_restored = self.pgdata_content(node_restored.data_dir) diff --git a/tests/validate_test.py b/tests/validate_test.py index cb6247a1..8ad30459 100644 --- a/tests/validate_test.py +++ b/tests/validate_test.py @@ -51,14 +51,24 @@ class ValidateTest(ProbackupTest, unittest.TestCase): self.backup_node( backup_dir, 'node', node, options=['--log-level-file=verbose']) - log_file_path = os.path.join(backup_dir, "log", "pg_probackup.log") + if self.paranoia: + pgdata = self.pgdata_content(node.data_dir) - with open(log_file_path) as f: - self.assertTrue( - '{0} blknum 1, empty page'.format(file_path) in f.read(), - 'Failed to detect nullified block') + if not self.remote: + log_file_path = os.path.join(backup_dir, "log", "pg_probackup.log") + with open(log_file_path) as f: + self.assertTrue( + '{0} blknum 1, empty page'.format(file_path) in f.read(), + 'Failed to detect nullified block') self.validate_pb(backup_dir) + node.cleanup() + + self.restore_node(backup_dir, 'node', node) + + if self.paranoia: + pgdata_restored = self.pgdata_content(node.data_dir) + self.compare_pgdata(pgdata, pgdata_restored) # Clean after yourself self.del_test_dir(module_name, fname)