def test_single_conflict_unsolved(self):
"""Tests a walker against a file with a single conflict, without solving it"""
# Given a file to merge
file = CW_PATH.format('single_conflict')
walker = ConflictsWalker(file, 'test', REPORT_NONE, False)
# When walking the conflicts
self.assertTrue(walker.has_more_conflicts())
self.assertFalse(walker.has_more_conflicts())
walker.end(False)
# Then check the output
self.assertTrue(filecmp.cmp(walker.merged, file))
self.assertEqual(walker.get_merge_status(), ERROR_CONFLICTS)
os.remove(walker.merged)
评论列表
文章目录