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

1 files changed, 13 insertions, 10 deletions

diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py
index c77cc16f25..d815a11389 100644
--- a/Lib/test/test_unittest.py
+++ b/Lib/test/test_unittest.py
@@ -3280,19 +3280,22 @@ class Test_TestProgram(TestCase):
 
         runner = FakeRunner()
 
-        try:
-            oldParseArgs = TestProgram.parseArgs
-            TestProgram.parseArgs = lambda *args: None
-            TestProgram.test = test
+        oldParseArgs = TestProgram.parseArgs
+        def restoreParseArgs():
+            TestProgram.parseArgs = oldParseArgs
+        TestProgram.parseArgs = lambda *args: None
+        self.addCleanup(restoreParseArgs)
 
-            program = TestProgram(testRunner=runner, exit=False)
+        def removeTest():
+            del TestProgram.test
+        TestProgram.test = test
+        self.addCleanup(removeTest)
 
-            self.assertEqual(program.result, result)
-            self.assertEqual(runner.test, test)
+        program = TestProgram(testRunner=runner, exit=False, verbosity=2)
 
-        finally:
-            TestProgram.parseArgs = oldParseArgs
-            del TestProgram.test
+        self.assertEqual(program.result, result)
+        self.assertEqual(runner.test, test)
+        self.assertEqual(program.verbosity, 2)
 
 
     class FooBar(unittest.TestCase):