← 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: Martin Pool
  • Date: 2006-03-09 02:01:51 UTC
  • mto: This revision was merged to the branch mainline in revision 1602.
  • Revision ID: mbp@sourcefrog.net-20060309020151-4035fc90446822e8
Clean up test for Branch5 lockdirs

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_branch.py
60
60
    """Tests specific to branch format 5"""
61
61
 
62
62
    def test_branch_format_5_uses_lockdir(self):
63
 
        # XXX: There's really got to be a better way than setting the default
64
 
        # format!  All I want is to create a bzrdir of a specified format.
65
63
        url = self.get_url()
66
 
        old_format = bzrdir.BzrDirFormat.get_default_format()
67
 
        BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
68
 
        try:
69
 
            branch = BzrDir.create_branch_and_repo(url)
70
 
            self.log("branch instance is %r" % branch)
71
 
            self.assert_(isinstance(branch, BzrBranch5))
72
 
            self.assertIsDirectory('.', self.get_transport())
73
 
            self.assertIsDirectory('.bzr/branch', self.get_transport())
74
 
            self.assertIsDirectory('.bzr/branch/lock', self.get_transport())
75
 
        finally:
76
 
            bzrdir.BzrDirFormat.set_default_format(old_format)
 
64
        bzrdir = BzrDirMetaFormat1().initialize(url)
 
65
        bzrdir.create_repository()
 
66
        branch = bzrdir.create_branch()
 
67
        t = self.get_transport()
 
68
        self.log("branch instance is %r" % branch)
 
69
        self.assert_(isinstance(branch, BzrBranch5))
 
70
        self.assertIsDirectory('.', t)
 
71
        self.assertIsDirectory('.bzr/branch', t)
 
72
        self.assertIsDirectory('.bzr/branch/lock', t)
 
73
        # branch.lock_read()
 
74
        # try:
 
75
        #     self.assertIsDirectory('.bzr/branch/lock/held', t)
 
76
        # finally:
 
77
        #     branch.unlock()
77
78
 
78
79
 
79
80
class SampleBranchFormat(bzrlib.branch.BranchFormat):