Skip to content

C
cpython
Commit 3fd22da6 authored by Gregory P. Smith's avatar Gregory P. Smith
Browse files
Options

some test suite cleanup, use tempfile.mkdtemp() in setUp and 

shutil.rmtree() in tearDown().  add missing tests to the list
in the test_bsddb3 suite.
parent a280ca75
Show whitespace changes
Inline Side-by-side
Showing with 178 additions and 227 deletions
Lib/bsddb/dbtables.py
View file @ 3fd22da6
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
# software has been tested, but no warranty is expressed or # software has been tested, but no warranty is expressed or
# implied. # implied.
# #
# -- Gregory P. Smith <greg@electricrain.com> # -- Gregory P. Smith <greg@krypto.org>
# This provides a simple database table interface built on top of # This provides a simple database table interface built on top of
# the Python BerkeleyDB 3 interface. # the Python BerkeleyDB 3 interface.
......
Lib/bsddb/dbutils.py
View file @ 3fd22da6
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
# software has been tested, but no warranty is expressed or # software has been tested, but no warranty is expressed or
# implied. # implied.
# #
# Author: Gregory P. Smith <greg@electricrain.com> # Author: Gregory P. Smith <greg@krypto.org>
# #
# Note: I don't know how useful this is in reality since when a # Note: I don't know how useful this is in reality since when a
# DBLockDeadlockError happens the current transaction is supposed to be # DBLockDeadlockError happens the current transaction is supposed to be
...@@ -19,13 +19,7 @@ ...@@ -19,13 +19,7 @@
# #
#------------------------------------------------------------------------ #------------------------------------------------------------------------
import time
#
# import the time.sleep function in a namespace safe way to allow
# "from bsddb.dbutils import *"
#
from time import sleep as _sleep
from . import db from . import db
# always sleep at least N seconds between retrys # always sleep at least N seconds between retrys
...@@ -60,17 +54,22 @@ def DeadlockWrap(function, *_args, **_kwargs): ...@@ -60,17 +54,22 @@ def DeadlockWrap(function, *_args, **_kwargs):
while True: while True:
try: try:
return function(*_args, **_kwargs) return function(*_args, **_kwargs)
except db.DBLockDeadlockError: except db.DBLockDeadlockError as e:
if _deadlock_VerboseFile: if _deadlock_VerboseFile:
_deadlock_VerboseFile.write( _deadlock_VerboseFile.write(
'dbutils.DeadlockWrap: sleeping %1.3f\n' % sleeptime) 'bsddb.dbutils.DeadlockWrap: ' +
_sleep(sleeptime) 'sleeping %1.3f\n' % sleeptime)
time.sleep(sleeptime)
# exponential backoff in the sleep time # exponential backoff in the sleep time
sleeptime *= 2 sleeptime *= 2
if sleeptime > _deadlock_MaxSleepTime: if sleeptime > _deadlock_MaxSleepTime:
sleeptime = _deadlock_MaxSleepTime sleeptime = _deadlock_MaxSleepTime
max_retries -= 1 max_retries -= 1
if max_retries == -1: if max_retries == -1:
if _deadlock_VerboseFile:
_deadlock_VerboseFile.write(
'bsddb.dbutils.DeadlockWrap: ' +
'max_retries reached, reraising %s\n' % e)
raise raise
......
Lib/bsddb/test/test_all.py
View file @ 3fd22da6
...@@ -11,13 +11,13 @@ except ImportError: ...@@ -11,13 +11,13 @@ except ImportError:
# For Python 2.3 # For Python 2.3
from bsddb import db from bsddb import db
verbose = 0 verbose = False
if 'verbose' in sys.argv: if 'verbose' in sys.argv:
verbose = 1 verbose = True
sys.argv.remove('verbose') sys.argv.remove('verbose')
if 'silent' in sys.argv: # take care of old flag, just in case if 'silent' in sys.argv: # take care of old flag, just in case
verbose = 0 verbose = False
sys.argv.remove('silent') sys.argv.remove('silent')
......
Lib/bsddb/test/test_associate.py
View file @ 3fd22da6
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
TestCases for DB.associate. TestCases for DB.associate.
""" """
import shutil
import sys, os import sys, os
import tempfile import tempfile
import time import time
...@@ -14,7 +15,7 @@ except ImportError: ...@@ -14,7 +15,7 @@ except ImportError:
have_threads = 0 have_threads = 0
import unittest import unittest
from .test_all import verbose from bsddb.test.test_all import verbose
try: try:
# For Pythons w/distutils pybsddb # For Pythons w/distutils pybsddb
...@@ -91,25 +92,14 @@ musicdata = { ...@@ -91,25 +92,14 @@ musicdata = {
class AssociateErrorTestCase(unittest.TestCase): class AssociateErrorTestCase(unittest.TestCase):
def setUp(self): def setUp(self):
self.filename = self.__class__.__name__ + '.db' self.filename = self.__class__.__name__ + '.db'
homeDir = os.path.join(tempfile.gettempdir(), 'db_home') self.homeDir = tempfile.mkdtemp()
self.homeDir = homeDir
try:
os.mkdir(homeDir)
except os.error:
import glob
files = glob.glob(os.path.join(self.homeDir, '*'))
for file in files:
os.remove(file)
self.env = db.DBEnv() self.env = db.DBEnv()
self.env.open(homeDir, db.DB_CREATE | db.DB_INIT_MPOOL) self.env.open(self.homeDir, db.DB_CREATE | db.DB_INIT_MPOOL)
def tearDown(self): def tearDown(self):
self.env.close() self.env.close()
self.env = None self.env = None
import glob shutil.rmtree(self.homeDir)
files = glob.glob(os.path.join(self.homeDir, '*'))
for file in files:
os.remove(file)
def test00_associateDBError(self): def test00_associateDBError(self):
...@@ -151,27 +141,16 @@ class AssociateTestCase(unittest.TestCase): ...@@ -151,27 +141,16 @@ class AssociateTestCase(unittest.TestCase):
def setUp(self): def setUp(self):
self.filename = self.__class__.__name__ + '.db' self.filename = self.__class__.__name__ + '.db'
homeDir = os.path.join(os.path.dirname(sys.argv[0]), 'db_home') self.homeDir = tempfile.mkdtemp()
self.homeDir = homeDir
try:
os.mkdir(homeDir)
except os.error:
import glob
files = glob.glob(os.path.join(self.homeDir, '*'))
for file in files:
os.remove(file)
self.env = db.DBEnv() self.env = db.DBEnv()
self.env.open(homeDir, db.DB_CREATE | db.DB_INIT_MPOOL | self.env.open(self.homeDir, db.DB_CREATE | db.DB_INIT_MPOOL |
db.DB_INIT_LOCK | db.DB_THREAD | self.envFlags) db.DB_INIT_LOCK | db.DB_THREAD | self.envFlags)
def tearDown(self): def tearDown(self):
self.closeDB() self.closeDB()
self.env.close() self.env.close()
self.env = None self.env = None
import glob shutil.rmtree(self.homeDir)
files = glob.glob(os.path.join(self.homeDir, '*'))
for file in files:
os.remove(file)
def addDataToDB(self, d, txn=None): def addDataToDB(self, d, txn=None):
for key, value in musicdata.items(): for key, value in musicdata.items():
......
Lib/bsddb/test/test_basics.py
View file @ 3fd22da6
...@@ -20,7 +20,7 @@ except ImportError: ...@@ -20,7 +20,7 @@ except ImportError:
# For Python 2.3 # For Python 2.3
from bsddb import db from bsddb import db
from .test_all import verbose from bsddb.test.test_all import verbose
DASH = b'-' DASH = b'-'
letters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' letters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
...@@ -54,27 +54,21 @@ class BasicTestCase(unittest.TestCase): ...@@ -54,27 +54,21 @@ class BasicTestCase(unittest.TestCase):
def setUp(self): def setUp(self):
if self.useEnv: if self.useEnv:
homeDir = os.path.join(tempfile.gettempdir(), 'db_home') self.homeDir = tempfile.mkdtemp()
self.homeDir = homeDir
try:
shutil.rmtree(homeDir)
except OSError as e:
# unix returns ENOENT, windows returns ESRCH
if e.errno not in (errno.ENOENT, errno.ESRCH): raise
os.mkdir(homeDir)
try: try:
self.env = db.DBEnv() self.env = db.DBEnv()
self.env.set_lg_max(1024*1024) self.env.set_lg_max(1024*1024)
self.env.set_tx_max(30) self.env.set_tx_max(30)
self.env.set_tx_timestamp(int(time.time())) self.env.set_tx_timestamp(int(time.time()))
self.env.set_flags(self.envsetflags, 1) self.env.set_flags(self.envsetflags, 1)
self.env.open(homeDir, self.envflags | db.DB_CREATE) self.env.open(self.homeDir, self.envflags | db.DB_CREATE)
tempfile.tempdir = homeDir old_tempfile_tempdir = tempfile.tempdir
tempfile.tempdir = self.homeDir
self.filename = os.path.split(tempfile.mktemp())[1] self.filename = os.path.split(tempfile.mktemp())[1]
tempfile.tempdir = None tempfile.tempdir = old_tempfile_tempdir
# Yes, a bare except is intended, since we're re-raising the exc. # Yes, a bare except is intended, since we're re-raising the exc.
except: except:
shutil.rmtree(homeDir) shutil.rmtree(self.homeDir)
raise raise
else: else:
self.env = None self.env = None
......
Lib/bsddb/test/test_compare.py
View file @ 3fd22da6
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
TestCases for python DB Btree key comparison function. TestCases for python DB Btree key comparison function.
""" """
import shutil
import sys, os, re import sys, os, re
from io import StringIO from io import StringIO
import tempfile
from . import test_all
import unittest import unittest
try: try:
...@@ -18,15 +18,18 @@ except ImportError: ...@@ -18,15 +18,18 @@ except ImportError:
lexical_cmp = cmp lexical_cmp = cmp
def lowercase_cmp(left, right): def lowercase_cmp(left, right):
return cmp (left.lower(), right.lower()) return cmp (str(left, encoding='ascii').lower(),
str(right, encoding='ascii').lower())
def make_reverse_comparator (cmp): def make_reverse_comparator (cmp):
def reverse (left, right, delegate=cmp): def reverse (left, right, delegate=cmp):
return - delegate (left, right) return - delegate (left, right)
return reverse return reverse
_expected_lexical_test_data = ['', 'CCCP', 'a', 'aaa', 'b', 'c', 'cccce', 'ccccf'] _expected_lexical_test_data = [bytes(_) for _ in
_expected_lowercase_test_data = ['', 'a', 'aaa', 'b', 'c', 'CC', 'cccce', 'ccccf', 'CCCP'] ('', 'CCCP', 'a', 'aaa', 'b', 'c', 'cccce', 'ccccf')]
_expected_lowercase_test_data = [bytes(_) for _ in
('', 'a', 'aaa', 'b', 'c', 'CC', 'cccce', 'ccccf', 'CCCP')]
class ComparatorTests (unittest.TestCase): class ComparatorTests (unittest.TestCase):
def comparator_test_helper (self, comparator, expected_data): def comparator_test_helper (self, comparator, expected_data):
...@@ -52,15 +55,10 @@ class AbstractBtreeKeyCompareTestCase (unittest.TestCase): ...@@ -52,15 +55,10 @@ class AbstractBtreeKeyCompareTestCase (unittest.TestCase):
def setUp (self): def setUp (self):
self.filename = self.__class__.__name__ + '.db' self.filename = self.__class__.__name__ + '.db'
homeDir = os.path.join (os.path.dirname (sys.argv[0]), 'db_home') self.homeDir = tempfile.mkdtemp()
self.homeDir = homeDir
try:
os.mkdir (homeDir)
except os.error:
pass
env = db.DBEnv () env = db.DBEnv ()
env.open (homeDir, env.open (self.homeDir,
db.DB_CREATE | db.DB_INIT_MPOOL db.DB_CREATE | db.DB_INIT_MPOOL
| db.DB_INIT_LOCK | db.DB_THREAD) | db.DB_INIT_LOCK | db.DB_THREAD)
self.env = env self.env = env
...@@ -70,8 +68,7 @@ class AbstractBtreeKeyCompareTestCase (unittest.TestCase): ...@@ -70,8 +68,7 @@ class AbstractBtreeKeyCompareTestCase (unittest.TestCase):
if self.env is not None: if self.env is not None:
self.env.close () self.env.close ()
self.env = None self.env = None
import glob shutil.rmtree(self.homeDir)
map (os.remove, glob.glob (os.path.join (self.homeDir, '*')))
def addDataToDB (self, data): def addDataToDB (self, data):
i = 0 i = 0
...@@ -110,7 +107,7 @@ class AbstractBtreeKeyCompareTestCase (unittest.TestCase): ...@@ -110,7 +107,7 @@ class AbstractBtreeKeyCompareTestCase (unittest.TestCase):
self.failUnless (index < len (expected), self.failUnless (index < len (expected),
"to many values returned from cursor") "to many values returned from cursor")
self.failUnless (expected[index] == key, self.failUnless (expected[index] == key,
"expected value `%s' at %d but got `%s'" "expected value %r at %d but got %r"
% (expected[index], index, key)) % (expected[index], index, key))
index = index + 1 index = index + 1
rec = curs.next () rec = curs.next ()
...@@ -140,10 +137,10 @@ class BtreeKeyCompareTestCase (AbstractBtreeKeyCompareTestCase): ...@@ -140,10 +137,10 @@ class BtreeKeyCompareTestCase (AbstractBtreeKeyCompareTestCase):
def socialist_comparator (l, r): def socialist_comparator (l, r):
return 0 return 0
self.createDB (socialist_comparator) self.createDB (socialist_comparator)
self.addDataToDB (['b', 'a', 'd']) self.addDataToDB ([b'b', b'a', b'd'])
# all things being equal the first key will be the only key # all things being equal the first key will be the only key
# in the database... (with the last key's value fwiw) # in the database... (with the last key's value fwiw)
self.finishTest (['b']) self.finishTest ([b'b'])
class BtreeExceptionsTestCase (AbstractBtreeKeyCompareTestCase): class BtreeExceptionsTestCase (AbstractBtreeKeyCompareTestCase):
...@@ -247,4 +244,4 @@ def test_suite (): ...@@ -247,4 +244,4 @@ def test_suite ():
return res return res
if __name__ == '__main__': if __name__ == '__main__':
unittest.main (defaultTest = 'suite') unittest.main (defaultTest = 'test_suite')
Lib/bsddb/test/test_compat.py
View file @ 3fd22da6
...@@ -7,7 +7,7 @@ import sys, os ...@@ -7,7 +7,7 @@ import sys, os
import unittest import unittest
import tempfile import tempfile
from .test_all import verbose from bsddb.test.test_all import verbose
from bsddb import db, hashopen, btopen, rnopen from bsddb import db, hashopen, btopen, rnopen
......
Lib/bsddb/test/test_cursor_pget_bug.py
View file @ 3fd22da6
import unittest import unittest
import sys, os, glob import sys, os, glob
import shutil
import tempfile
from bsddb import db from bsddb import db
...@@ -11,11 +13,7 @@ class pget_bugTestCase(unittest.TestCase): ...@@ -11,11 +13,7 @@ class pget_bugTestCase(unittest.TestCase):
db_name = 'test-cursor_pget.db' db_name = 'test-cursor_pget.db'
def setUp(self): def setUp(self):
self.homeDir = os.path.join(os.path.dirname(sys.argv[0]), 'db_home') self.homeDir = tempfile.mkdtemp()
try:
os.mkdir(self.homeDir)
except os.error:
pass
self.env = db.DBEnv() self.env = db.DBEnv()
self.env.open(self.homeDir, db.DB_CREATE | db.DB_INIT_MPOOL) self.env.open(self.homeDir, db.DB_CREATE | db.DB_INIT_MPOOL)
self.primary_db = db.DB(self.env) self.primary_db = db.DB(self.env)
...@@ -36,9 +34,7 @@ class pget_bugTestCase(unittest.TestCase): ...@@ -36,9 +34,7 @@ class pget_bugTestCase(unittest.TestCase):
del self.secondary_db del self.secondary_db
del self.primary_db del self.primary_db
del self.env del self.env
for file in glob.glob(os.path.join(self.homeDir, '*')): shutil.rmtree(self.homeDir)
os.remove(file)
os.removedirs(self.homeDir)
def test_pget(self): def test_pget(self):
cursor = self.secondary_db.cursor() cursor = self.secondary_db.cursor()
......
Lib/bsddb/test/test_dbobj.py
View file @ 3fd22da6
import shutil
import sys, os import sys, os
import unittest import unittest
import glob import glob
...@@ -16,23 +17,17 @@ except ImportError: ...@@ -16,23 +17,17 @@ except ImportError:
class dbobjTestCase(unittest.TestCase): class dbobjTestCase(unittest.TestCase):
"""Verify that dbobj.DB and dbobj.DBEnv work properly""" """Verify that dbobj.DB and dbobj.DBEnv work properly"""
db_home = 'db_home'
db_name = 'test-dbobj.db' db_name = 'test-dbobj.db'
def setUp(self): def setUp(self):
homeDir = os.path.join(tempfile.gettempdir(), 'db_home') self.homeDir = tempfile.mkdtemp()
self.homeDir = homeDir
try: os.mkdir(homeDir)
except os.error: pass
def tearDown(self): def tearDown(self):
if hasattr(self, 'db'): if hasattr(self, 'db'):
del self.db del self.db
if hasattr(self, 'env'): if hasattr(self, 'env'):
del self.env del self.env
files = glob.glob(os.path.join(self.homeDir, '*')) shutil.rmtree(self.homeDir)
for file in files:
os.remove(file)
def test01_both(self): def test01_both(self):
class TestDBEnv(dbobj.DBEnv): pass class TestDBEnv(dbobj.DBEnv): pass
......
Lib/bsddb/test/test_dbshelve.py
View file @ 3fd22da6
...@@ -3,12 +3,13 @@ TestCases for checking dbShelve objects. ...@@ -3,12 +3,13 @@ TestCases for checking dbShelve objects.
""" """
import os import os
import shutil
import tempfile, random import tempfile, random
import unittest import unittest
from bsddb import db, dbshelve from bsddb import db, dbshelve
from .test_all import verbose from bsddb.test.test_all import verbose
#---------------------------------------------------------------------- #----------------------------------------------------------------------
...@@ -78,9 +79,15 @@ class DBShelveTestCase(unittest.TestCase): ...@@ -78,9 +79,15 @@ class DBShelveTestCase(unittest.TestCase):
print("Running %s.test01_basics..." % self.__class__.__name__) print("Running %s.test01_basics..." % self.__class__.__name__)
self.populateDB(self.d) self.populateDB(self.d)
if verbose:
print(1, self.d.keys())
self.d.sync() self.d.sync()
if verbose:
print(2, self.d.keys())
self.do_close() self.do_close()
self.do_open() self.do_open()
if verbose:
print(3, self.d.keys())
d = self.d d = self.d
l = len(d) l = len(d)
...@@ -93,15 +100,15 @@ class DBShelveTestCase(unittest.TestCase): ...@@ -93,15 +100,15 @@ class DBShelveTestCase(unittest.TestCase):
print("keys:", k) print("keys:", k)
print("stats:", s) print("stats:", s)
assert 0 == d.has_key(b'bad key') self.assertFalse(d.has_key(b'bad key'))
assert 1 == d.has_key(b'IA') self.assertTrue(d.has_key(b'IA'), d.keys())
assert 1 == d.has_key(b'OA') self.assertTrue(d.has_key(b'OA'))
d.delete(b'IA') d.delete(b'IA')
del d[b'OA'] del d[b'OA']
assert 0 == d.has_key(b'IA') self.assertFalse(d.has_key(b'IA'))
assert 0 == d.has_key(b'OA') self.assertFalse(d.has_key(b'OA'))
assert len(d) == l-2 self.assertEqual(len(d), l-2)
values = [] values = []
for key in d.keys(): for key in d.keys():
...@@ -112,28 +119,28 @@ class DBShelveTestCase(unittest.TestCase): ...@@ -112,28 +119,28 @@ class DBShelveTestCase(unittest.TestCase):
self.checkrec(key, value) self.checkrec(key, value)
dbvalues = sorted(d.values(), key=lambda x: (str(type(x)), x)) dbvalues = sorted(d.values(), key=lambda x: (str(type(x)), x))
assert len(dbvalues) == len(d.keys()) self.assertEqual(len(dbvalues), len(d.keys()))
values.sort(key=lambda x: (str(type(x)), x)) values.sort(key=lambda x: (str(type(x)), x))
assert values == dbvalues, "%r != %r" % (values, dbvalues) self.assertEqual(values, dbvalues, "%r != %r" % (values, dbvalues))
items = d.items() items = d.items()
assert len(items) == len(values) self.assertEqual(len(items), len(values))
for key, value in items: for key, value in items:
self.checkrec(key, value) self.checkrec(key, value)
assert d.get(b'bad key') == None self.assertEqual(d.get(b'bad key'), None)
assert d.get(b'bad key', None) == None self.assertEqual(d.get(b'bad key', None), None)
assert d.get(b'bad key', b'a string') == b'a string' self.assertEqual(d.get(b'bad key', b'a string'), b'a string')
assert d.get(b'bad key', [1, 2, 3]) == [1, 2, 3] self.assertEqual(d.get(b'bad key', [1, 2, 3]), [1, 2, 3])
d.set_get_returns_none(0) d.set_get_returns_none(0)
self.assertRaises(db.DBNotFoundError, d.get, b'bad key') self.assertRaises(db.DBNotFoundError, d.get, b'bad key')
d.set_get_returns_none(1) d.set_get_returns_none(1)
d.put(b'new key', b'new data') d.put(b'new key', b'new data')
assert d.get(b'new key') == b'new data' self.assertEqual(d.get(b'new key'), b'new data')
assert d[b'new key'] == b'new data' self.assertEqual(d[b'new key'], b'new data')
...@@ -157,7 +164,7 @@ class DBShelveTestCase(unittest.TestCase): ...@@ -157,7 +164,7 @@ class DBShelveTestCase(unittest.TestCase):
rec = c.next() rec = c.next()
del c del c
assert count == len(d) self.assertEqual(count, len(d))
count = 0 count = 0
c = d.cursor() c = d.cursor()
...@@ -170,7 +177,7 @@ class DBShelveTestCase(unittest.TestCase): ...@@ -170,7 +177,7 @@ class DBShelveTestCase(unittest.TestCase):
self.checkrec(key, value) self.checkrec(key, value)
rec = c.prev() rec = c.prev()
assert count == len(d) self.assertEqual(count, len(d))
c.set(b'SS') c.set(b'SS')
key, value = c.current() key, value = c.current()
...@@ -233,15 +240,15 @@ class ThreadHashShelveTestCase(BasicShelveTestCase): ...@@ -233,15 +240,15 @@ class ThreadHashShelveTestCase(BasicShelveTestCase):
#---------------------------------------------------------------------- #----------------------------------------------------------------------
class BasicEnvShelveTestCase(DBShelveTestCase): class BasicEnvShelveTestCase(DBShelveTestCase):
def setUp(self):
self.homeDir = tempfile.mkdtemp()
self.filename = 'dbshelve_db_file.db'
self.do_open()
def do_open(self): def do_open(self):
self.homeDir = homeDir = os.path.join(
tempfile.gettempdir(), 'db_home')
try: os.mkdir(homeDir)
except os.error: pass
self.env = db.DBEnv() self.env = db.DBEnv()
self.env.open(homeDir, self.envflags | db.DB_INIT_MPOOL | db.DB_CREATE) self.env.open(self.homeDir, self.envflags | db.DB_INIT_MPOOL | db.DB_CREATE)
self.filename = os.path.split(self.filename)[1]
self.d = dbshelve.DBShelf(self.env) self.d = dbshelve.DBShelf(self.env)
self.d.open(self.filename, self.dbtype, self.dbflags) self.d.open(self.filename, self.dbtype, self.dbflags)
...@@ -253,10 +260,7 @@ class BasicEnvShelveTestCase(DBShelveTestCase): ...@@ -253,10 +260,7 @@ class BasicEnvShelveTestCase(DBShelveTestCase):
def tearDown(self): def tearDown(self):
self.do_close() self.do_close()
import glob shutil.rmtree(self.homeDir)
files = glob.glob(os.path.join(self.homeDir, '*'))
for file in files:
os.remove(file)
......
Lib/bsddb/test/test_dbtables.py
View file @ 3fd22da6
...@@ -16,16 +16,17 @@ ...@@ -16,16 +16,17 @@
# software has been tested, but no warranty is expressed or # software has been tested, but no warranty is expressed or
# implied. # implied.
# #
# -- Gregory P. Smith <greg@electricrain.com> # -- Gregory P. Smith <greg@krypto.org>
# #
# $Id$ # $Id$
import shutil
import sys, os, re import sys, os, re
import pickle import pickle
import tempfile import tempfile
import unittest import unittest
from .test_all import verbose from bsddb.test.test_all import verbose
try: try:
# For Pythons w/distutils pybsddb # For Pythons w/distutils pybsddb
...@@ -39,23 +40,16 @@ except ImportError: ...@@ -39,23 +40,16 @@ except ImportError:
#---------------------------------------------------------------------- #----------------------------------------------------------------------
class TableDBTestCase(unittest.TestCase): class TableDBTestCase(unittest.TestCase):
db_home = 'db_home'
db_name = 'test-table.db' db_name = 'test-table.db'
def setUp(self): def setUp(self):
homeDir = os.path.join(tempfile.gettempdir(), 'db_home') self.homeDir = tempfile.mkdtemp()
self.homeDir = homeDir
try: os.mkdir(homeDir)
except os.error: pass
self.tdb = dbtables.bsdTableDB( self.tdb = dbtables.bsdTableDB(
filename='tabletest.db', dbhome=homeDir, create=1) filename='tabletest.db', dbhome=self.homeDir, create=1)
def tearDown(self): def tearDown(self):
self.tdb.close() self.tdb.close()
import glob shutil.rmtree(self.homeDir)
files = glob.glob(os.path.join(self.homeDir, '*'))
for file in files:
os.remove(file)
def test01(self): def test01(self):
tabname = "test01" tabname = "test01"
......
Lib/bsddb/test/test_env_close.py
View file @ 3fd22da6
...@@ -3,6 +3,7 @@ is closed before its DB objects. ...@@ -3,6 +3,7 @@ is closed before its DB objects.
""" """
import os import os
import shutil
import sys import sys
import tempfile import tempfile
import glob import glob
...@@ -15,7 +16,7 @@ except ImportError: ...@@ -15,7 +16,7 @@ except ImportError:
# For Python 2.3 # For Python 2.3
from bsddb import db from bsddb import db
from .test_all import verbose from bsddb.test.test_all import verbose
# We're going to get warnings in this module about trying to close the db when # We're going to get warnings in this module about trying to close the db when
# its env is already closed. Let's just ignore those. # its env is already closed. Let's just ignore those.
...@@ -33,17 +34,14 @@ else: ...@@ -33,17 +34,14 @@ else:
class DBEnvClosedEarlyCrash(unittest.TestCase): class DBEnvClosedEarlyCrash(unittest.TestCase):
def setUp(self): def setUp(self):
self.homeDir = os.path.join(tempfile.gettempdir(), 'db_home') self.homeDir = tempfile.mkdtemp()
try: os.mkdir(self.homeDir) old_tempfile_tempdir = tempfile.tempdir
except os.error: pass
tempfile.tempdir = self.homeDir tempfile.tempdir = self.homeDir
self.filename = os.path.split(tempfile.mktemp())[1] self.filename = os.path.split(tempfile.mktemp())[1]
tempfile.tempdir = None tempfile.tempdir = old_tempfile_tempdir
def tearDown(self): def tearDown(self):
files = glob.glob(os.path.join(self.homeDir, '*')) shutil.rmtree(self.homeDir)
for file in files:
os.remove(file)
def test01_close_dbenv_before_db(self): def test01_close_dbenv_before_db(self):
......
Lib/bsddb/test/test_get_none.py
View file @ 3fd22da6
...@@ -9,7 +9,7 @@ import unittest ...@@ -9,7 +9,7 @@ import unittest
from bsddb import db from bsddb import db
from .test_all import verbose from bsddb.test.test_all import verbose
letters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' letters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
......
Lib/bsddb/test/test_join.py
View file @ 3fd22da6
"""TestCases for using the DB.join and DBCursor.join_item methods. """TestCases for using the DB.join and DBCursor.join_item methods.
""" """
import shutil
import sys, os import sys, os
import tempfile import tempfile
import time import time
...@@ -13,7 +14,7 @@ except ImportError: ...@@ -13,7 +14,7 @@ except ImportError:
have_threads = 0 have_threads = 0
import unittest import unittest
from .test_all import verbose from bsddb.test.test_all import verbose
from bsddb import db, dbshelve, StringKeys from bsddb import db, dbshelve, StringKeys
...@@ -47,19 +48,13 @@ class JoinTestCase(unittest.TestCase): ...@@ -47,19 +48,13 @@ class JoinTestCase(unittest.TestCase):
def setUp(self): def setUp(self):
self.filename = self.__class__.__name__ + '.db' self.filename = self.__class__.__name__ + '.db'
homeDir = os.path.join(tempfile.gettempdir(), 'db_home') self.homeDir = tempfile.mkdtemp()
self.homeDir = homeDir
try: os.mkdir(homeDir)
except os.error: pass
self.env = db.DBEnv() self.env = db.DBEnv()
self.env.open(homeDir, db.DB_CREATE | db.DB_INIT_MPOOL | db.DB_INIT_LOCK ) self.env.open(self.homeDir, db.DB_CREATE | db.DB_INIT_MPOOL | db.DB_INIT_LOCK )
def tearDown(self): def tearDown(self):
self.env.close() self.env.close()
import glob shutil.rmtree(self.homeDir)
files = glob.glob(os.path.join(self.homeDir, '*'))
for file in files:
os.remove(file)
def test01_join(self): def test01_join(self):
if verbose: if verbose:
......
Lib/bsddb/test/test_lock.py
View file @ 3fd22da6
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
TestCases for testing the locking sub-system. TestCases for testing the locking sub-system.
""" """
import shutil
import sys, os import sys, os
import tempfile import tempfile
import time import time
...@@ -15,7 +16,7 @@ except ImportError: ...@@ -15,7 +16,7 @@ except ImportError:
import unittest import unittest
from .test_all import verbose from bsddb.test.test_all import verbose
try: try:
# For Pythons w/distutils pybsddb # For Pythons w/distutils pybsddb
...@@ -30,21 +31,15 @@ except ImportError: ...@@ -30,21 +31,15 @@ except ImportError:
class LockingTestCase(unittest.TestCase): class LockingTestCase(unittest.TestCase):
def setUp(self): def setUp(self):
homeDir = os.path.join(tempfile.gettempdir(), 'db_home') self.homeDir = tempfile.mkdtemp()
self.homeDir = homeDir
try: os.mkdir(homeDir)
except os.error: pass
self.env = db.DBEnv() self.env = db.DBEnv()
self.env.open(homeDir, db.DB_THREAD | db.DB_INIT_MPOOL | self.env.open(self.homeDir, db.DB_THREAD | db.DB_INIT_MPOOL |
db.DB_INIT_LOCK | db.DB_CREATE) db.DB_INIT_LOCK | db.DB_CREATE)
def tearDown(self): def tearDown(self):
self.env.close() self.env.close()
import glob shutil.rmtree(self.homeDir)
files = glob.glob(os.path.join(self.homeDir, '*'))
for file in files:
os.remove(file)
def test01_simple(self): def test01_simple(self):
......
Lib/bsddb/test/test_misc.py
View file @ 3fd22da6
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
""" """
import os import os
import shutil
import sys import sys
import unittest import unittest
import tempfile import tempfile
...@@ -18,22 +19,14 @@ except ImportError: ...@@ -18,22 +19,14 @@ except ImportError:
class MiscTestCase(unittest.TestCase): class MiscTestCase(unittest.TestCase):
def setUp(self): def setUp(self):
self.filename = self.__class__.__name__ + '.db' self.filename = self.__class__.__name__ + '.db'
homeDir = os.path.join(tempfile.gettempdir(), 'db_home') self.homeDir = tempfile.mkdtemp()
self.homeDir = homeDir
try:
os.mkdir(homeDir)
except OSError:
pass
def tearDown(self): def tearDown(self):
try: try:
os.remove(self.filename) os.remove(self.filename)
except OSError: except OSError:
pass pass
import glob shutil.rmtree(self.homeDir)
files = glob.glob(os.path.join(self.homeDir, '*'))
for file in files:
os.remove(file)
def test01_badpointer(self): def test01_badpointer(self):
dbs = dbshelve.open(self.filename) dbs = dbshelve.open(self.filename)
......
Lib/bsddb/test/test_pickle.py
View file @ 3fd22da6
import shutil
import sys, os import sys, os
import pickle import pickle
import tempfile
import unittest import unittest
import glob import glob
...@@ -16,33 +18,27 @@ except ImportError as e: ...@@ -16,33 +18,27 @@ except ImportError as e:
class pickleTestCase(unittest.TestCase): class pickleTestCase(unittest.TestCase):
"""Verify that DBError can be pickled and unpickled""" """Verify that DBError can be pickled and unpickled"""
db_home = 'db_home'
db_name = 'test-dbobj.db' db_name = 'test-dbobj.db'
def setUp(self): def setUp(self):
homeDir = os.path.join(os.path.dirname(sys.argv[0]), 'db_home') self.homeDir = tempfile.mkdtemp()
self.homeDir = homeDir
try: os.mkdir(homeDir)
except os.error: pass
def tearDown(self): def tearDown(self):
if hasattr(self, 'db'): if hasattr(self, 'db'):
del self.db del self.db
if hasattr(self, 'env'): if hasattr(self, 'env'):
del self.env del self.env
files = glob.glob(os.path.join(self.homeDir, '*')) shutil.rmtree(self.homeDir)
for file in files:
os.remove(file)
def _base_test_pickle_DBError(self, pickle): def _base_test_pickle_DBError(self, pickle):
self.env = db.DBEnv() self.env = db.DBEnv()
self.env.open(self.homeDir, db.DB_CREATE | db.DB_INIT_MPOOL) self.env.open(self.homeDir, db.DB_CREATE | db.DB_INIT_MPOOL)
self.db = db.DB(self.env) self.db = db.DB(self.env)
self.db.open(self.db_name, db.DB_HASH, db.DB_CREATE) self.db.open(self.db_name, db.DB_HASH, db.DB_CREATE)
self.db.put('spam', 'eggs') self.db.put(b'spam', b'eggs')
assert self.db['spam'] == 'eggs' self.assertEqual(self.db[b'spam'], b'eggs')
try: try:
self.db.put('spam', 'ham', flags=db.DB_NOOVERWRITE) self.db.put(b'spam', b'ham', flags=db.DB_NOOVERWRITE)
except db.DBError as egg: except db.DBError as egg:
pickledEgg = pickle.dumps(egg) pickledEgg = pickle.dumps(egg)
#print repr(pickledEgg) #print repr(pickledEgg)
...@@ -50,7 +46,7 @@ class pickleTestCase(unittest.TestCase): ...@@ -50,7 +46,7 @@ class pickleTestCase(unittest.TestCase):
if rottenEgg.args != egg.args or type(rottenEgg) != type(egg): if rottenEgg.args != egg.args or type(rottenEgg) != type(egg):
raise Exception(rottenEgg, '!=', egg) raise Exception(rottenEgg, '!=', egg)
else: else:
raise Exception("where's my DBError exception?!?") self.fail("where's my DBError exception?!?")
self.db.close() self.db.close()
self.env.close() self.env.close()
......
Lib/bsddb/test/test_queue.py
View file @ 3fd22da6
...@@ -14,7 +14,7 @@ except ImportError: ...@@ -14,7 +14,7 @@ except ImportError:
# For Python 2.3 # For Python 2.3
from bsddb import db from bsddb import db
from .test_all import verbose from bsddb.test.test_all import verbose
letters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' letters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
......
Lib/bsddb/test/test_recno.py
View file @ 3fd22da6
...@@ -2,13 +2,14 @@ ...@@ -2,13 +2,14 @@
""" """
import os import os
import shutil
import sys import sys
import errno import errno
import tempfile import tempfile
from pprint import pprint from pprint import pprint
import unittest import unittest
from .test_all import verbose from bsddb.test.test_all import verbose
try: try:
# For Pythons w/distutils pybsddb # For Pythons w/distutils pybsddb
...@@ -25,12 +26,14 @@ letters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' ...@@ -25,12 +26,14 @@ letters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
class SimpleRecnoTestCase(unittest.TestCase): class SimpleRecnoTestCase(unittest.TestCase):
def setUp(self): def setUp(self):
self.filename = tempfile.mktemp() self.filename = tempfile.mktemp()
self.homeDir = tempfile.mkdtemp()
def tearDown(self): def tearDown(self):
try: try:
os.remove(self.filename) os.remove(self.filename)
except OSError as e: except OSError as e:
if e.errno != errno.EEXIST: raise if e.errno != errno.EEXIST: raise
shutil.rmtree(self.homeDir)
def test01_basic(self): def test01_basic(self):
d = db.DB() d = db.DB()
...@@ -203,10 +206,7 @@ class SimpleRecnoTestCase(unittest.TestCase): ...@@ -203,10 +206,7 @@ class SimpleRecnoTestCase(unittest.TestCase):
just a line in the file, but you can set a different record delimiter just a line in the file, but you can set a different record delimiter
if needed. if needed.
""" """
homeDir = os.path.join(tempfile.gettempdir(), 'db_home') source = os.path.join(self.homeDir, 'test_recno.txt')
source = os.path.join(homeDir, 'test_recno.txt')
if not os.path.isdir(homeDir):
os.mkdir(homeDir)
f = open(source, 'w') # create the file f = open(source, 'w') # create the file
f.close() f.close()
......
Lib/bsddb/test/test_sequence.py
View file @ 3fd22da6
import unittest import unittest
import os import os
import shutil
import sys import sys
import tempfile import tempfile
import glob import glob
...@@ -10,20 +11,17 @@ try: ...@@ -10,20 +11,17 @@ try:
except ImportError: except ImportError:
from bsddb import db from bsddb import db
from .test_all import verbose from bsddb.test.test_all import verbose
class DBSequenceTest(unittest.TestCase): class DBSequenceTest(unittest.TestCase):
def setUp(self): def setUp(self):
self.int_32_max = 0x100000000 self.int_32_max = 0x100000000
self.homeDir = os.path.join(os.path.dirname(sys.argv[0]), 'db_home') self.homeDir = tempfile.mkdtemp()
try: old_tempfile_tempdir = tempfile.tempdir
os.mkdir(self.homeDir)
except os.error:
pass
tempfile.tempdir = self.homeDir tempfile.tempdir = self.homeDir
self.filename = os.path.split(tempfile.mktemp())[1] self.filename = os.path.split(tempfile.mktemp())[1]
tempfile.tempdir = None tempfile.tempdir = old_tempfile_tempdir
self.dbenv = db.DBEnv() self.dbenv = db.DBEnv()
self.dbenv.open(self.homeDir, db.DB_CREATE | db.DB_INIT_MPOOL, 0o666) self.dbenv.open(self.homeDir, db.DB_CREATE | db.DB_INIT_MPOOL, 0o666)
...@@ -41,9 +39,7 @@ class DBSequenceTest(unittest.TestCase): ...@@ -41,9 +39,7 @@ class DBSequenceTest(unittest.TestCase):
self.dbenv.close() self.dbenv.close()
del self.dbenv del self.dbenv
files = glob.glob(os.path.join(self.homeDir, '*')) shutil.rmtree(self.homeDir)
for file in files:
os.remove(file)
def test_get(self): def test_get(self):
self.seq = db.DBSequence(self.d, flags=0) self.seq = db.DBSequence(self.d, flags=0)
......
Lib/bsddb/test/test_thread.py
View file @ 3fd22da6
...@@ -25,7 +25,7 @@ except NameError: ...@@ -25,7 +25,7 @@ except NameError:
pass pass
import unittest import unittest
from .test_all import verbose from bsddb.test.test_all import verbose
try: try:
# For Pythons w/distutils pybsddb # For Pythons w/distutils pybsddb
...@@ -47,15 +47,10 @@ class BaseThreadedTestCase(unittest.TestCase): ...@@ -47,15 +47,10 @@ class BaseThreadedTestCase(unittest.TestCase):
if verbose: if verbose:
dbutils._deadlock_VerboseFile = sys.stdout dbutils._deadlock_VerboseFile = sys.stdout
homeDir = os.path.join(tempfile.gettempdir(), 'db_home') self.homeDir = tempfile.mkdtemp()
self.homeDir = homeDir
try:
os.mkdir(homeDir)
except OSError as e:
if e.errno != errno.EEXIST: raise
self.env = db.DBEnv() self.env = db.DBEnv()
self.setEnvOpts() self.setEnvOpts()
self.env.open(homeDir, self.envflags | db.DB_CREATE) self.env.open(self.homeDir, self.envflags | db.DB_CREATE)
self.filename = self.__class__.__name__ + '.db' self.filename = self.__class__.__name__ + '.db'
self.d = db.DB(self.env) self.d = db.DB(self.env)
...@@ -74,6 +69,28 @@ class BaseThreadedTestCase(unittest.TestCase): ...@@ -74,6 +69,28 @@ class BaseThreadedTestCase(unittest.TestCase):
def makeData(self, key): def makeData(self, key):
return DASH.join([key] * 5) return DASH.join([key] * 5)
def _writerThread(self, *args, **kwargs):
raise RuntimeError("must override this in a subclass")
def _readerThread(self, *args, **kwargs):
raise RuntimeError("must override this in a subclass")
def writerThread(self, *args, **kwargs):
try:
self._writerThread(*args, **kwargs)
except db.DBLockDeadlockError:
if verbose:
print(currentThread().getName(), 'died from', e)
def readerThread(self, *args, **kwargs):
try:
self._readerThread(*args, **kwargs)
except db.DBLockDeadlockError as e:
if verbose:
print(currentThread().getName(), 'died from', e)
#---------------------------------------------------------------------- #----------------------------------------------------------------------
...@@ -111,7 +128,7 @@ class ConcurrentDataStoreBase(BaseThreadedTestCase): ...@@ -111,7 +128,7 @@ class ConcurrentDataStoreBase(BaseThreadedTestCase):
for t in threads: for t in threads:
t.join() t.join()
def writerThread(self, d, howMany, writerNum): def _writerThread(self, d, howMany, writerNum):
#time.sleep(0.01 * writerNum + 0.01) #time.sleep(0.01 * writerNum + 0.01)
name = currentThread().getName() name = currentThread().getName()
start = howMany * writerNum start = howMany * writerNum
...@@ -122,7 +139,7 @@ class ConcurrentDataStoreBase(BaseThreadedTestCase): ...@@ -122,7 +139,7 @@ class ConcurrentDataStoreBase(BaseThreadedTestCase):
for x in range(start, stop): for x in range(start, stop):
key = ('%04d' % x).encode("ascii") key = ('%04d' % x).encode("ascii")
dbutils.DeadlockWrap(d.put, key, self.makeData(key), dbutils.DeadlockWrap(d.put, key, self.makeData(key),
max_retries=12) max_retries=20)
if verbose and x % 100 == 0: if verbose and x % 100 == 0:
print("%s: records %d - %d finished" % (name, start, x)) print("%s: records %d - %d finished" % (name, start, x))
...@@ -143,7 +160,7 @@ class ConcurrentDataStoreBase(BaseThreadedTestCase): ...@@ -143,7 +160,7 @@ class ConcurrentDataStoreBase(BaseThreadedTestCase):
if verbose: if verbose:
print("%s: thread finished" % name) print("%s: thread finished" % name)
def readerThread(self, d, readerNum): def _readerThread(self, d, readerNum):
time.sleep(0.01 * readerNum) time.sleep(0.01 * readerNum)
name = currentThread().getName() name = currentThread().getName()
...@@ -215,7 +232,7 @@ class SimpleThreadedBase(BaseThreadedTestCase): ...@@ -215,7 +232,7 @@ class SimpleThreadedBase(BaseThreadedTestCase):
for t in threads: for t in threads:
t.join() t.join()
def writerThread(self, d, howMany, writerNum): def _writerThread(self, d, howMany, writerNum):
name = currentThread().getName() name = currentThread().getName()
start = howMany * writerNum start = howMany * writerNum
stop = howMany * (writerNum + 1) - 1 stop = howMany * (writerNum + 1) - 1
...@@ -226,7 +243,7 @@ class SimpleThreadedBase(BaseThreadedTestCase): ...@@ -226,7 +243,7 @@ class SimpleThreadedBase(BaseThreadedTestCase):
for x in range(start, stop): for x in range(start, stop):
key = ('%04d' % x).encode("ascii") key = ('%04d' % x).encode("ascii")
dbutils.DeadlockWrap(d.put, key, self.makeData(key), dbutils.DeadlockWrap(d.put, key, self.makeData(key),
max_retries=12) max_retries=20)
if verbose and x % 100 == 0: if verbose and x % 100 == 0:
print("%s: records %d - %d finished" % (name, start, x)) print("%s: records %d - %d finished" % (name, start, x))
...@@ -235,12 +252,12 @@ class SimpleThreadedBase(BaseThreadedTestCase): ...@@ -235,12 +252,12 @@ class SimpleThreadedBase(BaseThreadedTestCase):
if random() <= 0.05: if random() <= 0.05:
for y in range(start, x): for y in range(start, x):
key = ('%04d' % x).encode("ascii") key = ('%04d' % x).encode("ascii")
data = dbutils.DeadlockWrap(d.get, key, max_retries=12) data = dbutils.DeadlockWrap(d.get, key, max_retries=20)
self.assertEqual(data, self.makeData(key)) self.assertEqual(data, self.makeData(key))
# flush them # flush them
try: try:
dbutils.DeadlockWrap(d.sync, max_retries=12) dbutils.DeadlockWrap(d.sync, max_retries=20)
except db.DBIncompleteError as val: except db.DBIncompleteError as val:
if verbose: if verbose:
print("could not complete sync()...") print("could not complete sync()...")
...@@ -248,31 +265,31 @@ class SimpleThreadedBase(BaseThreadedTestCase): ...@@ -248,31 +265,31 @@ class SimpleThreadedBase(BaseThreadedTestCase):
# read them back, deleting a few # read them back, deleting a few
for x in range(start, stop): for x in range(start, stop):
key = ('%04d' % x).encode("ascii") key = ('%04d' % x).encode("ascii")
data = dbutils.DeadlockWrap(d.get, key, max_retries=12) data = dbutils.DeadlockWrap(d.get, key, max_retries=20)
if verbose and x % 100 == 0: if verbose and x % 100 == 0:
print("%s: fetched record (%s, %s)" % (name, key, data)) print("%s: fetched record (%s, %s)" % (name, key, data))
self.assertEqual(data, self.makeData(key)) self.assertEqual(data, self.makeData(key))
if random() <= 0.10: if random() <= 0.10:
dbutils.DeadlockWrap(d.delete, key, max_retries=12) dbutils.DeadlockWrap(d.delete, key, max_retries=20)
if verbose: if verbose:
print("%s: deleted record %s" % (name, key)) print("%s: deleted record %s" % (name, key))
if verbose: if verbose:
print("%s: thread finished" % name) print("%s: thread finished" % name)
def readerThread(self, d, readerNum): def _readerThread(self, d, readerNum):
time.sleep(0.01 * readerNum) time.sleep(0.01 * readerNum)
name = currentThread().getName() name = currentThread().getName()
for loop in range(5): for loop in range(5):
c = d.cursor() c = d.cursor()
count = 0 count = 0
rec = dbutils.DeadlockWrap(c.first, max_retries=10) rec = dbutils.DeadlockWrap(c.first, max_retries=20)
while rec: while rec:
count += 1 count += 1
key, data = rec key, data = rec
self.assertEqual(self.makeData(key), data) self.assertEqual(self.makeData(key), data)
rec = dbutils.DeadlockWrap(c.next, max_retries=10) rec = dbutils.DeadlockWrap(c.next, max_retries=20)
if verbose: if verbose:
print("%s: found %d records" % (name, count)) print("%s: found %d records" % (name, count))
c.close() c.close()
...@@ -360,7 +377,7 @@ class ThreadedTransactionsBase(BaseThreadedTestCase): ...@@ -360,7 +377,7 @@ class ThreadedTransactionsBase(BaseThreadedTestCase):
txn.abort() txn.abort()
time.sleep(0.05) time.sleep(0.05)
def writerThread(self, d, howMany, writerNum): def _writerThread(self, d, howMany, writerNum):
name = currentThread().getName() name = currentThread().getName()
start = howMany * writerNum start = howMany * writerNum
stop = howMany * (writerNum + 1) - 1 stop = howMany * (writerNum + 1) - 1
...@@ -401,7 +418,7 @@ class ThreadedTransactionsBase(BaseThreadedTestCase): ...@@ -401,7 +418,7 @@ class ThreadedTransactionsBase(BaseThreadedTestCase):
if verbose: if verbose:
print("%s: thread finished" % name) print("%s: thread finished" % name)
def readerThread(self, d, readerNum): def _readerThread(self, d, readerNum):
time.sleep(0.01 * readerNum + 0.05) time.sleep(0.01 * readerNum + 0.05)
name = currentThread().getName() name = currentThread().getName()
......
Lib/test/test_bsddb3.py
View file @ 3fd22da6
...@@ -4,20 +4,21 @@ Run all test cases. ...@@ -4,20 +4,21 @@ Run all test cases.
""" """
import sys import sys
import unittest import unittest
from test.test_support import requires, verbose, run_unittest, unlink import test.test_support
from test.test_support import requires, run_unittest, unlink
# When running as a script instead of within the regrtest framework, skip the # When running as a script instead of within the regrtest framework, skip the
# requires test, since it's obvious we want to run them. # requires test, since it's obvious we want to run them.
if __name__ != '__main__': if __name__ != '__main__':
requires('bsddb') requires('bsddb')
verbose = False import bsddb.test.test_all
if 'verbose' in sys.argv: if 'verbose' in sys.argv:
verbose = True bsddb.test.test_all.verbose = 1
sys.argv.remove('verbose') sys.argv.remove('verbose')
if 'silent' in sys.argv: # take care of old flag, just in case if 'silent' in sys.argv: # take care of old flag, just in case
verbose = False bsddb.test.test_all.verbose = 0
sys.argv.remove('silent') sys.argv.remove('silent')
...@@ -25,14 +26,15 @@ def suite(): ...@@ -25,14 +26,15 @@ def suite():
try: try:
# this is special, it used to segfault the interpreter # this is special, it used to segfault the interpreter
import bsddb.test.test_1413192 import bsddb.test.test_1413192
except: finally:
for f in ['__db.001', '__db.002', '__db.003', 'log.0000000001']: for f in ['xxx.db','__db.001','__db.002','__db.003','log.0000000001']:
unlink(f) unlink(f)
test_modules = [ test_modules = [
'test_associate', 'test_associate',
'test_basics', 'test_basics',
'test_compat', 'test_compat',
'test_compare',
'test_dbobj', 'test_dbobj',
'test_dbshelve', 'test_dbshelve',
'test_dbtables', 'test_dbtables',
...@@ -41,6 +43,7 @@ def suite(): ...@@ -41,6 +43,7 @@ def suite():
'test_join', 'test_join',
'test_lock', 'test_lock',
'test_misc', 'test_misc',
'test_pickle',
'test_queue', 'test_queue',
'test_recno', 'test_recno',
'test_thread', 'test_thread',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7