From 5102c4e385689a1d3c67eccefa2a4b7ac6686712 Mon Sep 17 00:00:00 2001 From: Neal Norwitz Date: Thu, 6 Apr 2006 08:00:20 +0000 Subject: [PATCH] Hopefully this makes test_urllib2 have inconsistent leak results --- Lib/test/regrtest.py | 3 ++- Misc/build.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py index b363455221c..11090867507 100755 --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -520,7 +520,7 @@ def runtest(test, generate, verbose, quiet, testdir=None, huntrleaks=False): import gc def cleanup(): import _strptime, linecache, warnings, dircache - import urlparse, urllib, urllib2 + import urlparse, urllib, urllib2, mimetypes from distutils.dir_util import _path_created _path_created.clear() warnings.filters[:] = fs @@ -536,6 +536,7 @@ def runtest(test, generate, verbose, quiet, testdir=None, huntrleaks=False): sys.path_importer_cache.update(pic) dircache.reset() linecache.clearcache() + mimetypes._default_mime_types() if indirect_test: def run_the_test(): indirect_test() diff --git a/Misc/build.sh b/Misc/build.sh index d1372d64b6c..2c954030070 100755 --- a/Misc/build.sh +++ b/Misc/build.sh @@ -60,7 +60,7 @@ REFLOG="build/reflog.txt.out" # Note: test_XXX (none currently) really leak, but are disabled # so we don't send spam. Any test which really leaks should only # be listed here if there are also test cases under Lib/test/leakers. -LEAKY_TESTS="test_(capi|cfgparser|charmapcodec|cmd_line|compiler|ctypes|filecmp|quopri|socket|threaded_import|threadedtempfile|threading|threading_local|urllib2)" +LEAKY_TESTS="test_(capi|cfgparser|charmapcodec|cmd_line|compiler|ctypes|filecmp|quopri|socket|threaded_import|threadedtempfile|threading|threading_local)" # Change this flag to "yes" for old releases to only update/build the docs. BUILD_DISABLED="no"