mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-06 15:11:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merged revisions 80918 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Michael Foord 2010-05-07 15:35:24 +00:00
parent dd3820f275
commit 4a8cf3c50b
2 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/unittest/main.py
View file

@ -70,10 +70,10 @@ class TestProgram(object):
# defaults for testing # defaults for testing
failfast = catchbreak = buffer = None 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): if isinstance(module, str):
self.module = __import__(module) self.module = __import__(module)
for part in module.split('.')[1:]: for part in module.split('.')[1:]:

17
Lib/unittest/test/test_program.py
View file

@ -1,10 +1,27 @@
import io import io
import os
import unittest import unittest
class Test_TestProgram(unittest.TestCase): 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 # Horrible white box test
def testNoExit(self): def testNoExit(self):
result = object() result = object()