16 files changed, 64 insertions, 172 deletions

diff --git a/src/mailman/model/tests/test_address.py b/src/mailman/model/tests/test_address.py
index 2ed74360b..896310796 100644
--- a/src/mailman/model/tests/test_address.py
+++ b/src/mailman/model/tests/test_address.py
@@ -17,11 +17,6 @@
 
 """Test addresses."""
 
-__all__ = [
-    'TestAddress',
-    ]
-
-
 import unittest
 
 from mailman.email.validate import InvalidEmailAddressError
@@ -32,7 +27,6 @@ from mailman.testing.layers import ConfigLayer
 from zope.component import getUtility
 
 
-
 class TestAddress(unittest.TestCase):
     """Test addresses."""
 
@@ -43,8 +37,8 @@ class TestAddress(unittest.TestCase):
         self._address = self._usermgr.create_address('FPERSON@example.com')
 
     def test_invalid_email_string_raises_exception(self):
-        with self.assertRaises(InvalidEmailAddressError):
-            Address('not_a_valid_email_string', '')
+        self.assertRaises(InvalidEmailAddressError,
+                          Address, 'not_a_valid_email_string', '')
 
     def test_local_part_differs_only_by_case(self):
         with self.assertRaises(ExistingAddressError) as cm:
diff --git a/src/mailman/model/tests/test_bans.py b/src/mailman/model/tests/test_bans.py
index 636ee7e35..c4fa57338 100644
--- a/src/mailman/model/tests/test_bans.py
+++ b/src/mailman/model/tests/test_bans.py
@@ -17,11 +17,6 @@
 
 """Test Bans and the ban manager."""
 
-__all__ = [
-    'TestMailingListBans',
-    ]
-
-
 import unittest
 
 from mailman.app.lifecycle import create_list
@@ -31,7 +26,6 @@ from mailman.testing.layers import ConfigLayer
 from zope.component import getUtility
 
 
-
 class TestMailingListBans(unittest.TestCase):
     layer = ConfigLayer
 
diff --git a/src/mailman/model/tests/test_bounce.py b/src/mailman/model/tests/test_bounce.py
index d2fd27172..14f39ceaf 100644
--- a/src/mailman/model/tests/test_bounce.py
+++ b/src/mailman/model/tests/test_bounce.py
@@ -17,11 +17,6 @@
 
 """Test bounce model objects."""
 
-__all__ = [
-    'TestBounceEvents',
-    ]
-
-
 import unittest
 
 from datetime import datetime
@@ -34,7 +29,6 @@ from mailman.testing.layers import ConfigLayer
 from zope.component import getUtility
 
 
-
 class TestBounceEvents(unittest.TestCase):
     layer = ConfigLayer
 
@@ -70,7 +64,7 @@ Message-Id: <first>
         self.assertEqual(event.timestamp, datetime(2005, 8, 1, 7, 49, 23))
         self.assertEqual(event.message_id, '<first>')
         self.assertEqual(event.context, BounceContext.normal)
-        self.assertEqual(event.processed, False)
+        self.assertFalse(event.processed)
 
     def test_unprocessed_events_iterator(self):
         with transaction():
diff --git a/src/mailman/model/tests/test_domain.py b/src/mailman/model/tests/test_domain.py
index e1941744b..3ebcb562e 100644
--- a/src/mailman/model/tests/test_domain.py
+++ b/src/mailman/model/tests/test_domain.py
@@ -17,12 +17,6 @@
 
 """Test domains."""
 
-__all__ = [
-    'TestDomainLifecycleEvents',
-    'TestDomainManager',
-    ]
-
-
 import unittest
 
 from mailman.app.lifecycle import create_list
@@ -36,7 +30,6 @@ from mailman.testing.layers import ConfigLayer
 from zope.component import getUtility
 
 
-
 class TestDomainManager(unittest.TestCase):
     layer = ConfigLayer
 
@@ -53,9 +46,9 @@ class TestDomainManager(unittest.TestCase):
         with event_subscribers(self._record_event):
             domain = self._manager.add('example.org')
         self.assertEqual(len(self._events), 2)
-        self.assertTrue(isinstance(self._events[0], DomainCreatingEvent))
+        self.assertIsInstance(self._events[0], DomainCreatingEvent)
         self.assertEqual(self._events[0].mail_host, 'example.org')
-        self.assertTrue(isinstance(self._events[1], DomainCreatedEvent))
+        self.assertIsInstance(self._events[1], DomainCreatedEvent)
         self.assertEqual(self._events[1].domain, domain)
 
     def test_delete_domain_event(self):
@@ -65,9 +58,9 @@ class TestDomainManager(unittest.TestCase):
         with event_subscribers(self._record_event):
             self._manager.remove('example.org')
         self.assertEqual(len(self._events), 2)
-        self.assertTrue(isinstance(self._events[0], DomainDeletingEvent))
+        self.assertIsInstance(self._events[0], DomainDeletingEvent)
         self.assertEqual(self._events[0].domain, domain)
-        self.assertTrue(isinstance(self._events[1], DomainDeletedEvent))
+        self.assertIsInstance(self._events[1], DomainDeletedEvent)
         self.assertEqual(self._events[1].mail_host, 'example.org')
 
     def test_lookup_missing_domain(self):
@@ -129,7 +122,7 @@ class TestDomainManager(unittest.TestCase):
         self.assertEqual(
             sorted(owner.addresses[0].email for owner in domain.owners),
             ['anne@example.com', 'bart@example.com'])
-        def sort_key(owner):
+        def sort_key(owner):                        # flake8: noqa
             return owner.addresses[0].email
         self.assertEqual(sorted(domain.owners, key=sort_key), [anne, bart])
 
@@ -172,7 +165,6 @@ class TestDomainManager(unittest.TestCase):
                          ['anne@example.org', 'bart@example.net'])
 
 
-
 class TestDomainLifecycleEvents(unittest.TestCase):
     layer = ConfigLayer
 
diff --git a/src/mailman/model/tests/test_listmanager.py b/src/mailman/model/tests/test_listmanager.py
index e26a77419..464ebfc52 100644
--- a/src/mailman/model/tests/test_listmanager.py
+++ b/src/mailman/model/tests/test_listmanager.py
@@ -17,13 +17,6 @@
 
 """Test the ListManager."""
 
-__all__ = [
-    'TestListCreation',
-    'TestListLifecycleEvents',
-    'TestListManager',
-    ]
-
-
 import unittest
 
 from mailman.app.lifecycle import create_list
@@ -46,7 +39,6 @@ from mailman.testing.layers import ConfigLayer
 from zope.component import getUtility
 
 
-
 class TestListManager(unittest.TestCase):
     layer = ConfigLayer
 
@@ -62,9 +54,9 @@ class TestListManager(unittest.TestCase):
         with event_subscribers(self._record_event):
             mlist = getUtility(IListManager).create('test@example.com')
         self.assertEqual(len(self._events), 2)
-        self.assertTrue(isinstance(self._events[0], ListCreatingEvent))
+        self.assertIsInstance(self._events[0], ListCreatingEvent)
         self.assertEqual(self._events[0].fqdn_listname, 'test@example.com')
-        self.assertTrue(isinstance(self._events[1], ListCreatedEvent))
+        self.assertIsInstance(self._events[1], ListCreatedEvent)
         self.assertEqual(self._events[1].mailing_list, mlist)
 
     def test_delete_list_event(self):
@@ -74,9 +66,9 @@ class TestListManager(unittest.TestCase):
         with event_subscribers(self._record_event):
             getUtility(IListManager).delete(mlist)
         self.assertEqual(len(self._events), 2)
-        self.assertTrue(isinstance(self._events[0], ListDeletingEvent))
+        self.assertIsInstance(self._events[0], ListDeletingEvent)
         self.assertEqual(self._events[0].mailing_list, mlist)
