Merge branch 'master' into issue_115

Author: gsmolk

tests/delta.py

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

tests/exclude.py

@@ -26,7 +26,6 @@ def test_exclude_temp_tables(self):
         self.add_instance(backup_dir, 'node', node)
         node.slow_start()
 
-        conn = node.connect()
         with node.connect("postgres") as conn:
 
             conn.execute(

tests/helpers/ptrack_helpers.py

@@ -326,7 +326,9 @@ def make_simple_node(
         node.append_conf('postgresql.auto.conf', 'max_connections = 100')
         node.append_conf('postgresql.auto.conf', 'shared_buffers = 10MB')
         node.append_conf('postgresql.auto.conf', 'fsync = off')
-        node.append_conf('postgresql.auto.conf', 'wal_level = logical')
+
+        if 'wal_level' not in pg_options:
+            node.append_conf('postgresql.auto.conf', 'wal_level = logical')
         node.append_conf('postgresql.auto.conf', 'hot_standby = off')
 
         node.append_conf(

tests/restore.py

@@ -2771,7 +2771,8 @@ def test_partial_restore_backward_compatibility_1(self):
                     self.output, self.cmd))
         except ProbackupException as e:
             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,
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                     repr(e.message), self.cmd))
@@ -2823,6 +2824,7 @@ def test_partial_restore_backward_compatibility_1(self):
                 node_restored_1, options=[
                     "--db-exclude=db5",
                     "--db-exclude=db14"])
+
         pgdata_restored_1 = self.pgdata_content(node_restored_1.data_dir)
 
         self.compare_pgdata(pgdata_restored, pgdata_restored_1)
@@ -2871,7 +2873,8 @@ def test_partial_restore_backward_compatibility_merge(self):
                     self.output, self.cmd))
         except ProbackupException as e:
             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,
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                     repr(e.message), self.cmd))

tests/validate.py

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