Deduplicate arcs when combining coverage data. (#22022)

pull/4420/head
Matt Clay 2017-02-27 15:46:15 -08:00 committed by GitHub
parent e3107cdeb6
commit c87ebb6215
1 changed files with 4 additions and 4 deletions

View File

@ -60,7 +60,7 @@ def command_coverage_combine(args):
continue
for filename in original.measured_files():
arcs = original.arcs(filename)
arcs = set(original.arcs(filename))
if '/ansible_modlib.zip/ansible/' in filename:
new_name = re.sub('^.*/ansible_modlib.zip/ansible/', ansible_path, filename)
@ -77,9 +77,9 @@ def command_coverage_combine(args):
filename = new_name
if filename not in arc_data:
arc_data[filename] = []
arc_data[filename] = set()
arc_data[filename] += arcs
arc_data[filename].update(arcs)
updated = coverage.CoverageData()
@ -88,7 +88,7 @@ def command_coverage_combine(args):
display.warning('Invalid coverage path: %s' % filename)
continue
updated.add_arcs({filename: arc_data[filename]})
updated.add_arcs({filename: list(arc_data[filename])})
if not args.explain:
updated.write_file(COVERAGE_FILE)