mirror of
https://github.com/python/cpython.git
synced 2025-10-21 06:02:21 +00:00
568065e9d1
Merge r58757 and r58758 from trunk. Undoes incorrect dbtables fix and errant strdup introduced as described below: r58757 | gregory.p.smith | 2007-11-01 14:08:14 -0700 (Thu, 01 Nov 2007) | 4 lines Fix bug introduced in revision 58385. Database keys could no longer have NULL bytes in them. Replace the errant strdup with a malloc+memcpy. Adds a unit test for the correct behavior. r58758 | gregory.p.smith | 2007-11-01 14:15:36 -0700 (Thu, 01 Nov 2007) | 3 lines Undo revision 58533 58534 fixes. Those were a workaround for a problem introduced by 58385.
97 lines
2.8 KiB
Python
97 lines
2.8 KiB
Python
"""Miscellaneous bsddb module test cases
|
|
"""
|
|
|
|
import os
|
|
import shutil
|
|
import sys
|
|
import unittest
|
|
import tempfile
|
|
|
|
try:
|
|
# For Pythons w/distutils pybsddb
|
|
from bsddb3 import db, dbshelve, hashopen
|
|
except ImportError:
|
|
# For the bundled bsddb
|
|
from bsddb import db, dbshelve, hashopen
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
class MiscTestCase(unittest.TestCase):
|
|
def setUp(self):
|
|
self.filename = self.__class__.__name__ + '.db'
|
|
self.homeDir = tempfile.mkdtemp()
|
|
|
|
def tearDown(self):
|
|
try:
|
|
os.remove(self.filename)
|
|
except OSError:
|
|
pass
|
|
shutil.rmtree(self.homeDir)
|
|
|
|
def test01_badpointer(self):
|
|
dbs = dbshelve.open(self.filename)
|
|
dbs.close()
|
|
self.assertRaises(db.DBError, dbs.get, b"foo")
|
|
|
|
def test02_db_home(self):
|
|
env = db.DBEnv()
|
|
# check for crash fixed when db_home is used before open()
|
|
assert env.db_home is None
|
|
env.open(self.homeDir, db.DB_CREATE)
|
|
assert self.homeDir == env.db_home
|
|
|
|
def test03_repr_closed_db(self):
|
|
db = hashopen(self.filename)
|
|
db.close()
|
|
rp = repr(db)
|
|
self.assertEquals(rp, "{}")
|
|
|
|
# http://sourceforge.net/tracker/index.php?func=detail&aid=1708868&group_id=13900&atid=313900
|
|
#
|
|
# See the bug report for details.
|
|
#
|
|
# The problem was that make_key_dbt() was not allocating a copy of
|
|
# string keys but FREE_DBT() was always being told to free it when the
|
|
# database was opened with DB_THREAD.
|
|
def test04_double_free_make_key_dbt(self):
|
|
try:
|
|
db1 = db.DB()
|
|
db1.open(self.filename, None, db.DB_BTREE,
|
|
db.DB_CREATE | db.DB_THREAD)
|
|
|
|
curs = db1.cursor()
|
|
t = curs.get(b"/foo", db.DB_SET)
|
|
# double free happened during exit from DBC_get
|
|
finally:
|
|
db1.close()
|
|
os.unlink(self.filename)
|
|
|
|
def test05_key_with_null_bytes(self):
|
|
try:
|
|
db1 = db.DB()
|
|
db1.open(self.filename, None, db.DB_HASH, db.DB_CREATE)
|
|
db1[b'a'] = b'eh?'
|
|
db1[b'a\x00'] = b'eh zed.'
|
|
db1[b'a\x00a'] = b'eh zed eh?'
|
|
db1[b'aaa'] = b'eh eh eh!'
|
|
keys = db1.keys()
|
|
keys.sort()
|
|
self.assertEqual([b'a', b'a\x00', b'a\x00a', b'aaa'], keys)
|
|
self.assertEqual(db1[b'a'], b'eh?')
|
|
self.assertEqual(db1[b'a\x00'], b'eh zed.')
|
|
self.assertEqual(db1[b'a\x00a'], b'eh zed eh?')
|
|
self.assertEqual(db1[b'aaa'], b'eh eh eh!')
|
|
finally:
|
|
db1.close()
|
|
os.unlink(self.filename)
|
|
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
|
|
def test_suite():
|
|
return unittest.makeSuite(MiscTestCase)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
unittest.main(defaultTest='test_suite')
|