/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/per_branch/test_locking.py

  • Committer: Jonathan Lange
  • Date: 2009-12-09 09:20:42 UTC
  • mfrom: (4881 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4907.
  • Revision ID: jml@canonical.com-20091209092042-s2zgqcf8f39yzxpj
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_locking.py
20
20
from bzrlib.branch import BzrBranchFormat4
21
21
from bzrlib.bzrdir import RemoteBzrDirFormat
22
22
from bzrlib.tests import TestSkipped
23
 
from bzrlib.tests.branch_implementations.test_branch import TestCaseWithBranch
24
23
from bzrlib.tests.lock_helpers import TestPreventLocking, LockWrapper
 
24
from bzrlib.tests.per_branch.test_branch import TestCaseWithBranch
25
25
 
26
26
 
27
27
class TestBranchLocking(TestCaseWithBranch):
139
139
        try:
140
140
            self.assertTrue(b.is_locked())
141
141
            self.assertTrue(b.repository.is_locked())
142
 
            self.assertRaises(TestPreventLocking, b.unlock)
 
142
            self.assertLogsError(TestPreventLocking, b.unlock)
143
143
            if self.combined_control:
144
144
                self.assertTrue(b.is_locked())
145
145
            else:
183
183
        try:
184
184
            self.assertTrue(b.is_locked())
185
185
            self.assertTrue(b.repository.is_locked())
186
 
            self.assertRaises(TestPreventLocking, b.unlock)
 
186
            self.assertLogsError(TestPreventLocking, b.unlock)
187
187
            self.assertTrue(b.is_locked())
188
188
            self.assertTrue(b.repository.is_locked())
189
189