Index: Lib/bsddb/test/test_replication.py
===================================================================
--- Lib/bsddb/test/test_replication.py	(revision 68950)
+++ Lib/bsddb/test/test_replication.py	(working copy)
@@ -8,6 +8,7 @@
 from test_all import db, test_support, have_threads, verbose, \
         get_new_environment_path, get_new_database_path
 
+duration = 30
 
 #----------------------------------------------------------------------
 
@@ -76,26 +77,26 @@
         self.dbenvMaster.rep_set_priority(10)
         self.dbenvClient.rep_set_priority(0)
 
-        self.dbenvMaster.rep_set_timeout(db.DB_REP_CONNECTION_RETRY,100123)
-        self.dbenvClient.rep_set_timeout(db.DB_REP_CONNECTION_RETRY,100321)
+        self.dbenvMaster.rep_set_timeout(db.DB_REP_CONNECTION_RETRY,100123 * 1000)
+        self.dbenvClient.rep_set_timeout(db.DB_REP_CONNECTION_RETRY,100321 * 1000)
         self.assertEquals(self.dbenvMaster.rep_get_timeout(
-            db.DB_REP_CONNECTION_RETRY), 100123)
+            db.DB_REP_CONNECTION_RETRY), 100123 * 1000)
         self.assertEquals(self.dbenvClient.rep_get_timeout(
-            db.DB_REP_CONNECTION_RETRY), 100321)
+            db.DB_REP_CONNECTION_RETRY), 100321 * 1000)
 
-        self.dbenvMaster.rep_set_timeout(db.DB_REP_ELECTION_TIMEOUT, 100234)
-        self.dbenvClient.rep_set_timeout(db.DB_REP_ELECTION_TIMEOUT, 100432)
+        self.dbenvMaster.rep_set_timeout(db.DB_REP_ELECTION_TIMEOUT, 100234 * 1000)
+        self.dbenvClient.rep_set_timeout(db.DB_REP_ELECTION_TIMEOUT, 100432 * 1000)
         self.assertEquals(self.dbenvMaster.rep_get_timeout(
-            db.DB_REP_ELECTION_TIMEOUT), 100234)
+            db.DB_REP_ELECTION_TIMEOUT), 100234 * 1000)
         self.assertEquals(self.dbenvClient.rep_get_timeout(
-            db.DB_REP_ELECTION_TIMEOUT), 100432)
+            db.DB_REP_ELECTION_TIMEOUT), 100432 * 1000)
 
-        self.dbenvMaster.rep_set_timeout(db.DB_REP_ELECTION_RETRY, 100345)
-        self.dbenvClient.rep_set_timeout(db.DB_REP_ELECTION_RETRY, 100543)
+        self.dbenvMaster.rep_set_timeout(db.DB_REP_ELECTION_RETRY, 100345 * 1000)
+        self.dbenvClient.rep_set_timeout(db.DB_REP_ELECTION_RETRY, 100543 * 1000)
         self.assertEquals(self.dbenvMaster.rep_get_timeout(
-            db.DB_REP_ELECTION_RETRY), 100345)
+            db.DB_REP_ELECTION_RETRY), 100345 * 1000)
         self.assertEquals(self.dbenvClient.rep_get_timeout(
-            db.DB_REP_ELECTION_RETRY), 100543)
+            db.DB_REP_ELECTION_RETRY), 100543 * 1000)
 
         self.dbenvMaster.repmgr_set_ack_policy(db.DB_REPMGR_ACKS_ALL)
         self.dbenvClient.repmgr_set_ack_policy(db.DB_REPMGR_ACKS_ALL)
@@ -116,22 +117,10 @@
         # is not generated if the master has no new transactions.
         # This is solved in BDB 4.6 (#15542).
         import time
-        timeout = time.time()+10
+        timeout = time.time()+duration
         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
-        # to True - see bug 3892.  BUT - even though this assertion
-        # fails on Windows the rest of the test passes - so to prove
-        # that we let the rest of the test run.  Sadly we can't
-        # make use of raising TestSkipped() here (unittest still
-        # reports it as an error), so we yell to stderr.
-        import sys
-        if sys.platform=="win32":
-            print >> sys.stderr, \
-                "XXX - windows bsddb replication fails on windows and is skipped"
-            print >> sys.stderr, "XXX - Please see issue #3892"
-        else:
-            self.assertTrue(time.time()<timeout)
+        self.assertTrue(time.time()<timeout)
 
         d = self.dbenvMaster.repmgr_site_list()
         self.assertEquals(len(d), 1)
@@ -157,7 +146,7 @@
         txn.commit()
 
         import time,os.path
-        timeout=time.time()+10
+        timeout=time.time()+duration
         while (time.time()<timeout) and \
           not (os.path.exists(os.path.join(self.homeDirClient,"test"))) :
             time.sleep(0.01)
@@ -181,7 +170,7 @@
         self.dbMaster.put("ABC", "123", txn=txn)
         txn.commit()
         import time
-        timeout=time.time()+10
+        timeout=time.time()+duration
         v=None
         while (time.time()<timeout) and (v==None) :
             txn=self.dbenvClient.txn_begin()
@@ -195,7 +184,7 @@
         txn=self.dbenvMaster.txn_begin()
         self.dbMaster.delete("ABC", txn=txn)
         txn.commit()
-        timeout=time.time()+10
+        timeout=time.time()+duration
         while (time.time()<timeout) and (v!=None) :
             txn=self.dbenvClient.txn_begin()
             v=self.dbClient.get("ABC", txn=txn)
@@ -308,7 +297,7 @@
         # is not generated if the master has no new transactions.
         # This is solved in BDB 4.6 (#15542).
         import time
-        timeout = time.time()+10
+        timeout = time.time()+duration
         while (time.time()<timeout) and not (self.confirmed_master and
                 self.client_startupdone) :
             time.sleep(0.02)
@@ -320,7 +309,7 @@
         txn.commit()
 
         import time,os.path
-        timeout=time.time()+10
+        timeout=time.time()+duration
         while (time.time()<timeout) and \
           not (os.path.exists(os.path.join(self.homeDirClient,"test"))) :
             time.sleep(0.01)
@@ -344,7 +333,7 @@
         self.dbMaster.put("ABC", "123", txn=txn)
         txn.commit()
         import time
-        timeout=time.time()+10
+        timeout=time.time()+duration
         v=None
         while (time.time()<timeout) and (v==None) :
             txn=self.dbenvClient.txn_begin()
@@ -358,7 +347,7 @@
         txn=self.dbenvMaster.txn_begin()
         self.dbMaster.delete("ABC", txn=txn)
         txn.commit()
-        timeout=time.time()+10
+        timeout=time.time()+duration
         while (time.time()<timeout) and (v!=None) :
             txn=self.dbenvClient.txn_begin()
             v=self.dbClient.get("ABC", txn=txn)
@@ -417,8 +406,8 @@
             self.t_m.start()
             self.t_c.start()
 
-            self.dbenvMaster.rep_set_timeout(db.DB_REP_ELECTION_TIMEOUT, 50000)
-            self.dbenvClient.rep_set_timeout(db.DB_REP_ELECTION_TIMEOUT, 50000)
+            self.dbenvMaster.rep_set_timeout(db.DB_REP_ELECTION_TIMEOUT, 50000 * 1000)
+            self.dbenvClient.rep_set_timeout(db.DB_REP_ELECTION_TIMEOUT, 50000 * 1000)
             self.client_doing_election[0] = True
             while True :
                 try :