diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2011-04-08 15:37:53 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2011-04-08 15:37:53 -0400 |
| commit | 73a22b09349a1645d74701941e82215f390d71bb (patch) | |
| tree | 96df6fcce3ee4472ee1cf0021611100878adb196 /gnuradio-core/src/python/gnuradio/gr_xmlrunner.py | |
| parent | 20678e6dc1c2812a6b9abc3a8bf47f368a602f0d (diff) | |
| parent | 21b64f070a3eb38ab044529a6ddd9cd6b6d0a2cb (diff) | |
Merge branch 'constell_obj' into 8psk
Diffstat (limited to 'gnuradio-core/src/python/gnuradio/gr_xmlrunner.py')
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/gr_xmlrunner.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gnuradio-core/src/python/gnuradio/gr_xmlrunner.py b/gnuradio-core/src/python/gnuradio/gr_xmlrunner.py index ded77f5f31..c3dc5cf136 100644 --- a/gnuradio-core/src/python/gnuradio/gr_xmlrunner.py +++ b/gnuradio-core/src/python/gnuradio/gr_xmlrunner.py @@ -6,8 +6,6 @@ XML Test Runner for PyUnit # the Public Domain. With contributions by Paolo Borelli and others. # Added to GNU Radio Oct. 3, 2010 -from __future__ import with_statement - __version__ = "0.1" import os.path @@ -185,7 +183,9 @@ class XMLTestRunner(object): result = _XMLTestResult(classname) start_time = time.time() - with _fake_std_streams(): + fss = _fake_std_streams() + fss.__enter__() + try: test(result) try: out_s = sys.stdout.getvalue() @@ -195,6 +195,8 @@ class XMLTestRunner(object): err_s = sys.stderr.getvalue() except AttributeError: err_s = "" + finally: + fss.__exit__(None, None, None) time_taken = time.time() - start_time result.print_report(stream, time_taken, out_s, err_s) @@ -218,8 +220,8 @@ class _fake_std_streams(object): def __enter__(self): self._orig_stdout = sys.stdout self._orig_stderr = sys.stderr - sys.stdout = StringIO() - sys.stderr = StringIO() + #sys.stdout = StringIO() + #sys.stderr = StringIO() def __exit__(self, exc_type, exc_val, exc_tb): sys.stdout = self._orig_stdout |