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()> 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()