Normalize suite construction.

3 files changed, 22 insertions, 22 deletions

diff --git a/src/zope/tal/tests/test_htmltalparser.py b/src/zope/tal/tests/test_htmltalparser.py
index a07dd10..126b707 100644
--- a/src/zope/tal/tests/test_htmltalparser.py
+++ b/src/zope/tal/tests/test_htmltalparser.py
@@ -1014,7 +1014,8 @@ translated string</span>
 
 
 def test_suite():
-    suite = unittest.makeSuite(HTMLTALParserTestCases)
-    suite.addTest(unittest.makeSuite(METALGeneratorTestCases))
-    suite.addTest(unittest.makeSuite(TALGeneratorTestCases))
-    return suite
+    return unittest.TestSuite((
+        unittest.makeSuite(HTMLTALParserTestCases),
+        unittest.makeSuite(METALGeneratorTestCases),
+        unittest.makeSuite(TALGeneratorTestCases),
+    ))
diff --git a/src/zope/tal/tests/test_talgettext.py b/src/zope/tal/tests/test_talgettext.py
index 03b6d48..472b73f 100644
--- a/src/zope/tal/tests/test_talgettext.py
+++ b/src/zope/tal/tests/test_talgettext.py
@@ -121,5 +121,4 @@ class test_POEngine(unittest.TestCase):
 
 
 def test_suite():
-    suite = unittest.makeSuite(test_POEngine)
-    return suite
+    return unittest.makeSuite(test_POEngine)
diff --git a/src/zope/tal/tests/test_talinterpreter.py b/src/zope/tal/tests/test_talinterpreter.py
index c3f583d..69704eb 100644
--- a/src/zope/tal/tests/test_talinterpreter.py
+++ b/src/zope/tal/tests/test_talinterpreter.py
@@ -848,19 +848,19 @@ class TestErrorTracebacks(TestCaseBase):
 
 
 def test_suite():
-    suite = unittest.makeSuite(I18NErrorsTestCase)
-    suite.addTest(unittest.makeSuite(MacroErrorsTestCase))
-    suite.addTest(unittest.makeSuite(MacroExtendTestCase))
-    suite.addTest(unittest.makeSuite(OutputPresentationTestCase))
-    suite.addTest(unittest.makeSuite(ScriptTestCase))
-    suite.addTest(unittest.makeSuite(I18NCornerTestCaseMessage))
-    suite.addTest(unittest.makeSuite(UnusedExplicitDomainTestCase))
-    suite.addTest(unittest.makeSuite(TestSourceAnnotations))
-    suite.addTest(unittest.makeSuite(TestErrorTracebacks))
-
-    # TODO: Deactivated test, since we have not found a solution for this and
-    # it is a deep and undocumented HTML parser issue.
-    # Fred is looking into this.
-    #suite.addTest(unittest.makeSuite(MacroFunkyErrorTest))
-
-    return suite
+    return unittest.TestSuite((
+        unittest.makeSuite(I18NErrorsTestCase),
+        unittest.makeSuite(MacroErrorsTestCase),
+        unittest.makeSuite(MacroExtendTestCase),
+        unittest.makeSuite(OutputPresentationTestCase),
+        unittest.makeSuite(ScriptTestCase),
+        unittest.makeSuite(I18NCornerTestCaseMessage),
+        unittest.makeSuite(UnusedExplicitDomainTestCase),
+        unittest.makeSuite(TestSourceAnnotations),
+        unittest.makeSuite(TestErrorTracebacks),
+
+        # TODO: Deactivated test, since we have not found a solution for this
+        # and it is a deep and undocumented HTML parser issue.
+        # Fred is looking into this.
+        #unittest.makeSuite(MacroFunkyErrorTest),
+    ))