/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 breezy/tests/test_errors.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 00:17:06 UTC
  • mto: (6670.4.8 move-bzr)
  • mto: This revision was merged to the branch mainline in revision 6681.
  • Revision ID: jelmer@jelmer.uk-20170610001706-xn6jiuev350246mr
Rename a number of attributes from bzrdir to controldir.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_errors.py
310
310
        error = errors.CorruptRepository(repo)
311
311
        self.assertEqualDiff("An error has been detected in the repository %s.\n"
312
312
                             "Please run brz reconcile on this repository." %
313
 
                             repo.bzrdir.root_transport.base,
 
313
                             repo.controldir.root_transport.base,
314
314
                             str(error))
315
315
 
316
316
    def test_read_error(self):
648
648
        self.assertEqual('Not a branch: "path".', str(err))
649
649
 
650
650
    def test_not_branch_bzrdir_with_repo(self):
651
 
        bzrdir = self.make_repository('repo').bzrdir
 
651
        bzrdir = self.make_repository('repo').controldir
652
652
        err = errors.NotBranchError('path', bzrdir=bzrdir)
653
653
        self.assertEqual(
654
654
            'Not a branch: "path": location is a repository.', str(err))