Unittesting basemodule
merge_streams was not having the desired effect
This commit is contained in:
@@ -110,7 +110,7 @@ class BaseTestCase(unittest.TestCase):
|
|||||||
command = ["./task"]
|
command = ["./task"]
|
||||||
command.extend(args)
|
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)
|
out, err = p.communicate(input)
|
||||||
# In python3 we will be able use the following instead of the previous
|
# In python3 we will be able use the following instead of the previous
|
||||||
# line to avoid locking if task is unexpectedly waiting for input
|
# line to avoid locking if task is unexpectedly waiting for input
|
||||||
@@ -120,7 +120,6 @@ class BaseTestCase(unittest.TestCase):
|
|||||||
# p.kill()
|
# p.kill()
|
||||||
# out, err = proc.communicate()
|
# out, err = proc.communicate()
|
||||||
|
|
||||||
|
|
||||||
return p.returncode, out, err
|
return p.returncode, out, err
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
|||||||
Reference in New Issue
Block a user