/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: Martin Pool
  • Date: 2008-03-17 04:31:34 UTC
  • mto: This revision was merged to the branch mainline in revision 3292.
  • Revision ID: mbp@sourcefrog.net-20080317043134-ok36j0eu4g4iazhx
Change more tests to use reduceLockdirTimeout

Show diffs side-by-side

added added

removed removed

Lines of Context:
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.reduceLockdirTimeout()
 
232
                self.assertRaises(errors.LockError, wt.lock_write)
238
233
                self.assertFalse(wt.is_locked())
239
234
                self.assertFalse(wt.branch.is_locked())
240
235
            finally: