diff options
| author | Trent Nelson <trent.nelson@snakebite.org> | 2008-06-27 02:30:34 (GMT) |
|---|---|---|
| committer | Trent Nelson <trent.nelson@snakebite.org> | 2008-06-27 02:30:34 (GMT) |
| commit | 6e7e137cff5853ef0b2258b99df852e1ce098965 (patch) | |
| tree | f3e01471b8d8acdc6b684c476ae888f9af635eb3 /Lib/bsddb | |
| parent | d4a224bd800d9eb5ad68fdfce2193b3ab1c4b4ef (diff) | |
| download | cpython-6e7e137cff5853ef0b2258b99df852e1ce098965.zip cpython-6e7e137cff5853ef0b2258b99df852e1ce098965.tar.gz cpython-6e7e137cff5853ef0b2258b99df852e1ce098965.tar.bz2 | |
Merged revisions 64368-64369 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/tnelson-trunk-bsddb-47-upgrade
........
r64368 | trent.nelson | 2008-06-17 23:13:44 -0500 (Tue, 17 Jun 2008) | 1 line
Initial commit of work pertaining to switching the Windows build from Berkeley DB 4.4.20 to 4.7.25. Note that I've deprecated the standalone '_bsddb44.vcproj' in lieu of adding the sources in a separate folder to the _bsddb project. This was a conscious decision and actually makes everything far more easier to manage. With this approach, entire test suite passed straight off the bat. Well, almost -- the timeout in bsddb/test/test_replication.py needed bumping up a little -- 2 seconds was too short. 10 seconds seems to be fine for me, but I'll make sure Jesus verifies. More documentation to come once I've been able to test out this approach on the buildbots (hence keeping the changes in a separate branch for now).
........
r64369 | trent.nelson | 2008-06-17 23:19:12 -0500 (Tue, 17 Jun 2008) | 1 line
Bump Berkeley DB version from 4.4.20 to 4.7.25.
........
Diffstat (limited to 'Lib/bsddb')
| -rw-r--r-- | Lib/bsddb/test/test_replication.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/bsddb/test/test_replication.py b/Lib/bsddb/test/test_replication.py index 693e067..25ca34a 100644 --- a/Lib/bsddb/test/test_replication.py +++ b/Lib/bsddb/test/test_replication.py @@ -94,7 +94,7 @@ class DBReplicationManager(unittest.TestCase): # The timeout is necessary in BDB 4.5, since DB_EVENT_REP_STARTUPDONE # is not generated if the master has no new transactions. # This is solved in BDB 4.6 (#15542). - timeout = time.time()+2 + timeout = time.time()+10 while (time.time()<timeout) and not (self.confirmed_master and self.client_startupdone) : time.sleep(0.02) if db.version() >= (4,6) : |