Adds a verbosity keyword argument to unittest.main plus a minor fix allowing you to specify test modules / classes
from the command line.
Closes issue 5995.
Michael Foord
diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py
index c77cc16..d815a11 100644
--- a/Lib/test/test_unittest.py
+++ b/Lib/test/test_unittest.py
@@ -3280,19 +3280,22 @@
runner = FakeRunner()
- try:
- oldParseArgs = TestProgram.parseArgs
- TestProgram.parseArgs = lambda *args: None
- TestProgram.test = test
-
- program = TestProgram(testRunner=runner, exit=False)
-
- self.assertEqual(program.result, result)
- self.assertEqual(runner.test, test)
-
- finally:
+ oldParseArgs = TestProgram.parseArgs
+ def restoreParseArgs():
TestProgram.parseArgs = oldParseArgs
+ TestProgram.parseArgs = lambda *args: None
+ self.addCleanup(restoreParseArgs)
+
+ def removeTest():
del TestProgram.test
+ TestProgram.test = test
+ self.addCleanup(removeTest)
+
+ program = TestProgram(testRunner=runner, exit=False, verbosity=2)
+
+ self.assertEqual(program.result, result)
+ self.assertEqual(runner.test, test)
+ self.assertEqual(program.verbosity, 2)
class FooBar(unittest.TestCase):
diff --git a/Lib/unittest.py b/Lib/unittest.py
index b2dc320..84520d8 100644
--- a/Lib/unittest.py
+++ b/Lib/unittest.py
@@ -1524,7 +1524,8 @@
"""
def __init__(self, module='__main__', defaultTest=None,
argv=None, testRunner=TextTestRunner,
- testLoader=defaultTestLoader, exit=True):
+ testLoader=defaultTestLoader, exit=True,
+ verbosity=1):
if isinstance(module, basestring):
self.module = __import__(module)
for part in module.split('.')[1:]:
@@ -1535,7 +1536,7 @@
argv = sys.argv
self.exit = exit
- self.verbosity = 1
+ self.verbosity = verbosity
self.defaultTest = defaultTest
self.testRunner = testRunner
self.testLoader = testLoader
@@ -1566,6 +1567,7 @@
return
if len(args) > 0:
self.testNames = args
+ self.module = None
else:
self.testNames = (self.defaultTest,)
self.createTests()
@@ -1598,4 +1600,5 @@
##############################################################################
if __name__ == "__main__":
+ sys.modules['unittest'] = sys.modules['__main__']
main(module=None)