← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_lockdir.py

  • Committer: Martin Pool
  • Date: 2007-04-04 01:22:11 UTC
  • mfrom: (2393.1.1 bzr.docs)
  • mto: This revision was merged to the branch mainline in revision 2397.
  • Revision ID: mbp@sourcefrog.net-20070404012211-sq269me6bai9m6xk
merge trunk and doc fix from elliot

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_lockdir.py
33
33
        LockContention, LockError, UnlockableTransport,
34
34
        LockNotHeld, LockBroken
35
35
        )
36
 
from bzrlib.lockdir import LockDir, _DEFAULT_TIMEOUT_SECONDS
 
36
from bzrlib.lockdir import LockDir
37
37
from bzrlib.tests import TestCaseWithTransport
38
38
from bzrlib.trace import note
39
39
 
286
286
 
287
287
    def test_34_lock_write_waits(self):
288
288
        """LockDir.lock_write() will wait for the lock.""" 
 
289
        # the test suite sets the default to 0 to make deadlocks fail fast.
 
290
        # change it for this test, as we want to try a manual deadlock.
 
291
        bzrlib.lockdir._DEFAULT_TIMEOUT_SECONDS = 300
289
292
        t = self.get_transport()
290
293
        lf1 = LockDir(t, 'test_lock')
291
294
        lf1.create()