Merge #35: replace deprecated unittest assertions for Python 3.12

Resolve test_handlers.py conflict by keeping assertTrue/assertFalse from
PR #35 and the Python 3 payload decode path from main.

Author: jaredmauch

tests/test_bounces.py

@@ -219,8 +219,8 @@ def test_SMTP32_failure(self):
             msg = email.message_from_binary_file(fp)
         finally:
             fp.close()
-        self.failIf(msg['x-mailer'] is not None)
-        self.failIf(SMTP32.process(msg))
+        self.assertFalse(msg['x-mailer'] is not None)
+        self.assertFalse(SMTP32.process(msg))
 
     def test_caiwireless(self):
         from Mailman.Bouncers import Caiwireless

tests/test_handlers.py

@@ -143,8 +143,8 @@ def test_ack_no_subject(self):
         eq(qmsg.get_content_type(), 'text/plain')
         eq(qmsg.get_param('charset'), 'utf-8')
         msgid = qmsg['message-id']
-        self.failUnless(msgid.startswith('<mailman.'))
-        self.failUnless(msgid.endswith('._xtest@dom.ain>'))
+        self.assertTrue(msgid.startswith('<mailman.'))
+        self.assertTrue(msgid.endswith('._xtest@dom.ain>'))
         payload = qmsg.get_payload(decode=True).decode('utf-8')
         eq(payload, """\
 Your message entitled
@@ -184,8 +184,8 @@ def test_ack_with_subject(self):
         eq(qmsg.get_content_type(), 'text/plain')
         eq(qmsg.get_param('charset'), 'utf-8')
         msgid = qmsg['message-id']
-        self.failUnless(msgid.startswith('<mailman.'))
-        self.failUnless(msgid.endswith('._xtest@dom.ain>'))
+        self.assertTrue(msgid.startswith('<mailman.'))
+        self.assertTrue(msgid.endswith('._xtest@dom.ain>'))
         payload = qmsg.get_payload(decode=True).decode('utf-8')
         eq(payload, """\
 Your message entitled
@@ -209,7 +209,7 @@ def test_process(self):
         last_post_time = mlist.last_post_time
         post_id = mlist.post_id
         AfterDelivery.process(mlist, None, None)
-        self.failUnless(mlist.last_post_time > last_post_time)
+        self.assertTrue(mlist.last_post_time > last_post_time)
         self.assertEqual(mlist.post_id, post_id + 1)
 
 
@@ -230,7 +230,7 @@ def test_approved_moderator(self):
 """)
         msgdata = {}
         Approve.process(mlist, msg, msgdata)
-        self.failUnless('approved' in msgdata)
+        self.assertTrue('approved' in msgdata)
         self.assertEqual(msgdata['approved'], 1)
 
     def test_approve_moderator(self):
@@ -242,7 +242,7 @@ def test_approve_moderator(self):
 """)
         msgdata = {}
         Approve.process(mlist, msg, msgdata)
-        self.failUnless('approved' in msgdata)
+        self.assertTrue('approved' in msgdata)
         self.assertEqual(msgdata['approved'], 1)
 
     def test_approved_admin(self):
@@ -254,7 +254,7 @@ def test_approved_admin(self):
 """)
         msgdata = {}
         Approve.process(mlist, msg, msgdata)
-        self.failUnless('approved' in msgdata)
+        self.assertTrue('approved' in msgdata)
         self.assertEqual(msgdata['approved'], 1)
 
     def test_approve_admin(self):
@@ -266,7 +266,7 @@ def test_approve_admin(self):
 """)
         msgdata = {}
         Approve.process(mlist, msg, msgdata)
-        self.failUnless('approved' in msgdata)
+        self.assertTrue('approved' in msgdata)
         self.assertEqual(msgdata['approved'], 1)
 
     def test_unapproved(self):
@@ -316,7 +316,7 @@ def test_simple_path(self):
 
 """, Message.Message)
         CalcRecips.process(self._mlist, msg, msgdata)
-        self.failUnless('recips' in msgdata)
+        self.assertTrue('recips' in msgdata)
         recips = msgdata['recips']
         recips.sort()
         self.assertEqual(recips, ['aperson@dom.ain', 'bperson@dom.ain',
@@ -331,7 +331,7 @@ def test_exclude_sender(self):
         self._mlist.setMemberOption('cperson@dom.ain',
                                     mm_cfg.DontReceiveOwnPosts, 1)
         CalcRecips.process(self._mlist, msg, msgdata)
-        self.failUnless('recips' in msgdata)
+        self.assertTrue('recips' in msgdata)
         recips = msgdata['recips']
         recips.sort()
         self.assertEqual(recips, ['aperson@dom.ain', 'bperson@dom.ain'])
@@ -345,7 +345,7 @@ def test_urgent_moderator(self):
 
 """, Message.Message)
         CalcRecips.process(self._mlist, msg, msgdata)
