Merged revisions 80918 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80918 | michael.foord | 2010-05-07 17:34:08 +0200 (Fri, 07 May 2010) | 1 line

  Adding a test for unittest test discovery with dotted path name.
........

Lib/unittest/main.py

@@ -70,10 +70,10 @@ class TestProgram(object):
     # defaults for testing
     failfast = catchbreak = buffer = None
 
-    def __init__(self, module='__main__', defaultTest=None,
+    def __init__(self, module='__main__', defaultTest=None, argv=None,
-                 argv=None, testRunner=None,
+                    testRunner=None, testLoader=loader.defaultTestLoader,
-                 testLoader=loader.defaultTestLoader, exit=True,
+                    exit=True, verbosity=1, failfast=None, catchbreak=None,
-                 verbosity=1, failfast=None, catchbreak=None, buffer=None):
+                    buffer=None):
         if isinstance(module, str):
             self.module = __import__(module)
             for part in module.split('.')[1:]:

Lib/unittest/test/test_program.py

@@ -1,10 +1,27 @@
 import io
 
+import os
 import unittest
 
 
 class Test_TestProgram(unittest.TestCase):
 
+    def test_discovery_from_dotted_path(self):
+        loader = unittest.TestLoader()
+
+        tests = [self]
+        expectedPath = os.path.abspath(os.path.dirname(unittest.test.__file__))
+
+        self.wasRun = False
+        def _find_tests(start_dir, pattern):
+            self.wasRun = True
+            self.assertEqual(start_dir, expectedPath)
+            return tests
+        loader._find_tests = _find_tests
+        suite = loader.discover('unittest.test')
+        self.assertTrue(self.wasRun)
+        self.assertEqual(suite._tests, tests)
+
     # Horrible white box test
     def testNoExit(self):
         result = object()