/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_non_ascii.py

(mbp) stop using failIf, failUnless, etc (Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_non_ascii.py
161
161
    def test_cat_revision(self):
162
162
        committer = self.info['committer']
163
163
        txt = self.run_bzr_decode('cat-revision -r 1')
164
 
        self.failUnless(committer in txt,
 
164
        self.assertTrue(committer in txt,
165
165
                        'failed to find %r in %r' % (committer, txt))
166
166
 
167
167
        msg = self.info['message']
168
168
        txt = self.run_bzr_decode('cat-revision -r 2')
169
 
        self.failUnless(msg in txt, 'failed to find %r in %r' % (msg, txt))
 
169
        self.assertTrue(msg in txt, 'failed to find %r in %r' % (msg, txt))
170
170
 
171
171
    def test_mkdir(self):
172
172
        txt = self.run_bzr_decode(['mkdir', self.info['directory']])
386
386
        self.assertEqual(fname+'\n', txt)
387
387
 
388
388
        txt = self.run_bzr_decode('deleted --show-ids')
389
 
        self.failUnless(txt.startswith(fname))
 
389
        self.assertTrue(txt.startswith(fname))
390
390
 
391
391
        # Deleted should fail if cannot decode
392
392
        # Because it is giving the exact paths
421
421
        self.wt.bzrdir.sprout(url)
422
422
 
423
423
        txt = self.run_bzr_decode('root', working_dir=dirname)
424
 
        self.failUnless(txt.endswith(dirname+'\n'))
 
424
        self.assertTrue(txt.endswith(dirname+'\n'))
425
425
 
426
426
        txt = self.run_bzr_decode('root', encoding='ascii', fail=True,
427
427
                                  working_dir=dirname)