diff --git a/bob/bio/base/test/test_scripts.py b/bob/bio/base/test/test_scripts.py index e5e80510ceda4d8556638762fa8b51b5196b470f..3c8ede47a8446f155e63e7906ac13c4067f32251 100644 --- a/bob/bio/base/test/test_scripts.py +++ b/bob/bio/base/test/test_scripts.py @@ -5,7 +5,6 @@ from __future__ import print_function import bob.measure import os -import sys import shutil import tempfile import numpy @@ -21,24 +20,6 @@ import pkg_resources regenerate_reference = False -# based on: http://stackoverflow.com/questions/6796492/temporarily-redirect-stdout-stderr -class Quiet(object): - def __init__(self): - devnull = open(os.devnull, 'w') - self._stdout = devnull - self._stderr = devnull - - def __enter__(self): - self.old_stdout, self.old_stderr = sys.stdout, sys.stderr - self.old_stdout.flush(); self.old_stderr.flush() - sys.stdout, sys.stderr = self._stdout, self._stderr - - def __exit__(self, exc_type, exc_value, traceback): - self._stdout.flush(); self._stderr.flush() - sys.stdout = self.old_stdout - sys.stderr = self.old_stderr - - dummy_dir = pkg_resources.resource_filename('bob.bio.base', 'test/dummy') data_dir = pkg_resources.resource_filename('bob.bio.base', 'test/data') @@ -325,7 +306,7 @@ def test_grid_search(): '--', '--dry-run', ] from bob.bio.base.script.grid_search import main - with Quiet(): + with utils.Quiet(): main(parameters) # number of jobs should be 12 @@ -347,7 +328,7 @@ def test_grid_search(): '-v', '--', '--dry-run', ] - with Quiet(): + with utils.Quiet(): main(parameters) # number of jobs should be 12 @@ -368,7 +349,7 @@ def test_grid_search(): '--', '--imports', 'bob.io.image', '--dry-run', ] - with Quiet(): + with utils.Quiet(): main(parameters) # number of jobs should be 12 @@ -469,7 +450,7 @@ def test_scripts(): '-E', enroller_file, '-v', ] - with Quiet(): + with utils.Quiet(): score(parameters) finally: diff --git a/bob/bio/base/test/utils.py b/bob/bio/base/test/utils.py index a3e77135768a9fddbae9fdf8b5c07a19f6923c3b..bd1a9ff13957d0d4c08e49733e63cfd854686feb 100644 --- a/bob/bio/base/test/utils.py +++ b/bob/bio/base/test/utils.py @@ -19,10 +19,30 @@ import numpy import os +import sys import functools from nose.plugins.skip import SkipTest +# based on: http://stackoverflow.com/questions/6796492/temporarily-redirect-stdout-stderr +class Quiet(object): + """A class that supports the ``with`` statement to redirect any output of wrapped function calls to /dev/null""" + def __init__(self): + devnull = open(os.devnull, 'w') + self._stdout = devnull + self._stderr = devnull + + def __enter__(self): + self.old_stdout, self.old_stderr = sys.stdout, sys.stderr + self.old_stdout.flush(); self.old_stderr.flush() + sys.stdout, sys.stderr = self._stdout, self._stderr + + def __exit__(self, exc_type, exc_value, traceback): + self._stdout.flush(); self._stderr.flush() + sys.stdout = self.old_stdout + sys.stderr = self.old_stderr + + import logging logger = logging.getLogger("bob.bio.base")