traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename the unittest test_suite function to not clash with a test module name (unittest.test.test_suite is now unambiguous).

This commit is contained in:
Michael Foord 2010-03-27 13:42:34 +00:00
parent ff889396a8
commit b35ecf4775
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/test_unittest.py
View File

@ -4,7 +4,7 @@ from test import test_support
def test_main(): def test_main():
test_support.run_unittest(unittest.test.test_suite()) test_support.run_unittest(unittest.test.suite())
test_support.reap_children() test_support.reap_children()

4
Lib/unittest/test/__init__.py
View File

@ -6,7 +6,7 @@ import unittest
here = os.path.dirname(__file__) here = os.path.dirname(__file__)
loader = unittest.defaultTestLoader loader = unittest.defaultTestLoader
def test_suite(): def suite():
suite = unittest.TestSuite() suite = unittest.TestSuite()
for fn in os.listdir(here): for fn in os.listdir(here):
if fn.startswith("test") and fn.endswith(".py"): if fn.startswith("test") and fn.endswith(".py"):
@ -18,4 +18,4 @@ def test_suite():
if __name__ == "__main__": if __name__ == "__main__":
unittest.main(defaultTest="test_suite") unittest.main(defaultTest="suite")