From bf1fab4aa0b73376af66f3e42b4329d353c53629 Mon Sep 17 00:00:00 2001 From: Michael Foord Date: Sat, 27 Mar 2010 13:45:04 +0000 Subject: Merged revisions 79468 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79468 | michael.foord | 2010-03-27 13:42:34 +0000 (Sat, 27 Mar 2010) | 1 line Rename the unittest test_suite function to not clash with a test module name (unittest.test.test_suite is now unambiguous). ........ --- Lib/test/test_unittest.py | 3 +-- Lib/unittest/test/__init__.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py index 4016b75..7059c43 100644 --- a/Lib/test/test_unittest.py +++ b/Lib/test/test_unittest.py @@ -4,9 +4,8 @@ from test import support def test_main(): - support.run_unittest(unittest.test.test_suite()) + support.run_unittest(unittest.test.suite()) support.reap_children() - if __name__ == "__main__": test_main() diff --git a/Lib/unittest/test/__init__.py b/Lib/unittest/test/__init__.py index c0548e9..99b730b 100644 --- a/Lib/unittest/test/__init__.py +++ b/Lib/unittest/test/__init__.py @@ -6,7 +6,7 @@ import unittest here = os.path.dirname(__file__) loader = unittest.defaultTestLoader -def test_suite(): +def suite(): suite = unittest.TestSuite() for fn in os.listdir(here): if fn.startswith("test") and fn.endswith(".py"): @@ -18,4 +18,4 @@ def test_suite(): if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest.main(defaultTest="suite") -- cgit v0.12