def test_get_conflicts(self): assign_list_environment(patches1+patches2) conflicts = get_conflicts(patches1, patches2) config_manager = ConfigManager('test/conflict_resolver/test_conf_action.conf') resolution = resolve(patches1, patches2, conflicts, config_manager.get_conflict_actions()) self.assertEqual(resolution, [])
def test_get_conflicts(self): assign_list_environment(patches1 + patches2) _conflicts = get_conflicts(patches1, patches2) self.assertEqual(conflicts, _conflicts)
conflicts = get_conflicts(patches1, patches2) config_manager = ConfigManager('test/conflict_resolver/test_conf_action.conf') resolution = resolve(patches1, patches2, conflicts, config_manager.get_conflict_actions()) unified_patches = unify(patches1, patches2, conflicts) self.assertEqual(unified_patches, up) if __name__ == '__main__': main() ''' from copy import deepcopy from conflict_resolver.unify import unify, _change_conflicting_groups, _reassign_groups from conflict_resolver.resolver import resolve from conflict_resolver.conflicts import get_conflicts, print_conflicts from config_manager.manager import ConfigManager from test.conflict_resolver.utils import patches1, patches2, assign_list_environment assign_list_environment(patches1+patches2) p1 = deepcopy(patches1) p2 = deepcopy(patches2) c = get_conflicts(p1, p2) conflicts = get_conflicts(patches1, patches2)
conflicts = get_conflicts(patches1, patches2) config_manager = ConfigManager( 'test/conflict_resolver/test_conf_action.conf') resolution = resolve(patches1, patches2, conflicts, config_manager.get_conflict_actions()) unified_patches = unify(patches1, patches2, conflicts) self.assertEqual(unified_patches, up) if __name__ == '__main__': main() ''' from copy import deepcopy from conflict_resolver.unify import unify, _change_conflicting_groups, _reassign_groups from conflict_resolver.resolver import resolve from conflict_resolver.conflicts import get_conflicts, print_conflicts from config_manager.manager import ConfigManager from test.conflict_resolver.utils import patches1, patches2, assign_list_environment assign_list_environment(patches1+patches2) p1 = deepcopy(patches1) p2 = deepcopy(patches2) c = get_conflicts(p1, p2) conflicts = get_conflicts(patches1, patches2)
def test_get_conflicts(self): assign_list_environment(patches1+patches2) _conflicts = get_conflicts(patches1, patches2) self.assertEqual(conflicts, _conflicts)