mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-31 07:04:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Test creation moved from TestProgram.parseArgs to TestProgram.createTests exclusively. Issue 6956.

Browse source
This commit is contained in:
Michael Foord 2009-09-27 19:15:41 +00:00
parent 716a9ccd3d
commit d6aabcfe2f
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/unittest/main.py
View file

@ -109,9 +109,9 @@ class TestProgram(object):
if opt in ('-v','--verbose'): if opt in ('-v','--verbose'):
self.verbosity = 2 self.verbosity = 2
if len(args) == 0 and self.defaultTest is None: if len(args) == 0 and self.defaultTest is None:
self.test = self.testLoader.loadTestsFromModule(self.module) # createTests will load tests from self.module
return self.testNames = None
if len(args) > 0: elif len(args) > 0:
self.testNames = args self.testNames = args
if __name__ == '__main__': if __name__ == '__main__':
# to support python -m unittest ... # to support python -m unittest ...
@ -123,6 +123,9 @@ class TestProgram(object):
self.usageExit(msg) self.usageExit(msg)
def createTests(self): def createTests(self):
if self.testNames is None:
self.test = self.testLoader.loadTestsFromModule(self.module)
else:
self.test = self.testLoader.loadTestsFromNames(self.testNames, self.test = self.testLoader.loadTestsFromNames(self.testNames,
self.module) self.module)