← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-04-16 01:09:56 UTC
  • mfrom: (5784.1.4 760435-less-fail)
  • Revision ID: pqm@pqm.ubuntu.com-20110416010956-5wrpm136qq2hz5f3
(mbp) rename and deprecate failUnlessExists and failIfExists (Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree.py
373
373
        self.build_tree_contents([('other/hello', 'hELLO')])
374
374
        other.commit('Case switch')
375
375
        this = base.bzrdir.sprout('this').open_workingtree()
376
 
        self.failUnlessExists('this/hello')
 
376
        self.assertPathExists('this/hello')
377
377
        self.build_tree_contents([('this/hello', 'Hello World')])
378
378
        this.commit('Add World')
379
379
        this.merge_from_branch(other.branch)
400
400
        self.assertEqual([], this.conflicts())
401
401
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
402
402
                         resolved)
403
 
        self.failIfExists('this/hello.BASE')
 
403
        self.assertPathDoesNotExist('this/hello.BASE')
404
404
 
405
405
    def test_auto_resolve_dir(self):
406
406
        tree = self.make_branch_and_tree('tree')