fix: mirror the existing test pattern

Author: Ivo Bellin Salarin

Lib/test/test_email/test_defect_handling.py

@@ -15,17 +15,6 @@ class TestDefectsBase:
     def _raise_point(self, defect):
         yield
 
-    def get_defects(self, obj):
-        return obj.defects
-
-    def check_defect(self, defect, string):
-        msg = None
-        with self._raise_point(defect):
-            msg = self._str_msg(string)
-            self.assertEqual(len(self.get_defects(msg)), 1)
-            self.assertDefectsEqual(self.get_defects(msg), [defect])
-        return msg
-
     def test_same_boundary_inner_outer(self):
         source = textwrap.dedent("""\
             Subject: XX
@@ -310,37 +299,48 @@ def test_missing_ending_boundary(self):
                                 [errors.CloseBoundaryNotFoundDefect])
 
     def test_line_beginning_colon(self):
-        msg = self.check_defect(errors.InvalidHeaderDefect,
-            'Subject: Dummy subject\r\n'
-            ': faulty header line\r\n'
-            '\r\n'
-            'body\r\n'
+        string = (
+            "Subject: Dummy subject\r\n: faulty header line\r\n\r\nbody\r\n"
         )
-        if msg:
-            self.assertEqual(msg.items(), [('Subject', 'Dummy subject')])
-            self.assertEqual(msg.get_payload(), 'body\r\n')
+
+        with self._raise_point(errors.InvalidHeaderDefect):
+            msg = self._str_msg(string)
+            self.assertEqual(len(self.get_defects(msg)), 1)
+            self.assertDefectsEqual(
+                self.get_defects(msg), [errors.InvalidHeaderDefect]
+            )
+
+            if msg:
+                self.assertEqual(msg.items(), [("Subject", "Dummy subject")])
+                self.assertEqual(msg.get_payload(), "body\r\n")
 
     def test_misplaced_envelope(self):
-        msg = self.check_defect(errors.MisplacedEnvelopeHeaderDefect,
-            'Subject: Dummy subject\r\n'
-            'From wtf\r\n'
-            'To: abc\r\n'
-            '\r\n'
-            'body\r\n'
+        string = (
+            "Subject: Dummy subject\r\nFrom wtf\r\nTo: abc\r\n\r\nbody\r\n"
         )
-        if msg:
-            headers = [('Subject', 'Dummy subject'), ('To', 'abc')]
-            self.assertEqual(msg.items(), headers)
-            self.assertEqual(msg.get_payload(), 'body\r\n')
+        with self._raise_point(errors.MisplacedEnvelopeHeaderDefect):
+            msg = self._str_msg(string)
+            self.assertEqual(len(self.get_defects(msg)), 1)
+            self.assertDefectsEqual(
+                self.get_defects(msg), [errors.MisplacedEnvelopeHeaderDefect]
+            )
+
+            if msg:
+                headers = [("Subject", "Dummy subject"), ("To", "abc")]
+                self.assertEqual(msg.items(), headers)
+                self.assertEqual(msg.get_payload(), "body\r\n")
+
 
 
 class TestCompat32(TestDefectsBase, TestEmailBase):
 
     policy = policy.compat32
 
+    def get_defects(self, obj):
+        return obj.defects
+
 
 class TestDefectDetection(TestDefectsBase, TestEmailBase):
-    pass
 
     def get_defects(self, obj):
         return obj.defects
@@ -371,6 +371,9 @@ def _raise_point(self, defect):
         with self.assertRaises(defect):
             yield
 
+    def get_defects(self, obj):
+        return obj.defects
+
 
 if __name__ == '__main__':
     unittest.main()

Lib/test/test_email/test_email.py

@@ -2241,26 +2241,6 @@ def test_parse_missing_minor_type(self):
         eq(msg.get_content_maintype(), 'text')
         eq(msg.get_content_subtype(), 'plain')
 
-    # test_defect_handling
-    def test_same_boundary_inner_outer(self):
-        msg = self._msgobj('msg_15.txt')
-        # XXX We can probably eventually do better
-        inner = msg.get_payload(0)
-        self.assertHasAttr(inner, 'defects')
-        self.assertEqual(len(inner.defects), 1)
-        self.assertIsInstance(inner.defects[0],
-                              errors.StartBoundaryNotFoundDefect)
-
-    # test_defect_handling
-    def test_multipart_no_boundary(self):
-        msg = self._msgobj('msg_25.txt')
-        self.assertIsInstance(msg.get_payload(), str)
-        self.assertEqual(len(msg.defects), 2)
-        self.assertIsInstance(msg.defects[0],
-                              errors.NoBoundaryInMultipartDefect)
-        self.assertIsInstance(msg.defects[1],
-                              errors.MultipartInvariantViolationDefect)
-
     # test_headerregistry.TestContentTypeHeader invalid_1 and invalid_2.
     def test_invalid_content_type(self):
         eq = self.assertEqual