1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
# This file is part of Dictdiffer.
#
# Copyright (C) 2015 CERN.
#
# Dictdiffer is free software; you can redistribute it and/or modify
# it under the terms of the MIT License; see LICENSE file for more
# details.
import unittest
from dictdiffer import patch
from dictdiffer.merge import Merger, UnresolvedConflictsException
class MergerTest(unittest.TestCase):
def test_run(self):
lca = {'changeme': 'Jo'}
first = {'changeme': 'Joe'}
second = {'changeme': 'John'}
m = Merger(lca, first, second, {})
self.assertRaises(UnresolvedConflictsException, m.run)
def test_continue_run(self):
def take_first(conflict, _, __, ___):
conflict.take = [('f', x) for x
in range(len(conflict.first_patch.patches))]
return True
lca = {'changeme': 'Jo'}
first = {'changeme': 'Joe'}
second = {'changeme': 'John'}
m = Merger(lca, first, second, {})
try:
m.run()
except UnresolvedConflictsException:
pass
m.continue_run(['f'])
self.assertEqual(m.unified_patches,
[('change', 'changeme', ('Jo', 'Joe'))])
def test_continue_run_multiple_conflicts_per_patch(self):
lca = {'foo': [{'x': 1}, {'y': 2}]}
first = {'foo': [{'x': 1}, {'y': 2}, {'z': 4}]}
second = {'bar': 'baz'}
expected = {
'f': {'foo': [{'x': 1}, {'y': 2}, {'z': 4}],
'bar': 'baz'},
's': {'bar': 'baz'}}
for resolution, expected_value in expected.items():
m = Merger(lca, first, second, {})
try:
m.run()
except UnresolvedConflictsException as e:
m.continue_run([resolution for _ in e.content])
self.assertEqual(patch(m.unified_patches, lca),
expected_value)
if __name__ == '__main__':
unittest.main()
|
