← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2008-07-08 14:55:19 UTC
  • mfrom: (3530 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3532.
  • Revision ID: john@arbash-meinel.com-20080708145519-paqg4kjwbpgs2xmq
Merge bzr.dev 3530

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: