Remove extraneous `test_suite()` functions. zope.testrunner will

automatically do the right thing in most cases.  Keep test_suite() in
test_documentation.py since these dynamically set up docs tests properly.

Refactor test_passwords.py so that base class tests aren't bogusly run.  Also,
remove test_membership.py which was essentially disabled because it was
testing the MM2 membership API.

5 files changed, 0 insertions, 46 deletions

diff --git a/src/mailman/app/tests/test_bounces.py b/src/mailman/app/tests/test_bounces.py
index 3a39b756a..1646e02ae 100644
--- a/src/mailman/app/tests/test_bounces.py
+++ b/src/mailman/app/tests/test_bounces.py
@@ -21,7 +21,6 @@ from __future__ import absolute_import, unicode_literals
 
 __metaclass__ = type
 __all__ = [
-    'test_suite',
     ]
 
 
@@ -499,14 +498,3 @@ Message-ID: <first>
         # recipients of this message.
         self.assertEqual(items[0].msgdata['recipients'],
                          set(['postmaster@example.com',]))
-
-
-
-def test_suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestMaybeForward))
-    suite.addTest(unittest.makeSuite(TestProbe))
-    suite.addTest(unittest.makeSuite(TestSendProbe))
-    suite.addTest(unittest.makeSuite(TestSendProbeNonEnglish))
-    suite.addTest(unittest.makeSuite(TestVERP))
-    return suite
diff --git a/src/mailman/app/tests/test_inject.py b/src/mailman/app/tests/test_inject.py
index b395eb989..c03167e1a 100644
--- a/src/mailman/app/tests/test_inject.py
+++ b/src/mailman/app/tests/test_inject.py
@@ -21,7 +21,6 @@ from __future__ import absolute_import, unicode_literals
 
 __metaclass__ = type
 __all__ = [
-    'test_suite',
     ]
 
 
@@ -209,11 +208,3 @@ Nothing.
         items = get_queue_messages('in')
         self.assertEqual(items[0].msgdata['foo'], 'yes')
         self.assertEqual(items[0].msgdata['bar'], 'no')
-
-
-
-def test_suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestInjectMessage))
-    suite.addTest(unittest.makeSuite(TestInjectText))
-    return suite
diff --git a/src/mailman/app/tests/test_membership.py b/src/mailman/app/tests/test_membership.py
index 0e8225f3a..8222dc56c 100644
--- a/src/mailman/app/tests/test_membership.py
+++ b/src/mailman/app/tests/test_membership.py
@@ -21,7 +21,6 @@ from __future__ import absolute_import, unicode_literals
 
 __metaclass__ = type
 __all__ = [
-    'test_suite',
     ]
 
 
@@ -197,11 +196,3 @@ class AddMemberPasswordTest(unittest.TestCase):
                             system_preferences.preferred_language)
         self.assertEqual(
             member.user.password, '{SHA}qZk-NkcGgWq6PiVxeFDCbJzQ2J0=')
-
-
-
-def test_suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(AddMemberTest))
-    suite.addTest(unittest.makeSuite(AddMemberPasswordTest))
-    return suite
diff --git a/src/mailman/app/tests/test_moderation.py b/src/mailman/app/tests/test_moderation.py
index c96430c64..a907b40dd 100644
--- a/src/mailman/app/tests/test_moderation.py
+++ b/src/mailman/app/tests/test_moderation.py
@@ -21,7 +21,6 @@ from __future__ import absolute_import, unicode_literals
 
 __metaclass__ = type
 __all__ = [
-    'test_suite',
     ]
 
 
@@ -96,10 +95,3 @@ Message-ID: <alpha>
         # envelope.
         self.assertEqual(message['x-mailfrom'], 'test-bounces@example.com')
         self.assertEqual(message['x-rcptto'], 'bart@example.com')
-
-
-
-def test_suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestModeration))
-    return suite
diff --git a/src/mailman/app/tests/test_subscriptions.py b/src/mailman/app/tests/test_subscriptions.py
index 861551a03..a906e0ec5 100644
--- a/src/mailman/app/tests/test_subscriptions.py
+++ b/src/mailman/app/tests/test_subscriptions.py
@@ -21,7 +21,6 @@ from __future__ import absolute_import, unicode_literals
 
 __metaclass__ = type
 __all__ = [
-    'test_suite',
     ]
 
 
@@ -67,10 +66,3 @@ class TestJoin(unittest.TestCase):
             self.assertEqual(exc.address, 'bogus')
         else:
             raise AssertionError('InvalidEmailAddressError expected')
-
-
-
-def test_suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestJoin))
-    return suite