mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-26 21:33:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Better integration between Python testing and bsddb3

Browse source
This commit is contained in:
Jesus Cea 2008-05-27 13:26:02 +00:00
parent b1a54a3530
commit dbd2f6d8a9
2 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Lib/bsddb/test/test_all.py
View file

@ -67,11 +67,20 @@ def get_new_database_path() :
return path return path
# NOTE: This path is overridden by a unique one and cleaned up # This path can be overriden via "set_test_path_prefix()".
# afterwards when run under regrtest via Lib/test/test_bsddb3.py. import os, os.path
get_new_path.prefix="/tmp/z-Berkeley_DB" get_new_path.prefix=os.path.join(os.sep,"tmp","z-Berkeley_DB")
get_new_path.num=0 get_new_path.num=0
def get_test_path_prefix() :
return get_new_path.prefix
def set_test_path_prefix(path) :
get_new_path.prefix=path
def remove_test_path_directory() :
test_support.rmtree(get_new_path.prefix)
try : try :
import threading import threading
get_new_path.mutex=threading.Lock() get_new_path.mutex=threading.Lock()
@ -100,12 +109,6 @@ test_all.verbose = verbose
def suite(module_prefix='', timing_check=None): def suite(module_prefix='', timing_check=None):
try:
# this is special, it used to segfault the interpreter
import test_1413192
except:
pass
test_modules = [ test_modules = [
'test_associate', 'test_associate',
'test_basics', 'test_basics',

8
Lib/test/test_bsddb3.py
View file

@ -52,13 +52,13 @@ class TimingCheck(unittest.TestCase):
def test_main(): def test_main():
from bsddb import db from bsddb import db
from bsddb.test import test_all from bsddb.test import test_all
test_all.get_new_path.prefix = os.path.join(tempfile.gettempdir(), test_all.set_test_path_prefix(os.path.join(tempfile.gettempdir(),
'z-test_bsddb3-%s' % 'z-test_bsddb3-%s' %
os.getpid()) os.getpid()))
# Please leave this print in, having this show up in the buildbots # Please leave this print in, having this show up in the buildbots
# makes diagnosing problems a lot easier. # makes diagnosing problems a lot easier.
print >>sys.stderr, db.DB_VERSION_STRING print >>sys.stderr, db.DB_VERSION_STRING
print >>sys.stderr, 'Test path prefix: ', test_all.get_new_path.prefix print >>sys.stderr, 'Test path prefix: ', test_all.get_test_path_prefix()
try: try:
run_unittest(test_all.suite(module_prefix='bsddb.test.', run_unittest(test_all.suite(module_prefix='bsddb.test.',
timing_check=TimingCheck)) timing_check=TimingCheck))
@ -67,7 +67,7 @@ def test_main():
# one lying around. This might be by a different user, so just # one lying around. This might be by a different user, so just
# ignore errors. We should always make a unique name now. # ignore errors. We should always make a unique name now.
try: try:
rmtree(test_all.get_new_path.prefix) test_all.remove_test_path_directory()
except: except:
pass pass