From b35ecf47755b23be95657df7d80fe5fcfe261671 Mon Sep 17 00:00:00 2001 From: Michael Foord Date: Sat, 27 Mar 2010 13:42:34 +0000 Subject: 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 | 2 +- Lib/unittest/test/__init__.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py index 1e2b323..86a998b 100644 --- a/Lib/test/test_unittest.py +++ b/Lib/test/test_unittest.py @@ -4,7 +4,7 @@ from test import test_support def test_main(): - test_support.run_unittest(unittest.test.test_suite()) + test_support.run_unittest(unittest.test.suite()) test_support.reap_children() 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