From 0a5fc87dbd704e0ee5e430b0406bb0328c553055 Mon Sep 17 00:00:00 2001
From: Yura Sokolov <funny.falcon@gmail.com>
Date: Tue, 29 Nov 2022 15:12:32 +0300
Subject: [PATCH] [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)
---
 tests/validate.py | 51 +++++++++++++++++++----------------------------
 1 file changed, 21 insertions(+), 30 deletions(-)

diff --git a/tests/validate.py b/tests/validate.py
index 966ad81a8..a6776d571 100644
--- a/tests/validate.py
+++ b/tests/validate.py
@@ -4007,43 +4007,34 @@ def test_validate_corrupt_page_header_map(self):
             f.seek(42)
             f.write(b"blah")
             f.flush()
-            f.close
 
-        try:
+        with self.assertRaises(ProbackupException) as cm:
             self.validate_pb(backup_dir, 'node', backup_id=backup_id)
-            self.assertEqual(
-                1, 0,
-                "Expecting Error because page_header is corrupted.\n "
-                "Output: {0} \n CMD: {1}".format(
-                    self.output, self.cmd))
-        except ProbackupException as e:
-            self.assertRegex(
-                e.message,
-                r'WARNING: An error occured during metadata decompression for file "[\w/]+": (data|buffer) error',
-                '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
-                    repr(e.message), self.cmd))
 
-            self.assertIn("Backup {0} is corrupt".format(backup_id), e.message)
+        e = cm.exception
+        self.assertRegex(
+            cm.exception.message,
+            r'WARNING: An error occured during metadata decompression for file "[\w/]+": (data|buffer) error',
+            '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
+                repr(e.message), self.cmd))
 
-        try:
+        self.assertIn("Backup {0} is corrupt".format(backup_id), e.message)
+
+        with self.assertRaises(ProbackupException) as cm:
             self.validate_pb(backup_dir)
-            self.assertEqual(
-                1, 0,
-                "Expecting Error because page_header is corrupted.\n "
-                "Output: {0} \n CMD: {1}".format(
-                    self.output, self.cmd))
-        except ProbackupException as e:
-            self.assertTrue(
-                'WARNING: An error occured during metadata decompression' in e.message and
-                'data error' in e.message,
-                '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
-                    repr(e.message), self.cmd))
 
-            self.assertIn("INFO: Backup {0} data files are valid".format(ok_1), e.message)
-            self.assertIn("WARNING: Backup {0} data files are corrupted".format(backup_id), e.message)
-            self.assertIn("INFO: Backup {0} data files are valid".format(ok_2), e.message)
+        e = cm.exception
+        self.assertRegex(
+            e.message,
+            r'WARNING: An error occured during metadata decompression for file "[\w/]+": (data|buffer) error',
+            '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
+                repr(e.message), self.cmd))
 
-            self.assertIn("WARNING: Some backups are not valid", e.message)
+        self.assertIn("INFO: Backup {0} data files are valid".format(ok_1), e.message)
+        self.assertIn("WARNING: Backup {0} data files are corrupted".format(backup_id), e.message)
+        self.assertIn("INFO: Backup {0} data files are valid".format(ok_2), e.message)
+
+        self.assertIn("WARNING: Some backups are not valid", e.message)
 
         # Clean after yourself
         self.del_test_dir(module_name, fname)