summaryrefslogtreecommitdiff
path: root/coverage/config.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 /coverage/config.py
parentb27f9eab849696b46e9fbb84dcdc0f34078684d1 (diff)
downloadpython-coveragepy-git-a877aaf13d9f72ee317b392c86313a3003bcb3b8.tar.gz
Combine can now ignore errors.
Diffstat (limited to 'coverage/config.py')
-rw-r--r--coverage/config.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/coverage/config.py b/coverage/config.py
index 458d4903..8aff41dc 100644
--- a/coverage/config.py
+++ b/coverage/config.py
@@ -162,6 +162,9 @@ class CoverageConfig(object):
self.source = None
self.timid = False
+ # Defaults for [combine]
+ self.ignore_combine_errors = False
+
# Defaults for [report]
self.exclude_list = DEFAULT_EXCLUDE[:]
self.fail_under = 0
@@ -277,6 +280,9 @@ class CoverageConfig(object):
('source', 'run:source', 'list'),
('timid', 'run:timid', 'boolean'),
+ # [combine]
+ ('ignore_combine_errors', 'combine:ignore_errors', 'boolean'),
+
# [report]
('exclude_list', 'report:exclude_lines', 'regexlist'),
('fail_under', 'report:fail_under', 'int'),