← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_bound_sftp.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/per_branch/test_bound_sftp.py
94
94
        # this line is more of a working tree test line, but - what the hey,
95
95
        # it has work to do.
96
96
        b_child.bzrdir.open_workingtree().update()
97
 
        self.failUnlessExists('child/a')
98
 
        self.failUnlessExists('child/b')
 
97
        self.assertPathExists('child/a')
 
98
        self.assertPathExists('child/b')
99
99
 
100
100
        b_child.unbind()
101
101
        self.assertEqual(None, b_child.get_bound_location())
297
297
 
298
298
        wt_child.merge_from_branch(wt_other.branch)
299
299
 
300
 
        self.failUnlessExists('child/c')
 
300
        self.assertPathExists('child/c')
301
301
        self.assertEqual(['r@d-2'], wt_child.get_parent_ids()[1:])
302
302
        self.assertTrue(wt_child.branch.repository.has_revision('r@d-2'))
303
303
        self.assertFalse(b_base.repository.has_revision('r@d-2'))