← 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: Martin
  • Date: 2010-05-16 15:18:43 UTC
  • mfrom: (5235 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5239.
  • Revision ID: gzlist@googlemail.com-20100516151843-lu53u7caehm3ie3i
Merge bzr.dev to resolve conflicts in NEWS and _chk_map_pyx

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_break_lock.py
41
41
    def test_unlocked_repo_locked(self):
42
42
        # break lock on the branch should try on the repository even
43
43
        # if the branch isn't locked
44
 
        token = self.branch.repository.lock_write()
 
44
        token = self.branch.repository.lock_write().repository_token
45
45
        if token is None:
46
46
            self.branch.repository.unlock()
47
47
            raise tests.TestNotApplicable(