Rev 2716: Disable timing-sensitive test in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2716
revision-id: pqm at pqm.ubuntu.com-20070816141153-z75ruvo3du5ig009
parent: pqm at pqm.ubuntu.com-20070816100939-8cm630hgejoaur5a
parent: abentley at panoramicfeedback.com-20070816124301-c34scx2s0bufyu6e
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-08-16 15:11:53 +0100
message:
  Disable timing-sensitive test
modified:
  bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
    ------------------------------------------------------------
    revno: 2631.1.4
    merged: abentley at panoramicfeedback.com-20070816124301-c34scx2s0bufyu6e
    parent: abentley at panoramicfeedback.com-20070815190311-vig96uoc0xfosll0
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: timing-fix
    timestamp: Thu 2007-08-16 08:43:01 -0400
    message:
      Fix test skip
    ------------------------------------------------------------
    revno: 2631.1.3
    merged: abentley at panoramicfeedback.com-20070815190311-vig96uoc0xfosll0
    parent: abentley at panoramicfeedback.com-20070815190228-53z9lpqr8dfqatb3
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: timing-fix
    timestamp: Wed 2007-08-15 15:03:11 -0400
    message:
      Disable timing-sensitive test_34_lock_write_waits
    ------------------------------------------------------------
    revno: 2631.1.2
    merged: abentley at panoramicfeedback.com-20070815190228-53z9lpqr8dfqatb3
    parent: abentley at panoramicfeedback.com-20070719194243-y0x195iuvhzofujf
    parent: pqm at pqm.ubuntu.com-20070815155635-7o7uhuh1ggjomeh4
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: timing-fix
    timestamp: Wed 2007-08-15 15:02:28 -0400
    message:
      Merge bzr.dev
=== modified file 'bzrlib/tests/test_lockdir.py'
--- a/bzrlib/tests/test_lockdir.py	2007-07-04 09:21:56 +0000
+++ b/bzrlib/tests/test_lockdir.py	2007-08-16 12:43:01 +0000
@@ -272,6 +272,7 @@
         """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.
+        raise tests.TestSkipped('Timing-sensitive test')
         bzrlib.lockdir._DEFAULT_TIMEOUT_SECONDS = 300
         t = self.get_transport()
         lf1 = LockDir(t, 'test_lock')