From 989fd6673efff176aa970bec51c857f64a25343b Mon Sep 17 00:00:00 2001
From: Stefan van der Walt <stefan@sun.ac.za>
Date: Mon, 7 Nov 2011 14:45:26 -0800
Subject: [PATCH] ENH: Add verbose test function.

---
 skimage/__init__.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/skimage/__init__.py b/skimage/__init__.py
index 8acd0977..420d8e26 100644
--- a/skimage/__init__.py
+++ b/skimage/__init__.py
@@ -8,11 +8,13 @@ data_dir = _osp.join(pkg_dir, 'data')
 
 from version import version as __version__
 
-def _setup_test():
+def _setup_test(verbose=False):
     import gzip
     import functools
 
-    args = ['', '--exe', '-w', '%s' % pkg_dir]
+    args = ['', '--exe', '-w', pkg_dir]
+    if verbose:
+        args.extend(['-v', '-s'])
 
     try:
         import nose as _nose
@@ -20,12 +22,18 @@ def _setup_test():
         print("Could not load nose.  Unit tests not available.")
         return None
     else:
-        return functools.partial(_nose.run, 'skimage', argv=args)
+        f = functools.partial(_nose.run, 'skimage', argv=args)
+        f.__doc__ = 'Invoke the skimage test suite.'
+        return f
 
 test = _setup_test()
 if test is None:
     del test
 
+test_verbose = _setup_test(verbose=True)
+if test_verbose is None:
+    del test
+
 def get_log(name):
     """Return a console logger.