mirror of
https://github.com/python/cpython.git
synced 2025-10-20 13:43:01 +00:00
Merged revisions 61038,61042-61045,61047,61049-61053,61055-61057 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r61049 | christian.heimes | 2008-02-24 13:26:16 +0100 (Sun, 24 Feb 2008) | 1 line Use PY_FORMAT_SIZE_T instead of z for string formatting. Thanks Neal. ........ r61051 | mark.dickinson | 2008-02-24 19:12:36 +0100 (Sun, 24 Feb 2008) | 2 lines Remove duplicate 'import re' in decimal.py ........ r61052 | neal.norwitz | 2008-02-24 19:47:03 +0100 (Sun, 24 Feb 2008) | 11 lines Create a db_home directory with a unique name so multiple users can run the test simultaneously. The simplest thing I found that worked on both Windows and Unix was to use the PID. It's unique so should be sufficient. This should prevent many of the spurious failures of the automated tests since they run as different users. Also cleanup the directory consistenly in the tearDown methods. It would be nice if someone ensured that the directories are always created with a consistent name. ........ r61057 | christian.heimes | 2008-02-24 23:48:05 +0100 (Sun, 24 Feb 2008) | 2 lines Added dependency rules for Objects/stringlib/*.h stringobject, unicodeobject and the two formatters are rebuild whenever a header files changes ........
This commit is contained in:
parent
ecbac8f38f
commit
23daade028
22 changed files with 127 additions and 77 deletions
|
@ -6,10 +6,10 @@ various DB flags, etc.
|
|||
import os
|
||||
import sys
|
||||
import errno
|
||||
import shutil
|
||||
import string
|
||||
import tempfile
|
||||
from pprint import pprint
|
||||
from test import test_support
|
||||
import unittest
|
||||
import time
|
||||
|
||||
|
@ -54,7 +54,10 @@ class BasicTestCase(unittest.TestCase):
|
|||
|
||||
def setUp(self):
|
||||
if self.useEnv:
|
||||
self.homeDir = tempfile.mkdtemp()
|
||||
homeDir = os.path.join(tempfile.gettempdir(), 'db_home%d'%os.getpid())
|
||||
self.homeDir = homeDir
|
||||
test_support.rmtree(homeDir)
|
||||
os.mkdir(homeDir)
|
||||
try:
|
||||
self.env = db.DBEnv()
|
||||
self.env.set_lg_max(1024*1024)
|
||||
|
@ -68,7 +71,7 @@ class BasicTestCase(unittest.TestCase):
|
|||
tempfile.tempdir = old_tempfile_tempdir
|
||||
# Yes, a bare except is intended, since we're re-raising the exc.
|
||||
except:
|
||||
shutil.rmtree(self.homeDir)
|
||||
test_support.rmtree(homeDir)
|
||||
raise
|
||||
else:
|
||||
self.env = None
|
||||
|
@ -92,8 +95,8 @@ class BasicTestCase(unittest.TestCase):
|
|||
def tearDown(self):
|
||||
self.d.close()
|
||||
if self.env is not None:
|
||||
test_support.rmtree(self.homeDir)
|
||||
self.env.close()
|
||||
shutil.rmtree(self.homeDir)
|
||||
## Make a new DBEnv to remove the env files from the home dir.
|
||||
## (It can't be done while the env is open, nor after it has been
|
||||
## closed, so we make a new one to do it.)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue