summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory P. Smith <greg@mad-scientist.com>2007-08-23 05:05:12 +0000
committerGregory P. Smith <greg@mad-scientist.com>2007-08-23 05:05:12 +0000
commite468ada1e69d87e60acb30d9b419f63f3ec403c3 (patch)
treee1f4c71c62ee2dc5e3e9d732361983a7a2253069
parentb354e3d915ea044e4225ae2609c0ebccaf535ad3 (diff)
downloadcpython-git-e468ada1e69d87e60acb30d9b419f63f3ec403c3.tar.gz
Back port of r57286 from py3k and trunk
------------------------------------------------------------------------ r57286 | gregory.p.smith | 2007-08-22 14:32:34 -0700 (Wed, 22 Aug 2007) | 3 lines stop leaving log.0000001 __db.00* and xxx.db turds in developer sandboxes when bsddb3 tests are run.
-rw-r--r--Lib/bsddb/test/test_1413192.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/Lib/bsddb/test/test_1413192.py b/Lib/bsddb/test/test_1413192.py
index 436f407867..dd49bdf68c 100644
--- a/Lib/bsddb/test/test_1413192.py
+++ b/Lib/bsddb/test/test_1413192.py
@@ -4,6 +4,8 @@
# This test relies on the variable names, see the bug report for details.
# The problem was that the env was deallocated prior to the txn.
+import shutil
+import tempfile
try:
# For Pythons w/distutils and add-on pybsddb
from bsddb3 import db
@@ -11,7 +13,7 @@ except ImportError:
# For Python >= 2.3 builtin bsddb distribution
from bsddb import db
-env_name = '.'
+env_name = tempfile.mkdtemp()
env = db.DBEnv()
env.open(env_name, db.DB_CREATE | db.DB_INIT_TXN | db.DB_INIT_MPOOL)
@@ -19,3 +21,9 @@ the_txn = env.txn_begin()
map = db.DB(env)
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)
+try:
+ shutil.rmtree(env_name)
+except EnvironmentError:
+ pass