/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/branch_implementations/test_locking.py

  • Committer: Andrew Bennetts
  • Date: 2009-06-17 02:02:44 UTC
  • mfrom: (4449 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4452.
  • Revision ID: andrew.bennetts@canonical.com-20090617020244-50aantdf95aakvjx
Merge bzr.dev, resolving NEWS conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/branch_implementations/test_locking.py
432
432
            branch.unlock()
433
433
        # We should be unable to relock the repo.
434
434
        self.assertRaises(errors.LockContention, branch.lock_write)
 
435
        # Cleanup
 
436
        branch.lock_write(token)
 
437
        branch.dont_leave_lock_in_place()
 
438
        branch.unlock()
435
439
 
436
440
    def test_dont_leave_lock_in_place(self):
437
441
        branch = self.make_branch('b')