diff options
| author | Bernat Gabor <bgabor8@bloomberg.net> | 2019-04-03 13:56:18 -0400 |
|---|---|---|
| committer | Bernat Gabor <bgabor8@bloomberg.net> | 2019-04-03 14:46:20 -0400 |
| commit | bcdd3c8733a197089696bf2e549f7c71736b1a28 (patch) | |
| tree | 22753b34783cdd60e2bec6f66cdffa133957658d | |
| parent | f4dc1f2036945bef355b388325634ad155898b91 (diff) | |
| download | tox-git-bcdd3c8733a197089696bf2e549f7c71736b1a28.tar.gz | |
fix CI
| -rw-r--r-- | src/tox/session/commands/run/parallel.py | 2 | ||||
| -rw-r--r-- | tests/unit/session/test_parallel.py | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/tox/session/commands/run/parallel.py b/src/tox/session/commands/run/parallel.py index 7af6e9a2..c01eb9dd 100644 --- a/src/tox/session/commands/run/parallel.py +++ b/src/tox/session/commands/run/parallel.py @@ -49,7 +49,7 @@ def run_parallel(config, venv_dict): args=args_sub, env=os_env, redirect=not live_out, - capture_err=live_out, + capture_err=print_out, callback=collect_process, returnout=print_out, ) diff --git a/tests/unit/session/test_parallel.py b/tests/unit/session/test_parallel.py index da872bf4..0033cf60 100644 --- a/tests/unit/session/test_parallel.py +++ b/tests/unit/session/test_parallel.py @@ -184,4 +184,9 @@ parallel_show_output = True result.assert_success() assert "stdout env" not in result.out, result.output() assert "stderr env" not in result.out, result.output() - assert "stdout always stderr always" in result.out, result.output() + msg = ( + "stdout always stderr always" + if sys.version_info[0] == 3 + else "stderr always stdout always" + ) + assert msg in result.out, result.output() |