summaryrefslogtreecommitdiff
path: root/tests/test_cmdline.py
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2015-10-03 16:59:46 -0400
committerNed Batchelder <ned@nedbatchelder.com>2015-10-03 16:59:46 -0400
commita877aaf13d9f72ee317b392c86313a3003bcb3b8 (patch)
tree22fdb568fd85c4179774fdfb4024486e37d3e1ce /tests/test_cmdline.py
parentb27f9eab849696b46e9fbb84dcdc0f34078684d1 (diff)
downloadpython-coveragepy-git-a877aaf13d9f72ee317b392c86313a3003bcb3b8.tar.gz
Combine can now ignore errors.
Diffstat (limited to 'tests/test_cmdline.py')
-rw-r--r--tests/test_cmdline.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/tests/test_cmdline.py b/tests/test_cmdline.py
index c78e3468..932c9ef9 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()
""")