[Python-checkins] r79468 - in python/trunk/Lib: test/test_unittest.py unittest/test/init.py

Sat Mar 27 14:42:35 CET 2010

Author: michael.foord
Date: Sat Mar 27 14:42:34 2010
New Revision: 79468
Log:
Rename the unittest test_suite function to not clash with a test module name (unittest.test.test_suite is now unambiguous).
Modified:
 python/trunk/Lib/test/test_unittest.py
 python/trunk/Lib/unittest/test/__init__.py
Modified: python/trunk/Lib/test/test_unittest.py
==============================================================================

--- python/trunk/Lib/test/test_unittest.py	(original)
+++ python/trunk/Lib/test/test_unittest.py	Sat Mar 27 14:42:34 2010
@@ -4,7 +4,7 @@
 
 
 def test_main():
- test_support.run_unittest(unittest.test.test_suite())
+ test_support.run_unittest(unittest.test.suite())
 test_support.reap_children()
 
 
Modified: python/trunk/Lib/unittest/test/__init__.py
==============================================================================
--- python/trunk/Lib/unittest/test/__init__.py	(original)
+++ python/trunk/Lib/unittest/test/__init__.py	Sat Mar 27 14:42:34 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")


[Python-checkins] r79468 - in python/trunk/Lib: test/test_unittest.py unittest/test/__init__.py

[Python-checkins] r79468 - in python/trunk/Lib: test/test_unittest.py unittest/test/init.py