← 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-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_branch.py
30
30
    config,
31
31
    controldir,
32
32
    errors,
33
 
    symbol_versioning,
34
33
    tests,
35
34
    trace,
36
35
    urlutils,
37
36
    )
 
37
from bzrlib.branchfmt.fullhistory import (
 
38
    BzrBranch5,
 
39
    BzrBranchFormat5,
 
40
    )
38
41
 
39
42
 
40
43
class TestDefaultFormat(tests.TestCase):
75
78
        url = self.get_url()
76
79
        bdir = bzrdir.BzrDirMetaFormat1().initialize(url)
77
80
        bdir.create_repository()
78
 
        branch = _mod_branch.BzrBranchFormat5().initialize(bdir)
 
81
        branch = BzrBranchFormat5().initialize(bdir)
79
82
        t = self.get_transport()
80
83
        self.log("branch instance is %r" % branch)
81
 
        self.assert_(isinstance(branch, _mod_branch.BzrBranch5))
 
84
        self.assert_(isinstance(branch, BzrBranch5))
82
85
        self.assertIsDirectory('.', t)
83
86
        self.assertIsDirectory('.bzr/branch', t)
84
87
        self.assertIsDirectory('.bzr/branch/lock', t)
185
188
            format.initialize(dir)
186
189
            found_format = _mod_branch.BranchFormatMetadir.find_format(dir)
187
190
            self.assertIsInstance(found_format, format.__class__)
188
 
        check_format(_mod_branch.BzrBranchFormat5(), "bar")
 
191
        check_format(BzrBranchFormat5(), "bar")
189
192
 
190
193
    def test_find_format_factory(self):
191
194
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())