mirror of https://github.com/python/cpython
Apply the fix from Issue1112 to make this test more robust and keep
windows happy.
This commit is contained in:
parent
52bc1f1d62
commit
161586c804
|
@ -1,7 +1,6 @@
|
||||||
|
# http://bugs.python.org/issue1413192
|
||||||
# http://python.org/sf/1413192
|
|
||||||
#
|
#
|
||||||
# This test relies on the variable names, see the bug report for details.
|
# See the bug report for details.
|
||||||
# The problem was that the env was deallocated prior to the txn.
|
# The problem was that the env was deallocated prior to the txn.
|
||||||
|
|
||||||
import shutil
|
import shutil
|
||||||
|
@ -15,14 +14,28 @@ except ImportError:
|
||||||
|
|
||||||
env_name = tempfile.mkdtemp()
|
env_name = tempfile.mkdtemp()
|
||||||
|
|
||||||
env = db.DBEnv()
|
# Wrap test operation in a class so we can control destruction rather than
|
||||||
env.open(env_name, db.DB_CREATE | db.DB_INIT_TXN | db.DB_INIT_MPOOL)
|
# waiting for the controlling Python executable to exit
|
||||||
the_txn = env.txn_begin()
|
|
||||||
|
|
||||||
map = db.DB(env)
|
class Context:
|
||||||
map.open('xxx.db', "p", db.DB_HASH, db.DB_CREATE, 0666, txn=the_txn)
|
|
||||||
|
|
||||||
# try not to leave a turd (won't help Windows since files are still open)
|
def __init__(self):
|
||||||
|
self.env = db.DBEnv()
|
||||||
|
self.env.open(env_name,
|
||||||
|
db.DB_CREATE | db.DB_INIT_TXN | db.DB_INIT_MPOOL)
|
||||||
|
self.the_txn = self.env.txn_begin()
|
||||||
|
|
||||||
|
self.map = db.DB(self.env)
|
||||||
|
self.map.open('xxx.db', "p",
|
||||||
|
db.DB_HASH, db.DB_CREATE, 0666, txn=self.the_txn)
|
||||||
|
del self.env
|
||||||
|
del self.the_txn
|
||||||
|
|
||||||
|
|
||||||
|
context = Context()
|
||||||
|
del context
|
||||||
|
|
||||||
|
# try not to leave a turd
|
||||||
try:
|
try:
|
||||||
shutil.rmtree(env_name)
|
shutil.rmtree(env_name)
|
||||||
except EnvironmentError:
|
except EnvironmentError:
|
||||||
|
|
Loading…
Reference in New Issue