Issue #19572: More silently skipped tests explicitly skipped.
diff --git a/Lib/test/test_bsddb.py b/Lib/test/test_bsddb.py
index d1ee0a1..3a10fab 100755
--- a/Lib/test/test_bsddb.py
+++ b/Lib/test/test_bsddb.py
@@ -47,10 +47,7 @@
self.assertIn('discovered', self.f.values())
def test_close_and_reopen(self):
- if self.fname is None:
- # if we're using an in-memory only db, we can't reopen it
- # so finish here.
- return
+ self.assertIsNotNone(self.fname)
self.f.close()
self.f = self.openmethod[0](self.fname, 'w')
for k, v in self.d.iteritems():
@@ -309,8 +306,7 @@
self.assertEqual(self.f[k], v)
def test_keyordering(self):
- if self.openmethod[0] is not bsddb.btopen:
- return
+ self.assertIs(self.openmethod[0], bsddb.btopen)
keys = self.d.keys()
keys.sort()
self.assertEqual(self.f.first()[0], keys[0])
@@ -327,19 +323,34 @@
fname = None
openmethod = [bsddb.btopen]
+ # if we're using an in-memory only db, we can't reopen it
+ test_close_and_reopen = None
+
class TestBTree_InMemory_Truncate(TestBSDDB):
fname = None
openflag = 'n'
openmethod = [bsddb.btopen]
+ # if we're using an in-memory only db, we can't reopen it
+ test_close_and_reopen = None
+
class TestHashTable(TestBSDDB):
fname = test_support.TESTFN
openmethod = [bsddb.hashopen]
+ # keyordering is specific to btopen method
+ test_keyordering = None
+
class TestHashTable_InMemory(TestBSDDB):
fname = None
openmethod = [bsddb.hashopen]
+ # if we're using an in-memory only db, we can't reopen it
+ test_close_and_reopen = None
+
+ # keyordering is specific to btopen method
+ test_keyordering = None
+
## # (bsddb.rnopen,'Record Numbers'), 'put' for RECNO for bsddb 1.85
## # appears broken... at least on
## # Solaris Intel - rmasse 1/97