Mark Sapiro pushed to branch master at GNU Mailman / Mailman Core


Commits:
12a2d8bd by Mark Sapiro at 2021-04-29T19:55:31-07:00
Slight cleanup of test code.

- - - - -
274fd8fe by Mark Sapiro at 2021-04-30T03:20:38+00:00
Merge branch 'test' into 'master'

Slight cleanup of test code.

See merge request mailman/mailman!847
- - - - -


1 changed file:

- src/mailman/runners/tests/test_confirm.py


Changes:

=====================================
src/mailman/runners/tests/test_confirm.py
=====================================
@@ -91,9 +91,7 @@ To: test-conf...@example.com
         self.assertEqual(address.email, 'a...@example.org')
 
     def test_confirm_with_non_ascii_prefix(self):
-        confirm_subject = str("confirm {}".format(self._token))
-        subject = '=?utf-8?b?5Zue5aSN?= =?utf-8?b?{0}?='.format(
-            base64.encodebytes(confirm_subject.encode()).decode().rstrip())
+        subject = '=?utf-8?b?5Zue5aSN?=confirm {}'.format(self._token)
         msg = mfs("""\
 From: a...@example.org
 To: test-conf...@example.com
@@ -115,8 +113,8 @@ To: test-conf...@example.com
     def test_confirm_with_base64_encoded_body(self):
         # Clear out the virgin queue so that the test below only sees the
         # reply to the confirmation message.
-        mail_content = "hello from mailman fake user"
         get_queue_messages('virgin')
+        mail_content = "hello from mailman fake user"
         subject = 'Re: confirm {}'.format(self._token)
         to = 'test-confirm+{}@example.com'.format(self._token)
         msg = mfs("""\



View it on GitLab: 
https://gitlab.com/mailman/mailman/-/compare/57eb5a4aaf86ad0ff85105ae406aa752204b6bd1...274fd8fec82bf505372cbe8f7204108dfb1b9f71

-- 
View it on GitLab: 
https://gitlab.com/mailman/mailman/-/compare/57eb5a4aaf86ad0ff85105ae406aa752204b6bd1...274fd8fec82bf505372cbe8f7204108dfb1b9f71
You're receiving this email because of your account on gitlab.com.


_______________________________________________
Mailman-checkins mailing list -- mailman-checkins@python.org
To unsubscribe send an email to mailman-checkins-le...@python.org
https://mail.python.org/mailman3/lists/mailman-checkins.python.org/
Member address: arch...@jab.org

Reply via email to