← 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-04-05 04:29:35 UTC
  • mto: (2027.1.2 revert-subpath-56549)
  • mto: This revision was merged to the branch mainline in revision 1647.
  • Revision ID: aaron.bentley@utoronto.ca-20060405042935-7a86762d00a3ae2e
Got all tests passing

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_conflicts.py
54
54
        self.assertEqual(len(list(tree.list_files())), 6)
55
55
        conflicts = list(tree.conflict_lines())
56
56
        self.assertEqual(len(conflicts), 2)
57
 
        self.assert_('hello' in conflicts[0][2])
58
 
        self.assert_('hello.sploo' in conflicts[1][2])
 
57
        self.assert_('hello' in conflicts[0].path)
 
58
        self.assert_('hello.sploo' in conflicts[1].path)
59
59
        restore('hello')
60
60
        restore('hello.sploo')
61
61
        self.assertEqual(len(list(tree.conflict_lines())), 0)