[Python-checkins] r79469 - in python/branches/py3k: Lib/test/test_unittest.py Lib/unittest/test/__init__.py

[michael.foord]

Author: michael.foord
Date: Sat Mar 27 14:45:04 2010
New Revision: 79469

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


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/test_unittest.py
   python/branches/py3k/Lib/unittest/test/__init__.py

Modified: python/branches/py3k/Lib/test/test_unittest.py
==============================================================================
--- python/branches/py3k/Lib/test/test_unittest.py	(original)
+++ python/branches/py3k/Lib/test/test_unittest.py	Sat Mar 27 14:45:04 2010
@@ -4,9 +4,8 @@
 
 
 def test_main():
-    support.run_unittest(unittest.test.test_suite())
+    support.run_unittest(unittest.test.suite())
     support.reap_children()
 
-
 if __name__ == "__main__":
     test_main()

Modified: python/branches/py3k/Lib/unittest/test/__init__.py
==============================================================================
--- python/branches/py3k/Lib/unittest/test/__init__.py	(original)
+++ python/branches/py3k/Lib/unittest/test/__init__.py	Sat Mar 27 14:45:04 2010
@@ -6,7 +6,7 @@
 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 @@
 
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    unittest.main(defaultTest="suite")