[Python-checkins] python/dist/src/Lib/bsddb/test test_dbshelve.py,1.1,1.2 test_dbtables.py,1.1,1.2 test_thread.py,1.1,1.2
loewis@users.sourceforge.net
loewis@users.sourceforge.net
Sat, 23 Nov 2002 03:26:09 -0800
Update of /cvsroot/python/python/dist/src/Lib/bsddb/test
In directory sc8-pr-cvs1:/tmp/cvs-serv21585/Lib/bsddb/test
Modified Files:
test_dbshelve.py test_dbtables.py test_thread.py
Log Message:
Merge with bsddb3 2002.11.23.10.42.36
Index: test_dbshelve.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_dbshelve.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_dbshelve.py 19 Nov 2002 17:47:04 -0000 1.1
--- test_dbshelve.py 23 Nov 2002 11:26:07 -0000 1.2
***************
*** 211,215 ****
class HashShelveTestCase(BasicShelveTestCase):
! dbtype = db.DB_BTREE
dbflags = db.DB_CREATE
--- 211,215 ----
class HashShelveTestCase(BasicShelveTestCase):
! dbtype = db.DB_HASH
dbflags = db.DB_CREATE
***************
*** 221,225 ****
class ThreadHashShelveTestCase(BasicShelveTestCase):
! dbtype = db.DB_BTREE
dbflags = db.DB_CREATE | db.DB_THREAD
--- 221,225 ----
class ThreadHashShelveTestCase(BasicShelveTestCase):
! dbtype = db.DB_HASH
dbflags = db.DB_CREATE | db.DB_THREAD
***************
*** 262,266 ****
class EnvHashShelveTestCase(BasicEnvShelveTestCase):
envflags = 0
! dbtype = db.DB_BTREE
dbflags = db.DB_CREATE
--- 262,266 ----
class EnvHashShelveTestCase(BasicEnvShelveTestCase):
envflags = 0
! dbtype = db.DB_HASH
dbflags = db.DB_CREATE
***************
*** 274,278 ****
class EnvThreadHashShelveTestCase(BasicEnvShelveTestCase):
envflags = db.DB_THREAD
! dbtype = db.DB_BTREE
dbflags = db.DB_CREATE | db.DB_THREAD
--- 274,278 ----
class EnvThreadHashShelveTestCase(BasicEnvShelveTestCase):
envflags = db.DB_THREAD
! dbtype = db.DB_HASH
dbflags = db.DB_CREATE | db.DB_THREAD
Index: test_dbtables.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_dbtables.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_dbtables.py 19 Nov 2002 17:47:04 -0000 1.1
--- test_dbtables.py 23 Nov 2002 11:26:07 -0000 1.2
***************
*** 6,9 ****
--- 6,10 ----
#
# Copyright (C) 2000, 2001 by Autonomous Zone Industries
+ # Copyright (C) 2002 Gregory P. Smith
#
# March 20, 2000
***************
*** 158,161 ****
--- 159,196 ----
assert len(values) == 1
assert values[0]['b'] == "bad"
+
+
+ def test04_MultiCondSelect(self):
+ tabname = "test04_MultiCondSelect"
+ try:
+ self.tdb.Drop(tabname)
+ except dbtables.TableDBError:
+ pass
+ self.tdb.CreateTable(tabname, ['a', 'b', 'c', 'd', 'e'])
+
+ try:
+ self.tdb.Insert(tabname, {'a': "", 'e': pickle.dumps([{4:5, 6:7}, 'foo'], 1), 'f': "Zero"})
+ assert 0
+ except dbtables.TableDBError:
+ pass
+
+ self.tdb.Insert(tabname, {'a': "A", 'b': "B", 'c': "C", 'd': "D", 'e': "E"})
+ self.tdb.Insert(tabname, {'a': "-A", 'b': "-B", 'c': "-C", 'd': "-D", 'e': "-E"})
+ self.tdb.Insert(tabname, {'a': "A-", 'b': "B-", 'c': "C-", 'd': "D-", 'e': "E-"})
+
+ if verbose:
+ self.tdb._db_print()
+
+ # This select should return 0 rows. it is designed to test
+ # the bug identified and fixed in sourceforge bug # 590449
+ # (Big Thanks to "Rob Tillotson (n9mtb)" for tracking this down
+ # and supplying a fix!! This one caused many headaches to say
+ # the least...)
+ values = self.tdb.Select(tabname, ['b', 'a', 'd'],
+ conditions={'e': dbtables.ExactCond('E'),
+ 'a': dbtables.ExactCond('A'),
+ 'd': dbtables.PrefixCond('-')
+ } )
+ assert len(values) == 0, values
Index: test_thread.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bsddb/test/test_thread.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_thread.py 19 Nov 2002 17:47:07 -0000 1.1
--- test_thread.py 23 Nov 2002 11:26:07 -0000 1.2
***************
*** 19,23 ****
from test.test_support import verbose
! from bsddb import db
--- 19,23 ----
from test.test_support import verbose
! from bsddb import db, dbutils
***************
*** 32,35 ****
--- 32,38 ----
def setUp(self):
+ if verbose:
+ dbutils._deadlock_VerboseFile = sys.stdout
+
homeDir = os.path.join(os.path.dirname(sys.argv[0]), 'db_home')
self.homeDir = homeDir
***************
*** 110,114 ****
for x in range(start, stop):
key = '%04d' % x
! d.put(key, self.makeData(key))
if verbose and x % 100 == 0:
print "%s: records %d - %d finished" % (name, start, x)
--- 113,117 ----
for x in range(start, stop):
key = '%04d' % x
! dbutils.DeadlockWrap(d.put, key, self.makeData(key), max_retries=12)
if verbose and x % 100 == 0:
print "%s: records %d - %d finished" % (name, start, x)
***************
*** 213,217 ****
for x in xrange(start, stop):
key = '%04d' % x
! d.put(key, self.makeData(key))
if verbose and x % 100 == 0:
--- 216,220 ----
for x in xrange(start, stop):
key = '%04d' % x
! dbutils.DeadlockWrap(d.put, key, self.makeData(key), max_retries=12)
if verbose and x % 100 == 0:
***************
*** 222,231 ****
for y in xrange(start, x):
key = '%04d' % x
! data = d.get(key)
assert data == self.makeData(key)
# flush them
try:
! d.sync()
except db.DBIncompleteError, val:
if verbose:
--- 225,234 ----
for y in xrange(start, x):
key = '%04d' % x
! data = dbutils.DeadlockWrap(d.get, key, max_retries=12)
assert data == self.makeData(key)
# flush them
try:
! dbutils.DeadlockWrap(d.sync, max_retries=12)
except db.DBIncompleteError, val:
if verbose:
***************
*** 235,244 ****
for x in xrange(start, stop):
key = '%04d' % x
! data = d.get(key)
if verbose and x % 100 == 0:
print "%s: fetched record (%s, %s)" % (name, key, data)
! assert data == self.makeData(key)
if random() <= 0.10:
! d.delete(key)
if verbose:
print "%s: deleted record %s" % (name, key)
--- 238,247 ----
for x in xrange(start, stop):
key = '%04d' % x
! data = dbutils.DeadlockWrap(d.get, key, max_retries=12)
if verbose and x % 100 == 0:
print "%s: fetched record (%s, %s)" % (name, key, data)
! assert data == self.makeData(key), (key, data, self.makeData(key))
if random() <= 0.10:
! dbutils.DeadlockWrap(d.delete, key, max_retries=12)
if verbose:
print "%s: deleted record %s" % (name, key)
***************
*** 274,278 ****
class HashSimpleThreaded(SimpleThreadedBase):
! dbtype = db.DB_BTREE
--- 277,281 ----
class HashSimpleThreaded(SimpleThreadedBase):
! dbtype = db.DB_HASH