Rev 2385: Unbreak lockdir tests after adding fast lockdir timeouts to the test suite default environment. in file:///home/robertc/source/baz/hpss-test-correctness/

[Robert Collins]

At file:///home/robertc/source/baz/hpss-test-correctness/

------------------------------------------------------------
revno: 2385
revision-id: robertc at robertcollins.net-20070329014154-2syh5qahvcokiq3p
parent: robertc at robertcollins.net-20070328223141-sfyiqllwuimpvj06
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-test-correctness
timestamp: Thu 2007-03-29 11:41:54 +1000
message:
  Unbreak lockdir tests after adding fast lockdir timeouts to the test suite default environment.
modified:
  bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
=== modified file 'bzrlib/tests/test_lockdir.py'
--- a/bzrlib/tests/test_lockdir.py	2007-02-01 14:59:04 +0000
+++ b/bzrlib/tests/test_lockdir.py	2007-03-29 01:41:54 +0000
@@ -33,7 +33,7 @@
         LockContention, LockError, UnlockableTransport,
         LockNotHeld, LockBroken
         )
-from bzrlib.lockdir import LockDir, _DEFAULT_TIMEOUT_SECONDS
+from bzrlib.lockdir import LockDir
 from bzrlib.tests import TestCaseWithTransport
 from bzrlib.trace import note
 
@@ -286,6 +286,9 @@
 
     def test_34_lock_write_waits(self):
         """LockDir.lock_write() will wait for the lock.""" 
+        # the test suite sets the default to 0 to make deadlocks fail fast.
+        # change it for this test, as we want to try a manual deadlock.
+        bzrlib.lockdir._DEFAULT_TIMEOUT_SECONDS = 300
         t = self.get_transport()
         lf1 = LockDir(t, 'test_lock')
         lf1.create()