summaryrefslogtreecommitdiff
path: root/tests/test_cmdline.py
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2015-10-04 11:08:36 -0400
committerNed Batchelder <ned@nedbatchelder.com>2015-10-04 11:08:36 -0400
commit5205da079a8e099f9f5c6895b2cd634fc512fc55 (patch)
tree75af617e7645f2ba8070f41659b919279bf3daf9 /tests/test_cmdline.py
parent6bf4946e0bc8599a1258c5107f7eece2efa70925 (diff)
downloadpython-coveragepy-git-5205da079a8e099f9f5c6895b2cd634fc512fc55.tar.gz
Combining now issues warnings on unreadable files, unconditionally
Diffstat (limited to 'tests/test_cmdline.py')
-rw-r--r--tests/test_cmdline.py14
1 files changed, 4 insertions, 10 deletions
diff --git a/tests/test_cmdline.py b/tests/test_cmdline.py
index 932c9ef9..c78e3468 100644
--- a/tests/test_cmdline.py
+++ b/tests/test_cmdline.py
@@ -190,20 +190,14 @@ class CmdLineTest(BaseCmdLineTest):
self.cmd_executes("combine datadir1", """\
.coverage()
.load()
- .combine(["datadir1"], ignore_errors=None)
+ .combine(["datadir1"])
.save()
""")
# coverage combine without args
self.cmd_executes("combine", """\
.coverage()
.load()
- .combine(None, ignore_errors=None)
- .save()
- """)
- self.cmd_executes("combine -i", """\
- .coverage()
- .load()
- .combine(None, ignore_errors=True)
+ .combine(None)
.save()
""")
@@ -212,13 +206,13 @@ class CmdLineTest(BaseCmdLineTest):
self.cmd_executes("combine --rcfile cov.ini", """\
.coverage(config_file='cov.ini')
.load()
- .combine(None, ignore_errors=None)
+ .combine(None)
.save()
""")
self.cmd_executes("combine --rcfile cov.ini data1 data2/more", """\
.coverage(config_file='cov.ini')
.load()
- .combine(["data1", "data2/more"], ignore_errors=None)
+ .combine(["data1", "data2/more"])
.save()
""")