diff options
| author | Ned Batchelder <ned@nedbatchelder.com> | 2015-08-20 09:52:07 -0400 |
|---|---|---|
| committer | Ned Batchelder <ned@nedbatchelder.com> | 2015-08-20 09:52:07 -0400 |
| commit | 33d7789e8e6c15aae52cf3e36eecbd48f36e248e (patch) | |
| tree | ed0da3866c20392314aea128cd5272a367bc832f /coverage/collector.py | |
| parent | b0168bef1eedbe75ffab364a02a0c1ba8466dbd1 (diff) | |
| download | python-coveragepy-git-33d7789e8e6c15aae52cf3e36eecbd48f36e248e.tar.gz | |
Touching files in an empty CoverageData shouldn't force lines. #399
py.test --cov can write empty data to arcs, and then touch files due to
--source. This would make the file be about lines instead of arcs, and
then combining would fail.
This changed a lot of CoverageData, including some of the methods names.
Diffstat (limited to 'coverage/collector.py')
| -rw-r--r-- | coverage/collector.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/coverage/collector.py b/coverage/collector.py index 48b017ce..de111169 100644 --- a/coverage/collector.py +++ b/coverage/collector.py @@ -318,9 +318,9 @@ class Collector(object): return dict((abs_file(k), v) for k, v in iitems(d)) if self.branch: - covdata.set_arcs(abs_file_dict(self.data)) + covdata.add_arcs(abs_file_dict(self.data)) else: - covdata.set_lines(abs_file_dict(self.data)) - covdata.set_file_tracers(abs_file_dict(self.file_tracers)) + covdata.add_lines(abs_file_dict(self.data)) + covdata.add_file_tracers(abs_file_dict(self.file_tracers)) self.reset() |