Normalize suite construction.

zopefoundation · Feb 22, 2015 · 136d786 · 136d786
1 parent 5591e01
commit 136d786
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/src/zope/tal/tests/test_htmltalparser.py b/src/zope/tal/tests/test_htmltalparser.py
@@ -1014,7 +1014,8 @@ def test_i18n_name_with_tal_content(self):
 
 
 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
@@ -121,5 +121,4 @@ def test_dynamic_msgids(self):
 
 
 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
@@ -848,19 +848,19 @@ def test_define_slot_restores_source_file_if_no_exception(self):
 
 
 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),
+    ))