diff options
| author | Bernat Gabor <bgabor8@bloomberg.net> | 2019-04-03 11:51:11 -0400 |
|---|---|---|
| committer | Bernat Gabor <bgabor8@bloomberg.net> | 2019-04-03 11:58:53 -0400 |
| commit | 20cb9a006d26d95cf2bd7d685e8cfce348882f70 (patch) | |
| tree | 8cf340b1e3a39cac5c41d2c70e5f9277961a5738 | |
| parent | d073263a945b2efbbf3e238a83df76d7f5e910ff (diff) | |
| download | tox-git-3.8.6.tar.gz | |
release 3.8.63.8.6
| -rw-r--r-- | docs/changelog.rst | 10 | ||||
| -rw-r--r-- | docs/changelog/1245.bugfix.rst | 1 | ||||
| -rw-r--r-- | src/tox/session/commands/run/parallel.py | 5 |
3 files changed, 13 insertions, 3 deletions
diff --git a/docs/changelog.rst b/docs/changelog.rst index 7afc5a80..082b7057 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -11,6 +11,16 @@ with advance notice in the **Deprecations** section of releases. .. towncrier release notes start +v3.8.6 (2019-04-03) +------------------- + +Bugfixes +^^^^^^^^ + +- :conf:`parallel_show_output` does not work with tox 3.8 + `#1245 <https://github.com/tox-dev/tox/issues/1245>`_ + + v3.8.5 (2019-04-03) ------------------- diff --git a/docs/changelog/1245.bugfix.rst b/docs/changelog/1245.bugfix.rst deleted file mode 100644 index 6c9db5a6..00000000 --- a/docs/changelog/1245.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -:conf:`parallel_show_output` does not work with tox 3.8 diff --git a/src/tox/session/commands/run/parallel.py b/src/tox/session/commands/run/parallel.py index 83758bc6..7af6e9a2 100644 --- a/src/tox/session/commands/run/parallel.py +++ b/src/tox/session/commands/run/parallel.py @@ -30,6 +30,7 @@ def run_parallel(config, venv_dict): with Spinner(enabled=show_progress) as spinner: def run_in_thread(tox_env, os_env, processes): + output = None env_name = tox_env.envconfig.envname status = "skipped tests" if config.option.notest else None try: @@ -52,8 +53,6 @@ def run_parallel(config, venv_dict): callback=collect_process, returnout=print_out, ) - if print_out: - reporter.verbosity0(output) except InvocationError as err: status = "parallel child exit code {}".format(err.exit_code) @@ -68,6 +67,8 @@ def run_parallel(config, venv_dict): elif status is not None: outcome = spinner.fail outcome(env_name) + if print_out and output is not None: + reporter.verbosity0(output) threads = deque() processes = {} |