summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2009-11-11 18:09:13 +0000
committerR. David Murray <rdmurray@bitdance.com>2009-11-11 18:09:13 +0000
commit55669d04adf847f5428dc314cb79c016cc5b5595 (patch)
tree53a272c20b552a8ec6f9742980a542eb64d9af92
parentf25702a099041d766c5d41b6bc1044739f4fdc2d (diff)
downloadcpython-git-55669d04adf847f5428dc314cb79c016cc5b5595.tar.gz
Merged revisions 76214 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r76214 | r.david.murray | 2009-11-11 13:07:27 -0500 (Wed, 11 Nov 2009) | 5 lines I got the relative magnitudes of the timeout increases reversed, so I'm bumping up the longer test to the 60 seconds I intended to make it. If this doesn't cure the intermittent buildbot timeouts, I'm going to turn that test into a warning rather than a failure. ........
-rw-r--r--Lib/bsddb/test/test_replication.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/bsddb/test/test_replication.py b/Lib/bsddb/test/test_replication.py
index faeaf4673d..8e8309b97e 100644
--- a/Lib/bsddb/test/test_replication.py
+++ b/Lib/bsddb/test/test_replication.py
@@ -116,7 +116,7 @@ class DBReplicationManager(unittest.TestCase):
# is not generated if the master has no new transactions.
# This is solved in BDB 4.6 (#15542).
import time
- timeout = time.time()+30
+ timeout = time.time()+60
while (time.time()<timeout) and not (self.confirmed_master and self.client_startupdone) :
time.sleep(0.02)
# this fails on Windows as self.client_startupdone never gets set