Merged revisions 80974 via svnmerge from

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

........
  r80974 | michael.foord | 2010-05-08 15:20:07 +0200 (Sat, 08 May 2010) | 1 line

  Issue 7780. Adding a test for unittest test discovery from a dotted path.
........

diff --git a/Lib/unittest/test/test_discovery.py b/Lib/unittest/test/test_discovery.py
index ad86a42194ea6ca21aad20245abbd7f230eb3f4c..aa16b1780d40fc7cc6248f0d4024ffbf16df2f2b 100644 (file)
--- a/Lib/unittest/test/test_discovery.py
+++ b/Lib/unittest/test/test_discovery.py
@@ -337,5 +337,22 @@ class TestDiscovery(unittest.TestCase):
         self.assertEqual(sys.path[0], full_path)
 
 
+    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)
+
+
 if __name__ == '__main__':
     unittest.main()