summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOtavio Pontes <otaviobp@gmail.com>2010-08-04 19:53:41 +0000
committerOtavio Pontes <otaviobp@gmail.com>2010-08-04 19:53:41 +0000
commit2dc539de1ac9ad1cc69ae73d0fd6166d79fa455d (patch)
treee654a883f34a0fc67e7cefcd3c41394d65240eb2
parentUsing property repo instead of metadata['repository'] (diff)
downloadportage-multirepo-2dc539de1ac9ad1cc69ae73d0fd6166d79fa455d.tar.gz
portage-multirepo-2dc539de1ac9ad1cc69ae73d0fd6166d79fa455d.tar.bz2
portage-multirepo-2dc539de1ac9ad1cc69ae73d0fd6166d79fa455d.zip
Adding stderr to return_str too.
-rw-r--r--pym/portage/tests/multirepo/multirepo_test.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/pym/portage/tests/multirepo/multirepo_test.py b/pym/portage/tests/multirepo/multirepo_test.py
index 945d3244..6dc676c4 100644
--- a/pym/portage/tests/multirepo/multirepo_test.py
+++ b/pym/portage/tests/multirepo/multirepo_test.py
@@ -45,13 +45,19 @@ class MultirepoTest():
Run the function and return the text written in stdout
"""
output = sys.stdout
+ output_err = sys.stderr
sys.stdout = os.tmpfile()
+ sys.stderr = os.tmpfile()
function(*params)
sys.stdout.flush()
sys.stdout.seek(0)
- return_str = sys.stdout.read()
+ sys.stderr.flush()
+ sys.stderr.seek(0)
+ return_str = sys.stdout.read() + sys.stderr.read()
sys.stdout.close()
sys.stdout = output
+ sys.stderr.close()
+ sys.stderr = output_err
return return_str
def __init__(self):