Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 23:21:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix more Errors (not Failures) when run using BerkeleyDB <= 4.0

Browse source
This commit is contained in:
Gregory P. Smith 2005-06-06 18:12:24 +00:00
parent c9321ccdfc
commit 7e87a8a0be
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Lib/bsddb/test/test_associate.py
View file

@ -127,7 +127,8 @@ def test00_associateDBError(self):
# dupDB has been configured to allow duplicates, it can't # dupDB has been configured to allow duplicates, it can't
# associate with a secondary. BerkeleyDB will return an error. # associate with a secondary. BerkeleyDB will return an error.
try: try:
dupDB.associate(secDB, lambda a, b: a+b) def f(a,b): return a+b
dupDB.associate(secDB, f)
except db.DBError: except db.DBError:
# good # good
secDB.close() secDB.close()
@ -181,8 +182,12 @@ def createDB(self, txn=None):
self.secDB = None self.secDB = None
self.primary = db.DB(self.env) self.primary = db.DB(self.env)
self.primary.set_get_returns_none(2) self.primary.set_get_returns_none(2)
self.primary.open(self.filename, "primary", self.dbtype, if db.version() >= (4, 1):
self.primary.open(self.filename, "primary", self.dbtype,
db.DB_CREATE | db.DB_THREAD | self.dbFlags, txn=txn) db.DB_CREATE | db.DB_THREAD | self.dbFlags, txn=txn)
else:
self.primary.open(self.filename, "primary", self.dbtype,
db.DB_CREATE | db.DB_THREAD | self.dbFlags)
def closeDB(self): def closeDB(self):
if self.cur: if self.cur:
@ -346,7 +351,10 @@ def test13_associate_in_transaction(self):
self.secDB.set_get_returns_none(2) self.secDB.set_get_returns_none(2)
self.secDB.open(self.filename, "secondary", db.DB_BTREE, self.secDB.open(self.filename, "secondary", db.DB_BTREE,
db.DB_CREATE | db.DB_THREAD, txn=txn) db.DB_CREATE | db.DB_THREAD, txn=txn)
self.getDB().associate(self.secDB, self.getGenre, txn=txn) if db.version() >= (4,1):
self.getDB().associate(self.secDB, self.getGenre, txn=txn)
else:
self.getDB().associate(self.secDB, self.getGenre)
self.addDataToDB(self.getDB(), txn=txn) self.addDataToDB(self.getDB(), txn=txn)
except: except:
@ -446,7 +454,8 @@ def test_suite():
suite.addTest(unittest.makeSuite(AssociateBTreeTestCase)) suite.addTest(unittest.makeSuite(AssociateBTreeTestCase))
suite.addTest(unittest.makeSuite(AssociateRecnoTestCase)) suite.addTest(unittest.makeSuite(AssociateRecnoTestCase))
suite.addTest(unittest.makeSuite(AssociateBTreeTxnTestCase)) if db.version() >= (4, 1):
suite.addTest(unittest.makeSuite(AssociateBTreeTxnTestCase))
suite.addTest(unittest.makeSuite(ShelveAssociateHashTestCase)) suite.addTest(unittest.makeSuite(ShelveAssociateHashTestCase))
suite.addTest(unittest.makeSuite(ShelveAssociateBTreeTestCase)) suite.addTest(unittest.makeSuite(ShelveAssociateBTreeTestCase))