Use new trace format to register assertions, also in test_executiontrace.py.
@@ -35,7 +35,7 @@ def test_merge_full():
trace0.false_distances[1] = 1
trace0.covered_line_ids = {0}
trace0.executed_instructions = [instr0]
- trace0.traced_assertions = [assert0]
+ trace0.executed_assertions = [assert0]
instr1 = ExecutedInstruction("bar", 1, 2, 3, 4, 5, 6)
assert1 = ExecutedAssertion(1, 2, 3)
@@ -50,7 +50,7 @@ def test_merge_full():
trace1.false_distances[2] = 0
trace1.covered_line_ids = {1}
trace1.executed_instructions = [instr0, instr1]
- trace1.traced_assertions = [assert1]
+ trace1.executed_assertions = [assert1]
# Shifted by one
assert2 = ExecutedAssertion(1, 2, 4)
@@ -71,7 +71,7 @@ def test_merge_full():
result.covered_line_ids = {0, 1}
# instr0 is prepended
result.executed_instructions = [instr0, instr0, instr1]
- result.traced_assertions = [assert0, assert2]
+ result.executed_assertions = [assert0, assert2]
trace0.merge(trace1)
assert trace0 == result
