← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_branch.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-23 19:45:15 UTC
  • mto: This revision was merged to the branch mainline in revision 6486.
  • Revision ID: jelmer@samba.org-20120223194515-1ctgfzj362m0tu0k
Use bzrdir.controldir for generic access to control directories.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_branch.py
28
28
    branch as _mod_branch,
29
29
    bzrdir,
30
30
    config,
 
31
    controldir,
31
32
    errors,
32
33
    symbol_versioning,
33
34
    tests,
244
245
        # but open_downlevel will work
245
246
        self.assertEqual(
246
247
            format.open(dir),
247
 
            bzrdir.BzrDir.open(self.get_url()).open_branch(unsupported=True))
 
248
            controldir.ControlDir.open(self.get_url()).open_branch(unsupported=True))
248
249
        # unregister the format
249
250
        self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
250
251
            _mod_branch.BranchFormat.unregister_format, format)
488
489
 
489
490
    def make_branch(self, location, format=None):
490
491
        if format is None:
491
 
            format = bzrdir.format_registry.make_bzrdir('1.9')
 
492
            format = controldir.format_registry.make_bzrdir('1.9')
492
493
            format.set_branch_format(_mod_branch.BzrBranchFormat8())
493
494
        return tests.TestCaseWithTransport.make_branch(
494
495
            self, location, format=format)