diff options
author | Michael Foord <fuzzyman@voidspace.org.uk> | 2010-05-07 15:34:08 (GMT) |
---|---|---|
committer | Michael Foord <fuzzyman@voidspace.org.uk> | 2010-05-07 15:34:08 (GMT) |
commit | 215d394b82ef1fdf6e42a7614899eaf124ac836f (patch) | |
tree | 246906458c5351fc1602a3292d6a4c4b17b890f0 /Lib/unittest | |
parent | d1e696b60f9752221e1d086a4fd40c36b540ad05 (diff) | |
download | cpython-215d394b82ef1fdf6e42a7614899eaf124ac836f.zip cpython-215d394b82ef1fdf6e42a7614899eaf124ac836f.tar.gz cpython-215d394b82ef1fdf6e42a7614899eaf124ac836f.tar.bz2 |
Adding a test for unittest test discovery with dotted path name.
Diffstat (limited to 'Lib/unittest')
-rw-r--r-- | Lib/unittest/main.py | 8 | ||||
-rw-r--r-- | Lib/unittest/test/test_program.py | 17 |
2 files changed, 21 insertions, 4 deletions
diff --git a/Lib/unittest/main.py b/Lib/unittest/main.py index 747aad2..74d875c 100644 --- a/Lib/unittest/main.py +++ b/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, - argv=None, testRunner=None, - testLoader=loader.defaultTestLoader, exit=True, - verbosity=1, failfast=None, catchbreak=None, buffer=None): + def __init__(self, module='__main__', defaultTest=None, argv=None, + testRunner=None, testLoader=loader.defaultTestLoader, + exit=True, verbosity=1, failfast=None, catchbreak=None, + buffer=None): if isinstance(module, basestring): self.module = __import__(module) for part in module.split('.')[1:]: diff --git a/Lib/unittest/test/test_program.py b/Lib/unittest/test/test_program.py index a3934dd..cd14187 100644 --- a/Lib/unittest/test/test_program.py +++ b/Lib/unittest/test/test_program.py @@ -1,10 +1,27 @@ from cStringIO import StringIO +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() |