← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_non_ascii.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_non_ascii.py
222
222
 
223
223
        txt = self.run_bzr_decode(['mv', 'a', fname2])
224
224
        self.assertEqual(u'a => %s\n' % fname2, txt)
225
 
        self.failIfExists('a')
226
 
        self.failUnlessExists(fname2)
 
225
        self.assertPathDoesNotExist('a')
 
226
        self.assertPathExists(fname2)
227
227
 
228
228
        # After 'mv' we need to re-open the working tree
229
229
        self.wt = self.wt.bzrdir.open_workingtree()
240
240
        # The rename should still succeed
241
241
        newpath = u'%s/%s' % (dirname, fname2)
242
242
        txt = self.run_bzr_decode(['mv', newpath, 'a'], encoding='ascii')
243
 
        self.failUnlessExists('a')
 
243
        self.assertPathExists('a')
244
244
        self.assertEqual(newpath.encode('ascii', 'replace') + ' => a\n', txt)
245
245
 
246
246
    def test_branch(self):