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.
........

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