diff options
Diffstat (limited to 'src/mailman/handlers/tests')
| -rw-r--r-- | src/mailman/handlers/tests/data/msg_rfc822_out.eml | 2 | ||||
| -rw-r--r-- | src/mailman/handlers/tests/test_mimedel.py | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/mailman/handlers/tests/data/msg_rfc822_out.eml b/src/mailman/handlers/tests/data/msg_rfc822_out.eml index a0f7c632d..228982578 100644 --- a/src/mailman/handlers/tests/data/msg_rfc822_out.eml +++ b/src/mailman/handlers/tests/data/msg_rfc822_out.eml @@ -6,7 +6,7 @@ To: Someone <someone@example.net> Subject: Message Subject Content-Type: multipart/mixed; boundary="------------050603050603060608020908" -X-Content-Filtered-By: Mailman/MimeDel 3.1.0b5 +X-Content-Filtered-By: Mailman/MimeDel 123 This is a multi-part message in MIME format. --------------050603050603060608020908 diff --git a/src/mailman/handlers/tests/test_mimedel.py b/src/mailman/handlers/tests/test_mimedel.py index 01cac0f20..3a50852da 100644 --- a/src/mailman/handlers/tests/test_mimedel.py +++ b/src/mailman/handlers/tests/test_mimedel.py @@ -38,6 +38,7 @@ from mailman.testing.helpers import ( specialized_message_from_string as mfs) from mailman.testing.layers import ConfigLayer from pkg_resources import resource_filename +from unittest.mock import patch from zope.component import getUtility @@ -224,6 +225,7 @@ class TestMiscellaneous(unittest.TestCase): """Test various miscellaneous filtering actions.""" layer = ConfigLayer + maxDiff = None def setUp(self): self._mlist = create_list('test@example.com') @@ -256,8 +258,13 @@ multipart/signed with open(email_file) as fp: msg = email.message_from_file(fp) process = config.handlers['mime-delete'].process - process(self._mlist, msg, {}) - with open(email_file2) as fp: + with ExitStack() as resources: + fp = resources.enter_context(open(email_file2)) + # Mock this so that the X-Content-Filtered-By header isn't + # sensitive to Mailman version bumps. + resources.enter_context( + patch('mailman.handlers.mime_delete.VERSION', '123')) + process(self._mlist, msg, {}) self.assertEqual(msg.as_string(), fp.read()) def test_mixed_case_ext_and_recast(self): |