← 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: Aaron Bentley
  • Date: 2007-08-21 01:32:29 UTC
  • mfrom: (2727 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2736.
  • Revision ID: aaron.bentley@utoronto.ca-20070821013229-miopsemz249tv0bl
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_lockdir.py
272
272
        """LockDir.lock_write() will wait for the lock.""" 
273
273
        # the test suite sets the default to 0 to make deadlocks fail fast.
274
274
        # change it for this test, as we want to try a manual deadlock.
 
275
        raise tests.TestSkipped('Timing-sensitive test')
275
276
        bzrlib.lockdir._DEFAULT_TIMEOUT_SECONDS = 300
276
277
        t = self.get_transport()
277
278
        lf1 = LockDir(t, 'test_lock')
394
395
        unlocker.start()
395
396
        try:
396
397
            # Wait and play against the other thread
397
 
            lf2.wait_lock(timeout=1.0, poll=0.01)
 
398
            lf2.wait_lock(timeout=20.0, poll=0.01)
398
399
        finally:
399
400
            unlocker.join()
400
401
        lf2.unlock()