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).
........

diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py
index 4016b7531a87a1d7920b3879b14f7740da8b7705..7059c431634c68c374f806034d59bb2a520c12d0 100644 (file)
--- 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 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")