-        self.assertTrue(isinstance(self._events[1], ListDeletedEvent))
+        self.assertIsInstance(self._events[1], ListDeletedEvent)
         self.assertEqual(self._events[1].fqdn_listname, 'another@example.com')
 
     def test_list_manager_list_ids(self):
@@ -112,7 +104,6 @@ class TestListManager(unittest.TestCase):
         self.assertIsNone(list_manager.get('ant@example.com'))
 
 
-
 class TestListLifecycleEvents(unittest.TestCase):
     layer = ConfigLayer
 
@@ -137,8 +128,8 @@ class TestListLifecycleEvents(unittest.TestCase):
         # We deleted the ant@example.com mailing list.  Anne's and Bart's
         # membership in this list should now be removed, but Anne's membership
         # in bee@example.com should still exist.
-        self.assertEqual(service.get_member(anne_ant_id), None)
-        self.assertEqual(service.get_member(bart_ant_id), None)
+        self.assertIsNone(service.get_member(anne_ant_id))
+        self.assertIsNone(service.get_member(bart_ant_id))
         self.assertEqual(service.get_member(anne_bee_id), anne_bee)
 
     def test_requests_are_deleted_when_mailing_list_is_deleted(self):
@@ -171,11 +162,10 @@ Message-ID: <argon>
             setattr(self._ant, name, ['test-filter-1', 'test-filter-2'])
         getUtility(IListManager).delete(self._ant)
         filters = config.db.store.query(ContentFilter).filter_by(
-            mailing_list = self._ant)
+            mailing_list=self._ant)
         self.assertEqual(filters.count(), 0)
 
 
-
 class TestListCreation(unittest.TestCase):
     layer = ConfigLayer
 
diff --git a/src/mailman/model/tests/test_mailinglist.py b/src/mailman/model/tests/test_mailinglist.py
index 67693fb4b..c9aecc93b 100644
--- a/src/mailman/model/tests/test_mailinglist.py
+++ b/src/mailman/model/tests/test_mailinglist.py
@@ -17,14 +17,6 @@
 
 """Test MailingLists and related model objects.."""
 
-__all__ = [
-    'TestAcceptableAliases',
-    'TestDisabledListArchiver',
-    'TestListArchiver',
-    'TestMailingList',
-    ]
-
-
 import unittest
 
 from mailman.app.lifecycle import create_list
@@ -96,8 +88,7 @@ class TestMailingList(unittest.TestCase):
         user.preferred_address = address
         self._mlist.subscribe(user)
         # The welcome message was sent to the preferred address.
-        items = get_queue_messages('virgin')
-        self.assertEqual(len(items), 1)
+        items = get_queue_messages('virgin', expected_count=1)
         self.assertIn('Anne Person <aperson@example.com>',
                       items[0].msg.get_payload())
 
@@ -204,7 +195,7 @@ class TestHeaderMatch(unittest.TestCase):
         header_matches = IHeaderMatchList(self._mlist)
         header_matches.append('header', 'pattern')
         self.assertEqual(len(self._mlist.header_matches), 1)
-        self.assertEqual(self._mlist.header_matches[0].chain, None)
+        self.assertIsNone(self._mlist.header_matches[0].chain)
 
     def test_duplicate(self):
         header_matches = IHeaderMatchList(self._mlist)
@@ -241,11 +232,11 @@ class TestHeaderMatch(unittest.TestCase):
                    for match in IHeaderMatchList(self._mlist)]
         self.assertEqual(
             matches, [
-            ('header', 'pattern', None),
-            ('subject', 'patt.*', None),
-            ('from', '.*@example.com', 'discard'),
-            ('from', '.*@example.org', 'accept'),
-            ])
+                ('header', 'pattern', None),
+                ('subject', 'patt.*', None),
+                ('from', '.*@example.com', 'discard'),
+                ('from', '.*@example.org', 'accept'),
+                ])
 
     def test_clear(self):
         header_matches = IHeaderMatchList(self._mlist)
