diff options
Diffstat (limited to 'coverage/control.py')
| -rw-r--r-- | coverage/control.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/coverage/control.py b/coverage/control.py index a5741a47..1fb0f5bf 100644 --- a/coverage/control.py +++ b/coverage/control.py @@ -763,7 +763,7 @@ class Coverage(object): self.get_data() self.data_files.write(self.data, suffix=self.data_suffix) - def combine(self, data_paths=None, ignore_errors=None): + def combine(self, data_paths=None): """Combine together a number of similarly-named coverage data files. All coverage data files whose name starts with `data_file` (from the @@ -782,8 +782,6 @@ class Coverage(object): self._init() self.get_data() - self.config.from_args(ignore_combine_errors=ignore_errors) - aliases = None if self.config.paths: aliases = PathAliases() @@ -792,12 +790,7 @@ class Coverage(object): for pattern in paths[1:]: aliases.add(pattern, result) - self.data_files.combine_parallel_data( - self.data, - aliases=aliases, - data_paths=data_paths, - ignore_errors=self.config.ignore_combine_errors, - ) + self.data_files.combine_parallel_data(self.data, aliases=aliases, data_paths=data_paths) def get_data(self): """Get the collected data and reset the collector. |