Merge branch 'master' into issue_92

Author: gsmolk

src/data.c

@@ -356,7 +356,7 @@ prepare_page(ConnectionArgs *arguments,
 			((strict && !is_ptrack_support) || !strict))
 		{
 			/* show this message for checkdb or backup without ptrack support */
-			elog(WARNING, "CORRUPTION in file %s, block %u",
+			elog(WARNING, "Corruption detected in file \"%s\", block %u",
 						file->path, blknum);
 		}
 

tests/backup.py

@@ -470,7 +470,12 @@ def test_backup_detect_corruption(self):
                     repr(self.output), self.cmd))
         except ProbackupException as e:
             self.assertIn(
-                'Insert correct message',
+                'WARNING: Corruption detected in file',
+                e.message,
+                '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
+                    repr(e.message), self.cmd))
+            self.assertIn(
+                'ERROR: Data file corruption',
                 e.message,
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                     repr(e.message), self.cmd))