← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_multiparent.py

  • Committer: Jelmer Vernooij
  • Date: 2011-02-11 17:58:56 UTC
  • mto: This revision was merged to the branch mainline in revision 5662.
  • Revision ID: jelmer@samba.org-20110211175856-alncdirjmi75qr67
Add 'WorkingTreeFormat.missing_parent_conflicts' flag to use in tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_multiparent.py
265
265
    def test_filenames(self):
266
266
        vf = multiparent.MultiVersionedFile('foop')
267
267
        vf.add_version('a\nb\nc\nd'.splitlines(True), 'a', [])
268
 
        self.assertPathExists('foop.mpknit')
269
 
        self.assertPathDoesNotExist('foop.mpidx')
 
268
        self.failUnlessExists('foop.mpknit')
 
269
        self.failIfExists('foop.mpidx')
270
270
        vf.save()
271
 
        self.assertPathExists('foop.mpidx')
 
271
        self.failUnlessExists('foop.mpidx')
272
272
        vf.destroy()
273
 
        self.assertPathDoesNotExist('foop.mpknit')
274
 
        self.assertPathDoesNotExist('foop.mpidx')
 
273
        self.failIfExists('foop.mpknit')
 
274
        self.failIfExists('foop.mpidx')