diff options
| author | Ned Batchelder <ned@nedbatchelder.com> | 2016-06-25 08:35:00 -0400 |
|---|---|---|
| committer | Ned Batchelder <ned@nedbatchelder.com> | 2016-06-25 08:35:00 -0400 |
| commit | 609bd9a53c89d6449ee504c266b3d02c15a097d0 (patch) | |
| tree | 8fe3f796f01d4f5c453dd942b6f17a40b8f52c0b /coverage/control.py | |
| parent | e058c1162e9d1c0f405a2f3a0fe55338a515f770 (diff) | |
| download | python-coveragepy-git-609bd9a53c89d6449ee504c266b3d02c15a097d0.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.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/coverage/control.py b/coverage/control.py index 2f2989cb..f350b3d1 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, |