78 childann = decorate(childdata, childfctx) |
78 childann = decorate(childdata, childfctx) |
79 childann = _annotatepair([p1ann, p2ann], childfctx, childann, True, |
79 childann = _annotatepair([p1ann, p2ann], childfctx, childann, True, |
80 diffopts) |
80 diffopts) |
81 self.assertEqual(childann[0], [ |
81 self.assertEqual(childann[0], [ |
82 annotateline('old', 1), |
82 annotateline('old', 1), |
83 annotateline('old', 2), |
83 annotateline('old', 2, True), |
|
84 # note that this line was carried over from earlier so it is *not* |
|
85 # marked skipped |
84 annotateline('p2', 2), |
86 annotateline('p2', 2), |
85 annotateline('p2', 2), |
87 annotateline('p2', 2, True), |
86 annotateline('p2', 3), |
88 annotateline('p2', 3), |
87 ]) |
89 ]) |
88 |
90 |
89 childann = decorate(childdata, childfctx) |
91 childann = decorate(childdata, childfctx) |
90 childann = _annotatepair([p2ann, p1ann], childfctx, childann, True, |
92 childann = _annotatepair([p2ann, p1ann], childfctx, childann, True, |
91 diffopts) |
93 diffopts) |
92 self.assertEqual(childann[0], [ |
94 self.assertEqual(childann[0], [ |
93 annotateline('old', 1), |
95 annotateline('old', 1), |
94 annotateline('old', 2), |
96 annotateline('old', 2, True), |
95 annotateline('p1', 3), |
97 annotateline('p1', 3), |
96 annotateline('p1', 3), |
98 annotateline('p1', 3, True), |
97 annotateline('p2', 3), |
99 annotateline('p2', 3), |
98 ]) |
100 ]) |
99 |
101 |
100 if __name__ == '__main__': |
102 if __name__ == '__main__': |
101 import silenttestrunner |
103 import silenttestrunner |