-        self.failUnless('recips' in msgdata)
+        self.assertTrue('recips' in msgdata)
         recips = msgdata['recips']
         recips.sort()
         self.assertEqual(recips, ['aperson@dom.ain', 'bperson@dom.ain',
@@ -362,7 +362,7 @@ def test_urgent_admin(self):
 
 """, Message.Message)
         CalcRecips.process(self._mlist, msg, msgdata)
-        self.failUnless('recips' in msgdata)
+        self.assertTrue('recips' in msgdata)
         recips = msgdata['recips']
         recips.sort()
         self.assertEqual(recips, ['aperson@dom.ain', 'bperson@dom.ain',
@@ -589,7 +589,7 @@ def test_no_subject_munging_has_prefix(self):
 """, Message.Message)
         CookHeaders.process(self._mlist, msg, {})
         # prefixing depends on mm_cfg.py
-        self.failUnless(str(msg['subject']) == 'Re: [XTEST] About Mailman...' or
+        self.assertTrue(str(msg['subject']) == 'Re: [XTEST] About Mailman...' or
                         str(msg['subject']) == '[XTEST] Re: About Mailman...')
 
     def test_reply_to_list(self):
@@ -1281,7 +1281,7 @@ def test_hold_notifications(self):
         data = self._mlist.pend_confirm(cookie)
         eq(data, ('H', 1))
         heldmsg = os.path.join(mm_cfg.DATA_DIR, 'heldmsg-_xtest-1.pck')
-        self.failUnless(os.path.exists(heldmsg))
+        self.assertTrue(os.path.exists(heldmsg))
         os.unlink(heldmsg)
         holdfiles = [f for f in os.listdir(mm_cfg.DATA_DIR)
                      if f.startswith('heldmsg-')]
@@ -1982,7 +1982,7 @@ def test_normal_archiving(self):
         eq(data['_parsemsg'], False)
         eq(data['version'], 3)
         # Clock skew makes this unreliable
-        #self.failUnless(data['received_time'] <= time.time())
+        #self.assertTrue(data['received_time'] <= time.time())
         eq(msg.as_string(unixfrom=0), msg2.as_string(unixfrom=0))
 
 
@@ -2093,7 +2093,7 @@ def test_outgoing(self):
         eq(len(files), 1)
         msg2, data = self._sb.dequeue(files[0])
         eq(msg.as_string(unixfrom=0), msg2.as_string(unixfrom=0))
-        self.failUnless(len(data) >= 6 and len(data) <= 7)
+        self.assertTrue(len(data) >= 6 and len(data) <= 7)
         eq(data['foo'], 1)
         eq(data['bar'], 2)
         eq(data['version'], 3)
@@ -2102,7 +2102,7 @@ def test_outgoing(self):
         # Can't test verp. presence/value depend on mm_cfg.py
         #eq(data['verp'], 1)
         # Clock skew makes this unreliable
-        #self.failUnless(data['received_time'] <= time.time())
+        #self.assertTrue(data['received_time'] <= time.time())
 
 
 
@@ -2150,7 +2150,7 @@ def test_to_usenet(self):
         eq(data['version'], 3)
         eq(data['listname'], '_xtest')
         # Clock skew makes this unreliable
-        #self.failUnless(data['received_time'] <= time.time())
+        #self.assertTrue(data['received_time'] <= time.time())
 
 
 

tests/test_lockfile.py

@@ -34,7 +34,7 @@ def test_two_lockfiles_same_proc(self):
         lf1 = LockFile(LOCKFILE_NAME)
         lf2 = LockFile(LOCKFILE_NAME)
         lf1.lock()
-        self.failIf(lf2.locked())
+        self.assertFalse(lf2.locked())
 
 
 

tests/test_membership.py

@@ -44,7 +44,7 @@ def test_no_member(self):
         eq(mlist.getMembers(), [])
         eq(mlist.getRegularMemberKeys(), [])
         eq(mlist.getDigestMemberKeys(), [])
-        self.failIf(mlist.isMember('nobody@dom.ain'))
+        self.assertFalse(mlist.isMember('nobody@dom.ain'))
         raises(NotAMemberError, mlist.getMemberKey, 'nobody@dom.ain')
         raises(NotAMemberError, mlist.getMemberCPAddress, 'nobody@dom.ain')
         eq(mlist.getMemberCPAddresses(('nobody@dom.ain', 'noperson@dom.ain')),
@@ -65,9 +65,9 @@ def test_add_member_mixed_case(self):
         mlist.addNewMember('APerson@dom.AIN')
         eq(mlist.getMembers(), ['aperson@dom.ain'])
         eq(mlist.getRegularMemberKeys(), ['aperson@dom.ain'])
-        self.failUnless(mlist.isMember('APerson@dom.AIN'))
-        self.failUnless(mlist.isMember('aperson@dom.ain'))
-        self.failUnless(mlist.isMember('APERSON@DOM.AIN'))
+        self.assertTrue(mlist.isMember('APerson@dom.AIN'))
+        self.assertTrue(mlist.isMember('aperson@dom.ain'))
+        self.assertTrue(mlist.isMember('APERSON@DOM.AIN'))
         eq(mlist.getMemberCPAddress('aperson@dom.ain'), 'APerson@dom.AIN')
         eq(mlist.getMemberCPAddress('APerson@dom.ain'), 'APerson@dom.AIN')
         eq(mlist.getMemberCPAddress('APERSON@DOM.AIN'), 'APerson@dom.AIN')
@@ -95,7 +95,7 @@ def test_add_member(self):
         eq(mlist.getMembers(), ['person@dom.ain'])
         eq(mlist.getRegularMemberKeys(), ['person@dom.ain'])
         eq(mlist.getDigestMemberKeys(), [])
-        self.failUnless(mlist.isMember('person@dom.ain'))
+        self.assertTrue(mlist.isMember('person@dom.ain'))
         eq(mlist.getMemberKey('person@dom.ain'), 'person@dom.ain')
         eq(mlist.getMemberCPAddress('person@dom.ain'), 'person@dom.ain')
         eq(mlist.getMemberCPAddresses(('person@dom.ain', 'noperson@dom.ain')),
@@ -109,7 +109,7 @@ def test_add_member(self):
 
     def test_authentication(self):
         mlist = self._mlist
-        self.failIf(mlist.authenticateMember('person@dom.ain', 'xxx'))
+        self.assertFalse(mlist.authenticateMember('person@dom.ain', 'xxx'))
         self.assertEqual(mlist.authenticateMember('person@dom.ain', 'xxXXxx'),
                          'xxXXxx')
 
@@ -121,7 +121,7 @@ def test_remove_member(self):
         eq(mlist.getMembers(), [])
         eq(mlist.getRegularMemberKeys(), [])
         eq(mlist.getDigestMemberKeys(), [])
-        self.failIf(mlist.isMember('person@dom.ain'))
+        self.assertFalse(mlist.isMember('person@dom.ain'))
         raises(NotAMemberError, mlist.getMemberKey, 'person@dom.ain')
         raises(NotAMemberError, mlist.getMemberCPAddress, 'person@dom.ain')
         eq(mlist.getMemberCPAddresses(('person@dom.ain', 'noperson@dom.ain')),
@@ -161,7 +161,7 @@ def test_change_address(self):
         eq(mlist.getMembers(), ['nice@dom.ain'])
         eq(mlist.getRegularMemberKeys(), ['nice@dom.ain'])
         eq(mlist.getDigestMemberKeys(), [])
-        self.failUnless(mlist.isMember('nice@dom.ain'))
+        self.assertTrue(mlist.isMember('nice@dom.ain'))
         eq(mlist.getMemberKey('nice@dom.ain'), 'nice@dom.ain')
         eq(mlist.getMemberCPAddress('nice@dom.ain'), 'nice@dom.ain')
         eq(mlist.getMemberCPAddresses(('nice@dom.ain', 'nonice@dom.ain')),
@@ -176,7 +176,7 @@ def test_change_address(self):
         eq(mlist.getMembers(), ['nice@dom.ain'])
         eq(mlist.getRegularMemberKeys(), ['nice@dom.ain'])
         eq(mlist.getDigestMemberKeys(), [])
-        self.failIf(mlist.isMember('person@dom.ain'))
+        self.assertFalse(mlist.isMember('person@dom.ain'))
         raises(NotAMemberError, mlist.getMemberKey, 'person@dom.ain')
         raises(NotAMemberError, mlist.getMemberCPAddress, 'person@dom.ain')
         eq(mlist.getMemberCPAddresses(('person@dom.ain', 'noperson@dom.ain')),
@@ -196,7 +196,7 @@ def test_set_password(self):
         mlist.setMemberPassword('person@dom.ain', 'yyYYyy')
         eq(mlist.getMemberPassword('person@dom.ain'), 'yyYYyy')
         eq(mlist.authenticateMember('person@dom.ain', 'yyYYyy'), 'yyYYyy')
-        self.failIf(mlist.authenticateMember('person@dom.ain', 'xxXXxx'))
+        self.assertFalse(mlist.authenticateMember('person@dom.ain', 'xxXXxx'))
 
     def test_set_language(self):
         self._mlist.available_languages.append('xx')
@@ -245,7 +245,7 @@ def test_delivery_status_time(self):
         now = time.time()
         time.sleep(1)
         self._mlist.setDeliveryStatus('person@dom.ain', MemberAdaptor.BYUSER)
-        self.failUnless(
+        self.assertTrue(
             self._mlist.getDeliveryStatusChangeTime('person@dom.ain')
             > now)
         self._mlist.setDeliveryStatus('person@dom.ain', MemberAdaptor.ENABLED)

tests/test_message.py

@@ -37,7 +37,7 @@
 class TestSentMessage1(EmailBase):
     def test_user_notification(self):
         eq = self.assertEqual
-        unless = self.failUnless
+        unless = self.assertTrue
         msg = Message.UserNotification(
             'aperson@dom.ain',
             '_xtest@dom.ain',
@@ -70,7 +70,7 @@ def test_user_notification(self):
 class TestSentMessage2(EmailBase):
     def test_bounce_message(self):
         eq = self.assertEqual
-        unless = self.failUnless
+        unless = self.assertTrue
         msg = email.message_from_string("""\
 To: _xtest@dom.ain
 From: nobody@dom.ain