10 global-current-deleted: A
11 global-current-changed: A
20 [New modified subtest]
23 [Current deleted subtest]
26 [New modified current deleted]
29 [Ancestor no expected new expected]
32 [new-deleted-test.html]
36 [current-deleted-test.html]
43 [new-modified-current-deleted.html]
45 if os == "linux": FAIL
48 [new-add-expected-with-subtest.html]
52 [current-add-expected-with-subtest.html]
60 global-current-deleted: A
61 global-current-changed: A
70 [New modified subtest]
72 if os == "linux": FAIL
75 [Current deleted subtest]
78 [New modified current deleted]
81 [Ancestor no expected new expected]
89 [current-deleted-test.html]
95 if os == "linux": FAIL
97 [new-modified-current-deleted.html]
99 if os == "linux": FAIL
103 [new-add-expected-with-subtest.html]
108 [current-add-expected-with-subtest.html]
114 global-new-deleted: A
115 global-new-changed: A
116 global-current-added: A
117 global-current-changed: B
123 [New deleted subtest]
126 [New modified subtest]
129 [Current added subtest]
132 [Ancestor no expected new expected]
135 [new-deleted-test.html]
139 [current-added-test.html]
143 [new-add-expected-with-subtest.html]
147 [current-add-expected-with-subtest.html]
153 updated
= """global-new-deleted: A
154 global-new-changed: A
155 global-current-added: A
156 global-current-changed: B
161 [New modified subtest]
163 if os == "linux": FAIL
166 [Current added subtest]
169 [Ancestor no expected new expected]
176 [New modified current deleted]
180 [current-added-test.html]
185 [new-add-expected-with-subtest.html]
191 [current-add-expected-with-subtest.html]
197 [new-added-test.html]
204 if os == "linux": FAIL
206 [new-modified-current-deleted.html]
208 if os == "linux": FAIL
215 def get_manifest(str_data
):
216 bytes_io
= BytesIO(str_data
.encode("utf-8"))
217 return metamerge
.compile(bytes_io
, metamerge
.data_cls_getter
)
219 ancestor_manifest
= get_manifest(ancestor
)
220 current_manifest
= get_manifest(current
)
221 new_manifest
= get_manifest(new
)
223 result
= metamerge
.make_changes(ancestor_manifest
, current_manifest
, new_manifest
)
224 assert result
== updated
227 if __name__
== "__main__":