← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_conflicts.py

  • Committer: Aaron Bentley
  • Date: 2006-03-10 19:01:31 UTC
  • mto: (2027.1.2 revert-subpath-56549)
  • mto: This revision was merged to the branch mainline in revision 1647.
  • Revision ID: abentley@panoramicfeedback.com-20060310190131-7092bff9317ca8f5
Small tweaks

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_conflicts.py
53
53
        file('hello.sploo.BASE', 'w').write('yellow world')
54
54
        file('hello.sploo.OTHER', 'w').write('yellow world2')
55
55
        self.assertEqual(len(list(tree.list_files())), 6)
56
 
        conflicts = list(tree.iter_conflicts())
 
56
        conflicts = list(tree.conflict_lines())
57
57
        self.assertEqual(len(conflicts), 2)
58
 
        self.assert_('hello' in conflicts)
59
 
        self.assert_('hello.sploo' in conflicts)
 
58
        self.assert_('hello' in conflicts[0][2])
 
59
        self.assert_('hello.sploo' in conflicts[1][2])
60
60
        restore('hello')
61
61
        restore('hello.sploo')
62
 
        self.assertEqual(len(list(tree.iter_conflicts())), 0)
 
62
        self.assertEqual(len(list(tree.conflict_lines())), 0)
63
63
        self.assertFileEqual('hello world2', 'hello')
64
64
        assert not os.path.lexists('hello.sploo')
65
65
        self.assertRaises(NotConflicted, restore, 'hello')