Rename the unittest test_suite function to not clash with a test module name (unittes...

diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py
index 1e2b323a5fb4481b20c305055306925d41c5dbf7..86a998b6f4441ee371ea989d129d6b6b01cd2545 100644 (file)
--- 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 c0548e93e51fabdd4e7c5742db6e970f7d382f7e..99b730b1546ee432c2c502075a669910bd95e17f 100644 (file)
--- 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")