Merge branch 'master' into issue_92

gsmolk · gsmolk · commit c069399f41da · 2019-06-28T01:16:46.000+03:00
diff --git a/src/data.c b/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);
 		}
 
diff --git a/tests/backup.py b/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))

Original file line number	Diff line number	Diff line change
`@@ -356,7 +356,7 @@ prepare_page(ConnectionArgs *arguments,`
`356`	`356`	`((strict && !is_ptrack_support) \|\| !strict))`
`357`	`357`	`{`
`358`	`358`	`/* show this message for checkdb or backup without ptrack support */`
`359`		`- elog(WARNING, "CORRUPTION in file %s, block %u",`
	`359`	`+ elog(WARNING, "Corruption detected in file \"%s\", block %u",`
`360`	`360`	`file->path, blknum);`
`361`	`361`	`}`
`362`	`362`