← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_branch.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/blackbox/test_branch.py
179
179
        source.add('file1')
180
180
        source.commit('added file')
181
181
        out, err = self.run_bzr('branch source target --files-from source')
182
 
        self.failUnlessExists('target/file1')
 
182
        self.assertPathExists('target/file1')
183
183
 
184
184
    def test_branch_files_from_hardlink(self):
185
185
        self.requireFeature(HardlinkFeature)
208
208
    def test_branch_no_tree(self):
209
209
        self.example_branch('source')
210
210
        self.run_bzr('branch --no-tree source target')
211
 
        self.failIfExists('target/hello')
212
 
        self.failIfExists('target/goodbye')
 
211
        self.assertPathDoesNotExist('target/hello')
 
212
        self.assertPathDoesNotExist('target/goodbye')
213
213
 
214
214
    def test_branch_into_existing_dir(self):
215
215
        self.example_branch('a')
225
225
        # force operation
226
226
        self.run_bzr('branch a b --use-existing-dir')
227
227
        # check conflicts
228
 
        self.failUnlessExists('b/hello.moved')
229
 
        self.failIfExists('b/godbye.moved')
 
228
        self.assertPathExists('b/hello.moved')
 
229
        self.assertPathDoesNotExist('b/godbye.moved')
230
230
        # we can't branch into branch
231
231
        out,err = self.run_bzr('branch a b --use-existing-dir', retcode=3)
232
232
        self.assertEqual('', out)