diff options
author | Ned Batchelder <ned@nedbatchelder.com> | 2015-10-03 16:59:46 -0400 |
---|---|---|
committer | Ned Batchelder <ned@nedbatchelder.com> | 2015-10-03 16:59:46 -0400 |
commit | cf39c6221e916d3a4a7d49f230dd9a7bf6c1767b (patch) | |
tree | 915e10e2d3527a0f0d3e6ebe87db28699fd20705 /tests/test_cmdline.py | |
parent | 2884998748f95c222cecb1ad72a7bc404aedeae3 (diff) | |
download | python-coveragepy-cf39c6221e916d3a4a7d49f230dd9a7bf6c1767b.tar.gz |
Combine can now ignore errors.
Diffstat (limited to 'tests/test_cmdline.py')
-rw-r--r-- | tests/test_cmdline.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/tests/test_cmdline.py b/tests/test_cmdline.py index c78e346..932c9ef 100644 --- a/tests/test_cmdline.py +++ b/tests/test_cmdline.py @@ -190,14 +190,20 @@ class CmdLineTest(BaseCmdLineTest): self.cmd_executes("combine datadir1", """\ .coverage() .load() - .combine(["datadir1"]) + .combine(["datadir1"], ignore_errors=None) .save() """) # coverage combine without args self.cmd_executes("combine", """\ .coverage() .load() - .combine(None) + .combine(None, ignore_errors=None) + .save() + """) + self.cmd_executes("combine -i", """\ + .coverage() + .load() + .combine(None, ignore_errors=True) .save() """) @@ -206,13 +212,13 @@ class CmdLineTest(BaseCmdLineTest): self.cmd_executes("combine --rcfile cov.ini", """\ .coverage(config_file='cov.ini') .load() - .combine(None) + .combine(None, ignore_errors=None) .save() """) self.cmd_executes("combine --rcfile cov.ini data1 data2/more", """\ .coverage(config_file='cov.ini') .load() - .combine(["data1", "data2/more"]) + .combine(["data1", "data2/more"], ignore_errors=None) .save() """) |