← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bzrdir.py

  • Committer: Jelmer Vernooij
  • Date: 2012-07-06 17:06:02 UTC
  • mto: This revision was merged to the branch mainline in revision 6535.
  • Revision ID: jelmer@samba.org-20120706170602-1r5m1una9oucwvah
Fix remaining tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bzrdir.py
35
35
    revision as _mod_revision,
36
36
    osutils,
37
37
    remote,
38
 
    symbol_versioning,
39
38
    transport as _mod_transport,
40
39
    urlutils,
41
40
    win32utils,
43
42
    workingtree_4,
44
43
    )
45
44
import bzrlib.branch
 
45
from bzrlib.branchfmt.fullhistory import BzrBranchFormat5
46
46
from bzrlib.errors import (
47
47
    NotBranchError,
48
48
    NoColocatedBranchSupport,
992
992
        branch_base = t.clone('branch').base
993
993
        self.assertEqual(branch_base, dir.get_branch_transport(None).base)
994
994
        self.assertEqual(branch_base,
995
 
                         dir.get_branch_transport(bzrlib.branch.BzrBranchFormat5()).base)
 
995
                         dir.get_branch_transport(BzrBranchFormat5()).base)
996
996
        repository_base = t.clone('repository').base
997
997
        self.assertEqual(repository_base, dir.get_repository_transport(None).base)
998
998
        repository_format = repository.format_registry.get_default()