← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Martin Pool
  • Date: 2011-04-15 07:01:22 UTC
  • mto: This revision was merged to the branch mainline in revision 5789.
  • Revision ID: mbp@sourcefrog.net-20110415070122-7x24skeadcm7wvut
Switch away from using failUnlessExists and failIfExists

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
90
90
        os.chdir('branch2')
91
91
        self.run_bzr('merge ../branch1/baz', retcode=3)
92
92
        self.run_bzr('merge ../branch1/foo')
93
 
        self.failUnlessExists('foo')
94
 
        self.failIfExists('bar')
 
93
        self.assertPathExists('foo')
 
94
        self.assertPathDoesNotExist('bar')
95
95
        wt2 = WorkingTree.open('.') # opens branch2
96
96
        self.assertEqual([tip], wt2.get_parent_ids())
97
97