@@ -3855,43 +3855,34 @@ def test_validate_corrupt_page_header_map(self):
38553855f .seek (42 )
38563856f .write (b"blah" )
38573857f .flush ()
3858- f .close
38593858
3860- try :
3859+ with self . assertRaises ( ProbackupException ) as cm :
38613860self .validate_pb (backup_dir ,'node' ,backup_id = backup_id )
3862- self .assertEqual (
3863- 1 ,0 ,
3864- "Expecting Error because page_header is corrupted.\n "
3865- "Output: {0}\n CMD: {1}" .format (
3866- self .output ,self .cmd ))
3867- except ProbackupException as e :
3868- self .assertRegex (
3869- e .message ,
3870- r'WARNING: An error occured during metadata decompression for file "[\w/]+": (data|buffer) error' ,
3871- '\n Unexpected Error Message: {0}\n CMD: {1}' .format (
3872- repr (e .message ),self .cmd ))
38733861
3874- self .assertIn ("Backup {0} is corrupt" .format (backup_id ),e .message )
3862+ e = cm .exception
3863+ self .assertRegex (
3864+ cm .exception .message ,
3865+ r'WARNING: An error occured during metadata decompression for file "[\w/]+": (data|buffer) error' ,
3866+ '\n Unexpected Error Message: {0}\n CMD: {1}' .format (
3867+ repr (e .message ),self .cmd ))
38753868
3876- try :
3869+ self .assertIn ("Backup {0} is corrupt" .format (backup_id ),e .message )
3870+
3871+ with self .assertRaises (ProbackupException )as cm :
38773872self .validate_pb (backup_dir )
3878- self .assertEqual (
3879- 1 ,0 ,
3880- "Expecting Error because page_header is corrupted.\n "
3881- "Output: {0}\n CMD: {1}" .format (
3882- self .output ,self .cmd ))
3883- except ProbackupException as e :
3884- self .assertTrue (
3885- 'WARNING: An error occured during metadata decompression' in e .message and
3886- 'data error' in e .message ,
3887- '\n Unexpected Error Message: {0}\n CMD: {1}' .format (
3888- repr (e .message ),self .cmd ))
38893873
3890- self .assertIn ("INFO: Backup {0} data files are valid" .format (ok_1 ),e .message )
3891- self .assertIn ("WARNING: Backup {0} data files are corrupted" .format (backup_id ),e .message )
3892- self .assertIn ("INFO: Backup {0} data files are valid" .format (ok_2 ),e .message )
3874+ e = cm .exception
3875+ self .assertRegex (
3876+ e .message ,
3877+ r'WARNING: An error occured during metadata decompression for file "[\w/]+": (data|buffer) error' ,
3878+ '\n Unexpected Error Message: {0}\n CMD: {1}' .format (
3879+ repr (e .message ),self .cmd ))
38933880
3894- self .assertIn ("WARNING: Some backups are not valid" ,e .message )
3881+ self .assertIn ("INFO: Backup {0} data files are valid" .format (ok_1 ),e .message )
3882+ self .assertIn ("WARNING: Backup {0} data files are corrupted" .format (backup_id ),e .message )
3883+ self .assertIn ("INFO: Backup {0} data files are valid" .format (ok_2 ),e .message )
3884+
3885+ self .assertIn ("WARNING: Some backups are not valid" ,e .message )
38953886
38963887# @unittest.expectedFailure
38973888# @unittest.skip("skip")