← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bzrdir.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_bzrdir.py
797
797
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
798
798
        tree2.lock_read()
799
799
        self.addCleanup(tree2.unlock)
800
 
        self.failUnlessExists('tree2/subtree/file')
 
800
        self.assertPathExists('tree2/subtree/file')
801
801
        self.assertEqual('tree-reference', tree2.kind('subtree-root'))
802
802
 
803
803
    def test_cloning_metadir(self):
837
837
        # #634470.  -- vila 20100909
838
838
        self.assertRaises(errors.NotBranchError,
839
839
                          tree.bzrdir.sprout, 'repo/tree2')
840
 
#        self.failUnlessExists('repo/tree2/subtree')
841
 
#        self.failIfExists('repo/tree2/subtree/file')
 
840
#        self.assertPathExists('repo/tree2/subtree')
 
841
#        self.assertPathDoesNotExist('repo/tree2/subtree/file')
842
842
 
843
843
    def make_foo_bar_baz(self):
844
844
        foo = bzrdir.BzrDir.create_branch_convenience('foo').bzrdir