@@ -286,21 +277,21 @@ class TestHeaderMatch(unittest.TestCase):
         header_matches.append('header-3', 'pattern')
         self.assertEqual(
             [(match.header, match.position) for match in header_matches], [
-            ('header-0', 0),
-            ('header-1', 1),
-            ('header-2', 2),
-            ('header-3', 3),
-            ])
+                ('header-0', 0),
+                ('header-1', 1),
+                ('header-2', 2),
+                ('header-3', 3),
+                ])
         header_match_2 = self._mlist.header_matches[2]
         self.assertEqual(header_match_2.position, 2)
         header_match_2.position = 1
         self.assertEqual(
             [(match.header, match.position) for match in header_matches], [
-            ('header-0', 0),
-            ('header-2', 1),
-            ('header-1', 2),
-            ('header-3', 3),
-            ])
+                ('header-0', 0),
+                ('header-2', 1),
+                ('header-1', 2),
+                ('header-3', 3),
+                ])
 
     def test_move_down(self):
         header_matches = IHeaderMatchList(self._mlist)
@@ -310,21 +301,21 @@ class TestHeaderMatch(unittest.TestCase):
         header_matches.append('header-3', 'pattern')
         self.assertEqual(
             [(match.header, match.position) for match in header_matches], [
-            ('header-0', 0),
-            ('header-1', 1),
-            ('header-2', 2),
-            ('header-3', 3),
-            ])
+                ('header-0', 0),
+                ('header-1', 1),
+                ('header-2', 2),
+                ('header-3', 3),
+                ])
         header_match_1 = self._mlist.header_matches[1]
         self.assertEqual(header_match_1.position, 1)
         header_match_1.position = 2
         self.assertEqual(
             [(match.header, match.position) for match in header_matches], [
-            ('header-0', 0),
-            ('header-2', 1),
-            ('header-1', 2),
-            ('header-3', 3),
-            ])
+                ('header-0', 0),
+                ('header-2', 1),
+                ('header-1', 2),
+                ('header-3', 3),
+                ])
 
     def test_move_identical(self):
         header_matches = IHeaderMatchList(self._mlist)
@@ -333,19 +324,19 @@ class TestHeaderMatch(unittest.TestCase):
         header_matches.append('header-2', 'pattern')
         self.assertEqual(
             [(match.header, match.position) for match in header_matches], [
-            ('header-0', 0),
-            ('header-1', 1),
-            ('header-2', 2),
-            ])
+                ('header-0', 0),
+                ('header-1', 1),
+                ('header-2', 2),
+                ])
         header_match_1 = self._mlist.header_matches[1]
         self.assertEqual(header_match_1.position, 1)
         header_match_1.position = 1
         self.assertEqual(
             [(match.header, match.position) for match in header_matches], [
-            ('header-0', 0),
-            ('header-1', 1),
-            ('header-2', 2),
-            ])
+                ('header-0', 0),
+                ('header-1', 1),
+                ('header-2', 2),
+                ])
 
     def test_move_negative(self):
         header_matches = IHeaderMatchList(self._mlist)
@@ -367,16 +358,16 @@ class TestHeaderMatch(unittest.TestCase):
         header_matches.append('header-1', 'pattern')
         self.assertEqual(
             [(match.header, match.position) for match in header_matches], [
-            ('header-0', 0),
-            ('header-1', 1),
-            ])
+                ('header-0', 0),
+                ('header-1', 1),
+                ])
         header_matches.insert(1, 'header-2', 'pattern')
         self.assertEqual(
             [(match.header, match.position) for match in header_matches], [
-            ('header-0', 0),
-            ('header-2', 1),
-            ('header-1', 2),
-            ])
+                ('header-0', 0),
+                ('header-2', 1),
+                ('header-1', 2),
+                ])
 
     def test_rebuild_sequence_after_remove(self):
         header_matches = IHeaderMatchList(self._mlist)
