[Numpy-svn] r5462 - branches/1.1.x/numpy/testing

[numpy-svn at scipy.org]

Author: charris
Date: 2008-07-20 01:02:19 -0500 (Sun, 20 Jul 2008)
New Revision: 5462

Modified:
   branches/1.1.x/numpy/testing/numpytest.py
Log:
Add verbose keyword to test for compatibility with trunk.


Modified: branches/1.1.x/numpy/testing/numpytest.py
===================================================================
--- branches/1.1.x/numpy/testing/numpytest.py	2008-07-20 05:49:31 UTC (rev 5461)
+++ branches/1.1.x/numpy/testing/numpytest.py	2008-07-20 06:02:19 UTC (rev 5462)
@@ -527,7 +527,7 @@
         all_tests = unittest.TestSuite(suite_list)
         return all_tests
 
-    def test(self, level=1, verbosity=1, all=True, sys_argv=[],
+    def test(self, level=1, verbosity=1, verbose=0, all=True, sys_argv=[],
              testcase_pattern='.*'):
         """Run Numpy module test suite with level and verbosity.
 
@@ -560,6 +560,10 @@
         (with names having prefixes 'check_' or 'bench_'); each of these
         methods are called when running unit tests.
         """
+        # add verbose keyword and make it an alias for verbosity
+        # so that buildbots using newer test framework work.
+        verbosity = max(verbosity, verbose)
+
         if level is None: # Do nothing.
             return