summaryrefslogtreecommitdiff
path: root/coverage/control.py
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2016-06-25 08:35:00 -0400
committerNed Batchelder <ned@nedbatchelder.com>2016-06-25 08:35:00 -0400
commit34cdb26ab14c9fe62d782fe4dffa9472a2cf4303 (patch)
treefd116ee3c1d1b19d74f04e1455334d5be849f32b /coverage/control.py
parente84697e061a640ac398b1200d0ebaa96b7ee2e39 (diff)
downloadpython-coveragepy-34cdb26ab14c9fe62d782fe4dffa9472a2cf4303.tar.gz
Combine no longer appends by default
Combine used to always load an existing .coverage file. This lead to confusing results and extra tox-clean steps. Now the default is to not load the existing file, though a new --append switch on coverage combine gets you that behavior if you need it. This also pointed up an issue with concurrency=multiprocessing, which is that the child processes automatically used parallel=True, but the parent process did not. Now concurrency=multiprocessing implies parallel=True.
Diffstat (limited to 'coverage/control.py')
-rw-r--r--coverage/control.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/coverage/control.py b/coverage/control.py
index 2f2989c..f350b3d 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -247,6 +247,9 @@ class Coverage(object):
if concurrency == "multiprocessing":
patch_multiprocessing()
concurrency = None
+ # Multi-processing uses parallel for the subprocesses, so also use
+ # it for the main process.
+ self.config.parallel = True
self.collector = Collector(
should_trace=self._should_trace,