Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0a5fc87

Browse files
committed
[PBCKP-360] fix exception check in test_validate_corrupt_page_header_map
zlib decompression could mark error either as "data error" or"buffer error". One of check did consider it, other didn't.Make them same.And use `assertRaises` for good (requires python 3.2 at least)
1 parent15a5c5d commit0a5fc87

File tree

1 file changed

+21
-30
lines changed

1 file changed

+21
-30
lines changed

‎tests/validate.py

Lines changed: 21 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4007,43 +4007,34 @@ def test_validate_corrupt_page_header_map(self):
40074007
f.seek(42)
40084008
f.write(b"blah")
40094009
f.flush()
4010-
f.close
40114010

4012-
try:
4011+
withself.assertRaises(ProbackupException)ascm:
40134012
self.validate_pb(backup_dir,'node',backup_id=backup_id)
4014-
self.assertEqual(
4015-
1,0,
4016-
"Expecting Error because page_header is corrupted.\n "
4017-
"Output: {0}\n CMD: {1}".format(
4018-
self.output,self.cmd))
4019-
exceptProbackupExceptionase:
4020-
self.assertRegex(
4021-
e.message,
4022-
r'WARNING: An error occured during metadata decompression for file "[\w/]+": (data|buffer) error',
4023-
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(
4024-
repr(e.message),self.cmd))
40254013

4026-
self.assertIn("Backup {0} is corrupt".format(backup_id),e.message)
4014+
e=cm.exception
4015+
self.assertRegex(
4016+
cm.exception.message,
4017+
r'WARNING: An error occured during metadata decompression for file "[\w/]+": (data|buffer) error',
4018+
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(
4019+
repr(e.message),self.cmd))
40274020

4028-
try:
4021+
self.assertIn("Backup {0} is corrupt".format(backup_id),e.message)
4022+
4023+
withself.assertRaises(ProbackupException)ascm:
40294024
self.validate_pb(backup_dir)
4030-
self.assertEqual(
4031-
1,0,
4032-
"Expecting Error because page_header is corrupted.\n "
4033-
"Output: {0}\n CMD: {1}".format(
4034-
self.output,self.cmd))
4035-
exceptProbackupExceptionase:
4036-
self.assertTrue(
4037-
'WARNING: An error occured during metadata decompression'ine.messageand
4038-
'data error'ine.message,
4039-
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(
4040-
repr(e.message),self.cmd))
40414025

4042-
self.assertIn("INFO: Backup {0} data files are valid".format(ok_1),e.message)
4043-
self.assertIn("WARNING: Backup {0} data files are corrupted".format(backup_id),e.message)
4044-
self.assertIn("INFO: Backup {0} data files are valid".format(ok_2),e.message)
4026+
e=cm.exception
4027+
self.assertRegex(
4028+
e.message,
4029+
r'WARNING: An error occured during metadata decompression for file "[\w/]+": (data|buffer) error',
4030+
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(
4031+
repr(e.message),self.cmd))
40454032

4046-
self.assertIn("WARNING: Some backups are not valid",e.message)
4033+
self.assertIn("INFO: Backup {0} data files are valid".format(ok_1),e.message)
4034+
self.assertIn("WARNING: Backup {0} data files are corrupted".format(backup_id),e.message)
4035+
self.assertIn("INFO: Backup {0} data files are valid".format(ok_2),e.message)
4036+
4037+
self.assertIn("WARNING: Some backups are not valid",e.message)
40474038

40484039
# Clean after yourself
40494040
self.del_test_dir(module_name,fname)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp