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.

1 files changed, 6 insertions, 3 deletions

diff --git a/tests/test_cmdline.py b/tests/test_cmdline.py
index 8e2840b4..795a01fb 100644
--- a/tests/test_cmdline.py
+++ b/tests/test_cmdline.py
@@ -190,6 +190,12 @@ class CmdLineTest(BaseCmdLineTest):
         # coverage combine with args
         self.cmd_executes("combine datadir1", """\
             .coverage()
+            .combine(["datadir1"])
+            .save()
+            """)
+        # coverage combine, appending
+        self.cmd_executes("combine --append datadir1", """\
+            .coverage()
             .load()
             .combine(["datadir1"])
             .save()
@@ -197,7 +203,6 @@ class CmdLineTest(BaseCmdLineTest):
         # coverage combine without args
         self.cmd_executes("combine", """\
             .coverage()
-            .load()
             .combine(None)
             .save()
             """)
@@ -206,13 +211,11 @@ class CmdLineTest(BaseCmdLineTest):
         # https://bitbucket.org/ned/coveragepy/issues/385/coverage-combine-doesnt-work-with-rcfile
         self.cmd_executes("combine --rcfile cov.ini", """\
             .coverage(config_file='cov.ini')
-            .load()
             .combine(None)
             .save()
             """)
         self.cmd_executes("combine --rcfile cov.ini data1 data2/more", """\
             .coverage(config_file='cov.ini')
-            .load()
             .combine(["data1", "data2/more"])
             .save()
             """)