← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_break_lock.py

  • Committer: Shannon Weyrick
  • Date: 2011-11-04 13:40:04 UTC
  • mfrom: (6238 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6256.
  • Revision ID: weyrick@mozek.us-20111104134004-033t2wqhc3ydzm0a
Merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_break_lock.py
16
16
 
17
17
"""Tests for branch break-lock behaviour."""
18
18
 
19
 
from  bzrlib import (
 
19
from bzrlib import (
 
20
    branch as _mod_branch,
20
21
    errors,
21
22
    ui,
22
23
    tests,
29
30
    def setUp(self):
30
31
        super(TestBreakLock, self).setUp()
31
32
        self.unused_branch = self.make_branch('branch')
32
 
        self.branch = self.unused_branch.bzrdir.open_branch()
 
33
        self.branch = _mod_branch.Branch.open(self.unused_branch.base)
33
34
 
34
35
    def test_unlocked(self):
35
36
        # break lock when nothing is locked should just return