From f54494d45aa5997281269f09b058ceb3335c28a0 Mon Sep 17 00:00:00 2001 From: Renato Alves Date: Sat, 17 May 2014 16:58:44 +0100 Subject: [PATCH] Unittesting basemodule merge_streams was not having the desired effect --- test/basetest/__init__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/basetest/__init__.py b/test/basetest/__init__.py index 7665f467c..10dfb5fb9 100644 --- a/test/basetest/__init__.py +++ b/test/basetest/__init__.py @@ -110,7 +110,7 @@ class BaseTestCase(unittest.TestCase): command = ["./task"] command.extend(args) - p = Popen(command, stdin=stdin, stdout=PIPE, stderr=STDOUT) + p = Popen(command, stdin=stdin, stdout=PIPE, stderr=stderr) out, err = p.communicate(input) # In python3 we will be able use the following instead of the previous # line to avoid locking if task is unexpectedly waiting for input @@ -120,7 +120,6 @@ class BaseTestCase(unittest.TestCase): # p.kill() # out, err = proc.communicate() - return p.returncode, out, err @classmethod