Unittesting basemodule

merge_streams was not having the desired effect
This commit is contained in:
Renato Alves 2014-05-17 16:58:44 +01:00
parent f6607168ad
commit f54494d45a

View file

@ -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