← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_conflicts.py

  • Committer: Jelmer Vernooij
  • Date: 2005-11-04 17:26:05 UTC
  • mfrom: (1185.16.146)
  • mto: (1185.33.1)
  • mto: This revision was merged to the branch mainline in revision 1509.
  • Revision ID: jelmer@samba.org-20051104172605-9288f261492667fd
Merge from Martin

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/test_conflicts.py
36
36
        self.assertEqual(len(list(tree.list_files())), 3)
37
37
        conflicts = list(tree.iter_conflicts())
38
38
        self.assertEqual(len(conflicts), 2)
39
 
        assert 'hello' in conflicts
40
 
        assert 'hello.sploo' in conflicts
 
39
        self.assert_('hello' in conflicts)
 
40
        self.assert_('hello.sploo' in conflicts)
41
41
        os.unlink('hello.BASE')
42
42
        os.unlink('hello.sploo.BASE')
43
43
        self.assertEqual(len(list(tree.iter_conflicts())), 0)