From 20cb9a006d26d95cf2bd7d685e8cfce348882f70 Mon Sep 17 00:00:00 2001
From: Bernat Gabor <bgabor8@bloomberg.net>
Date: Wed, 3 Apr 2019 11:51:11 -0400
Subject: [PATCH] release 3.8.6

---
 docs/changelog.rst                       | 10 ++++++++++
 docs/changelog/1245.bugfix.rst           |  1 -
 src/tox/session/commands/run/parallel.py |  5 +++--
 3 files changed, 13 insertions(+), 3 deletions(-)
 delete mode 100644 docs/changelog/1245.bugfix.rst

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 7afc5a807..082b70576 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 6c9db5a61..000000000
--- 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 83758bc64..7af6e9a21 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 collect_process(process):
                         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 collect_process(process):
                 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 = {}