@@ -385,16 +376,16 @@ class TestHeaderMatch(unittest.TestCase):
         header_matches.append('header-2', 'pattern')
         self.assertEqual(
             [(match.header, match.position) for match in header_matches], [
-            ('header-0', 0),
-            ('header-1', 1),
-            ('header-2', 2),
-            ])
+                ('header-0', 0),
+                ('header-1', 1),
+                ('header-2', 2),
+                ])
         del header_matches[0]
         self.assertEqual(
             [(match.header, match.position) for match in header_matches], [
-            ('header-1', 0),
-            ('header-2', 1),
-            ])
+                ('header-1', 0),
+                ('header-2', 1),
+                ])
         header_matches.remove('header-1', 'pattern')
         self.assertEqual(
             [(match.header, match.position) for match in header_matches],
diff --git a/src/mailman/model/tests/test_member.py b/src/mailman/model/tests/test_member.py
index 03a2ee9a0..f34b2c7cf 100644
--- a/src/mailman/model/tests/test_member.py
+++ b/src/mailman/model/tests/test_member.py
@@ -17,11 +17,6 @@
 
 """Test members."""
 
-__all__ = [
-    'TestMember',
-    ]
-
-
 import unittest
 
 from mailman.app.lifecycle import create_list
@@ -35,7 +30,6 @@ from mailman.utilities.datetime import now
 from zope.component import getUtility
 
 
-
 class TestMember(unittest.TestCase):
     layer = ConfigLayer
 
diff --git a/src/mailman/model/tests/test_messagestore.py b/src/mailman/model/tests/test_messagestore.py
index 998fa36c0..8976fd9bd 100644
--- a/src/mailman/model/tests/test_messagestore.py
+++ b/src/mailman/model/tests/test_messagestore.py
@@ -17,11 +17,6 @@
 
 """Test the message store."""
 
-__all__ = [
-    'TestMessageStore',
-    ]
-
-
 import os
 import unittest
 
@@ -35,7 +30,6 @@ from mailman.utilities.email import add_message_hash
 from zope.component import getUtility
 
 
-
 class TestMessageStore(unittest.TestCase):
     layer = ConfigLayer
 
diff --git a/src/mailman/model/tests/test_pending.py b/src/mailman/model/tests/test_pending.py
index 46b0729bf..feb921796 100644
--- a/src/mailman/model/tests/test_pending.py
+++ b/src/mailman/model/tests/test_pending.py
@@ -17,11 +17,6 @@
 
 """Test pendings."""
 
-__all__ = [
-    'TestPendings',
-    ]
-
-
 import unittest
 
 from mailman.app.lifecycle import create_list
@@ -38,7 +33,6 @@ class SimplePendable(dict):
     PEND_TYPE = 'simple'
 
 
-
 class TestPendings(unittest.TestCase):
     """Test pendings."""
 
diff --git a/src/mailman/model/tests/test_requests.py b/src/mailman/model/tests/test_requests.py
index 37fc2d659..8525b725a 100644
--- a/src/mailman/model/tests/test_requests.py
+++ b/src/mailman/model/tests/test_requests.py
@@ -17,11 +17,6 @@
 
 """Test the various pending requests interfaces."""
 
-__all__ = [
-    'TestRequests',
-    ]
-
-
 import unittest
 
 from mailman.app.lifecycle import create_list
@@ -31,7 +26,6 @@ from mailman.testing.helpers import specialized_message_from_string as mfs
 from mailman.testing.layers import ConfigLayer
 
 
-
 class TestRequests(unittest.TestCase):
     layer = ConfigLayer
 
diff --git a/src/mailman/model/tests/test_roster.py b/src/mailman/model/tests/test_roster.py
index 8264a7be8..4f6ab590a 100644
--- a/src/mailman/model/tests/test_roster.py
+++ b/src/mailman/model/tests/test_roster.py
@@ -17,13 +17,6 @@
 
 """Test rosters."""
 
-__all__ = [
-    'TestMailingListRoster',
-    'TestMembershipsRoster',
-    'TestUserRoster',
-    ]
-
-
 import unittest
 
 from mailman.app.lifecycle import create_list
@@ -36,7 +29,6 @@ from mailman.testing.layers import ConfigLayer
 from zope.component import getUtility
 
 
-
 class TestMailingListRoster(unittest.TestCase):
     """Test various aspects of a mailing list's roster."""
 
@@ -129,7 +121,6 @@ class TestMailingListRoster(unittest.TestCase):
         self.assertEqual(self._mlist.subscribers.member_count, 4)
 
 
-
 class TestMembershipsRoster(unittest.TestCase):
     """Test the memberships roster."""
 
@@ -207,7 +198,6 @@ class TestMembershipsRoster(unittest.TestCase):
         self.assertEqual(users[0], self._anne)
 
 
-
 class TestUserRoster(unittest.TestCase):
     """Test aspects of rosters when users are subscribed."""
 
diff --git a/src/mailman/model/tests/test_subscriptions.py b/src/mailman/model/tests/test_subscriptions.py
index 6f9f983d5..6b884b22f 100644
--- a/src/mailman/model/tests/test_subscriptions.py
+++ b/src/mailman/model/tests/test_subscriptions.py
@@ -17,11 +17,6 @@
 
 """Test the subscription service."""
 
-__all__ = [
-    'TestSubscriptionService',
-    ]
-
-
 import unittest
 
 from mailman.app.lifecycle import create_list
diff --git a/src/mailman/model/tests/test_uid.py b/src/mailman/model/tests/test_uid.py
index 1c895cf94..088851b6a 100644
--- a/src/mailman/model/tests/test_uid.py
+++ b/src/mailman/model/tests/test_uid.py
@@ -17,11 +17,6 @@
 
 """Test the UID model class."""
 
-__all__ = [
-    'TestUID',
-    ]
-
-
 import uuid
 import unittest
 
@@ -32,7 +27,6 @@ from mailman.testing.layers import ConfigLayer
 from zope.component import getUtility
 
 
-
 class TestUID(unittest.TestCase):
     layer = ConfigLayer
 
diff --git a/src/mailman/model/tests/test_user.py b/src/mailman/model/tests/test_user.py
index 8648e0fd3..7c8a3581e 100644
--- a/src/mailman/model/tests/test_user.py
+++ b/src/mailman/model/tests/test_user.py
@@ -17,11 +17,6 @@
 
 """Test users."""
 
-__all__ = [
-    'TestUser',
-    ]
-
-
 import unittest
 
 from mailman.app.lifecycle import create_list
@@ -37,7 +32,6 @@ from mailman.testing.layers import ConfigLayer
 from zope.component import getUtility
 
 
-
 class TestUser(unittest.TestCase):
     """Test users."""
 
diff --git a/src/mailman/model/tests/test_usermanager.py b/src/mailman/model/tests/test_usermanager.py
index 812a111e4..8855b106a 100644
--- a/src/mailman/model/tests/test_usermanager.py
+++ b/src/mailman/model/tests/test_usermanager.py
@@ -17,11 +17,6 @@
 
 """Test the IUserManager implementation."""
 
-__all__ = [
-    'TestUserManager',
-    ]
-
-
 import unittest
 
 from mailman.app.lifecycle import create_list
@@ -35,7 +30,6 @@ from mailman.utilities.datetime import now
 from zope.component import getUtility
 
 
-
 class TestUserManager(unittest.TestCase):
     layer = ConfigLayer
 
diff --git a/src/mailman/model/tests/test_workflow.py b/src/mailman/model/tests/test_workflow.py
index 2edfac69f..4c8c6776f 100644
--- a/src/mailman/model/tests/test_workflow.py
+++ b/src/mailman/model/tests/test_workflow.py
@@ -17,11 +17,6 @@
 
 """Test the workflow model."""
 
-__all__ = [
-    'TestWorkflow',
-    ]
-
-
 import unittest
 
 from mailman.interfaces.workflow import IWorkflowStateManager
@@ -29,7 +24,6 @@ from mailman.testing.layers import ConfigLayer
 from zope.component import getUtility
 
 
-
 class TestWorkflow(unittest.TestCase):
     layer = ConfigLayer