Refinements in the bsddb testsuite

2 files changed, 4 insertions, 4 deletions

diff --git a/Lib/bsddb/test/test_misc.py b/Lib/bsddb/test/test_misc.py
index dce7e0c..f7c26d9 100644
--- a/Lib/bsddb/test/test_misc.py
+++ b/Lib/bsddb/test/test_misc.py
@@ -77,7 +77,7 @@ class MiscTestCase(unittest.TestCase):
             # double free happened during exit from DBC_get
         finally:
             db1.close()
-            os.unlink(self.filename)
+            test_support.unlink(self.filename)
 
     def test06_key_with_null_bytes(self):
         try:
@@ -96,7 +96,7 @@ class MiscTestCase(unittest.TestCase):
             self.assertEqual(db1['aaa'], 'eh eh eh!')
         finally:
             db1.close()
-            os.unlink(self.filename)
+            test_support.unlink(self.filename)
 
     def test07_DB_set_flags_persists(self):
         if db.version() < (4,2):
@@ -124,7 +124,7 @@ class MiscTestCase(unittest.TestCase):
             self.assertEqual([('a', 'new A')], db1.items())
         finally:
             db1.close()
-            os.unlink(self.filename)
+            test_support.unlink(self.filename)
 
 
 #----------------------------------------------------------------------
diff --git a/Lib/bsddb/test/test_replication.py b/Lib/bsddb/test/test_replication.py
index 8f2651f..f9102d7 100644
--- a/Lib/bsddb/test/test_replication.py
+++ b/Lib/bsddb/test/test_replication.py
@@ -131,7 +131,7 @@ class DBReplicationManager(unittest.TestCase):
         timeout = time.time()+2
         while (time.time()<timeout) and not (self.confirmed_master and self.client_startupdone) :
             time.sleep(0.02)
-        self.assertTrue(time.time()<timeout)
+        self.assertTrue(time.time()<timeout, msg = "Timeout Error: "+str(time.time()-timeout))
 
         d = self.dbenvMaster.repmgr_site_list()
         self.assertEquals(len(d), 1)