[Python-checkins] distutils2: make sure we have a global, up-to-date distutils.tests.verbose flag

[tarek.ziade]

tarek.ziade pushed fabe7c59979a to distutils2:

http://hg.python.org/distutils2/rev/fabe7c59979a
changeset:   145:fabe7c59979a
user:        Tarek Ziade <tarek at ziade.org>
date:        Wed May 12 17:47:30 2010 +0200
summary:     make sure we have a global, up-to-date distutils.tests.verbose flag
files:       src/distutils2/tests/__init__.py, src/runtests.py

diff --git a/src/distutils2/tests/__init__.py b/src/distutils2/tests/__init__.py
--- a/src/distutils2/tests/__init__.py
+++ b/src/distutils2/tests/__init__.py
@@ -20,6 +20,7 @@
 
 here = os.path.dirname(__file__)
 
+verbose = 1
 
 def test_suite():
     suite = unittest2.TestSuite()
@@ -46,10 +47,12 @@
         return result
 
 
-def _run_suite(suite, verbose=1):
+def _run_suite(suite, verbose_=1):
     """Run tests from a unittest2.TestSuite-derived class."""
-    if verbose:
-        runner = unittest2.TextTestRunner(sys.stdout, verbose=2)
+    global verbose
+    verbose = verbose_
+    if verbose_:
+        runner = unittest2.TextTestRunner(sys.stdout, verbosity=2)
     else:
         runner = BasicTestRunner()
 
@@ -64,7 +67,7 @@
         raise TestFailed(err)
 
 
-def run_unittest(classes, verbose=1):
+def run_unittest(classes, verbose_=1):
     """Run tests from unittest2.TestCase-derived classes.
 
     Extracted from stdlib test.test_support and modified to support unittest2.
@@ -81,7 +84,7 @@
             suite.addTest(cls)
         else:
             suite.addTest(unittest2.makeSuite(cls))
-    _run_suite(suite, verbose)
+    _run_suite(suite, verbose_)
 
 
 def reap_children():
diff --git a/src/runtests.py b/src/runtests.py
--- a/src/runtests.py
+++ b/src/runtests.py
@@ -16,7 +16,7 @@
         verbose = 1
 
     run_unittest([distutils2.tests.test_suite(), btest_suite()],
-                 verbose=verbose)
+                 verbose_=verbose)
     reap_children()
 
 if __name__ == "__main__":

--
Repository URL: http://hg.python.org/distutils2