mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge

Browse source
This commit is contained in:
Michael Foord 2013-02-11 13:29:58 +00:00
commit b71b8ec7b1
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/unittest/main.py
View file

@ -222,7 +222,7 @@ class TestProgram(object):
def _do_discovery(self, argv, Loader=None):
if Loader is None:
Loader = self.testLoader
Loader = lambda: self.testLoader
# handle command line args for test discovery
self.progName = '%s discover' % self.progName

2
Lib/unittest/test/test_discovery.py
View file

@ -269,7 +269,7 @@ class TestDiscovery(unittest.TestCase):
self.args.append((start_dir, pattern, top_level_dir))
return 'tests'
program.testLoader = Loader
program.testLoader = Loader()
program._do_discovery(['-v'])
self.assertEqual(Loader.args, [('.', 'test*.py', None)])