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

  • Committer: Andrew Bennetts
  • Date: 2008-03-26 10:12:45 UTC
  • mfrom: (3306 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3308.
  • Revision ID: andrew.bennetts@canonical.com-20080326101245-fkocwgvpebr1z5bd
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_locking.py
228
228
        branch_copy.lock_write()
229
229
        try:
230
230
            try:
231
 
                orig_default = lockdir._DEFAULT_TIMEOUT_SECONDS
232
 
                try:
233
 
                    lockdir._DEFAULT_TIMEOUT_SECONDS = 1
234
 
                    self.assertRaises(errors.LockError, wt.lock_write)
235
 
                finally:
236
 
                    lockdir._DEFAULT_TIMEOUT_SECONDS = orig_default
237
 
 
 
231
                self.assertRaises(errors.LockError, wt.lock_write)
238
232
                self.assertFalse(wt.is_locked())
239
233
                self.assertFalse(wt.branch.is_locked())
240
234
            finally: