GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-19 00:43:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Unittest - default to not merging stdout/stderr during tests

Browse source 
* Tests will now check that stderr is used for errors
* Tests were adjusted to reflect the API change
This commit is contained in:
Renato Alves 2014-10-20 14:01:21 +01:00
parent c9102fd79c
commit efdb31fb90
4 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

19
test/basetest/utils.py
View file

@ -13,7 +13,7 @@ try:
import simplejson as json
except ImportError:
import json
from .exceptions import CommandError, TimeoutWaitingForStream, StreamsAreMerged
from .exceptions import CommandError, TimeoutWaitingForStream
USED_PORTS = set()
ON_POSIX = 'posix' in sys.builtin_module_names
@ -133,15 +133,16 @@ def run_cmd_wait(cmd, input=None, stdout=PIPE, stderr=PIPE,
close_fds=ON_POSIX, env=env)
out, err, exit = _get_output(p, input, timeout)
# If streams were merged err should always be None so represent it with a
# more informative object
if merge_streams:
err = StreamsAreMerged()
if exit != 0:
raise CommandError(cmd, exit, out, err)
return exit, out, err
if exit != 0:
raise CommandError(cmd, exit, out)
else:
return exit, out
else:
if exit != 0:
raise CommandError(cmd, exit, out, err)
else:
return exit, out, err
def run_cmd_wait_nofail(*args, **kwargs):