Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

clear zip stat cache after each ref leak run

This commit is contained in:
Benjamin Peterson 2014-01-09 11:10:30 -06:00
parent 768c16ce02
commit 50b82c765f
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/test/regrtest.py
View File

@ -1318,9 +1318,10 @@ def dash_R(the_module, test, indirect_test, huntrleaks):
try: try:
import zipimport import zipimport
except ImportError: except ImportError:
zdc = None # Run unmodified on platforms without zipimport support zsc = zdc = None # Run unmodified on platforms without zipimport support
else: else:
zdc = zipimport._zip_directory_cache.copy() zdc = zipimport._zip_directory_cache.copy()
zsc = zipimport._zip_stat_cache.copy()
abcs = {} abcs = {}
for abc in [getattr(collections.abc, a) for a in collections.abc.__all__]: for abc in [getattr(collections.abc, a) for a in collections.abc.__all__]:
if not isabstract(abc): if not isabstract(abc):
@ -1343,13 +1344,13 @@ def dash_R(the_module, test, indirect_test, huntrleaks):
print("beginning", repcount, "repetitions", file=sys.stderr) print("beginning", repcount, "repetitions", file=sys.stderr)
print(("1234567890"*(repcount//10 + 1))[:repcount], file=sys.stderr) print(("1234567890"*(repcount//10 + 1))[:repcount], file=sys.stderr)
sys.stderr.flush() sys.stderr.flush()
dash_R_cleanup(fs, ps, pic, zdc, abcs) dash_R_cleanup(fs, ps, pic, zdc, zsc, abcs)
for i in range(repcount): for i in range(repcount):
rc_before = sys.gettotalrefcount() rc_before = sys.gettotalrefcount()
run_the_test() run_the_test()
sys.stderr.write('.') sys.stderr.write('.')
sys.stderr.flush() sys.stderr.flush()
dash_R_cleanup(fs, ps, pic, zdc, abcs) dash_R_cleanup(fs, ps, pic, zdc, zsc, abcs)
rc_after = sys.gettotalrefcount() rc_after = sys.gettotalrefcount()
if i >= nwarmup: if i >= nwarmup:
deltas.append(rc_after - rc_before) deltas.append(rc_after - rc_before)
@ -1364,7 +1365,7 @@ def dash_R(the_module, test, indirect_test, huntrleaks):
return True return True
return False return False
def dash_R_cleanup(fs, ps, pic, zdc, abcs): def dash_R_cleanup(fs, ps, pic, zdc, zsc, abcs):
import gc, copyreg import gc, copyreg
import _strptime, linecache import _strptime, linecache
import urllib.parse, urllib.request, mimetypes, doctest import urllib.parse, urllib.request, mimetypes, doctest
@ -1390,6 +1391,8 @@ def dash_R_cleanup(fs, ps, pic, zdc, abcs):
else: else:
zipimport._zip_directory_cache.clear() zipimport._zip_directory_cache.clear()
zipimport._zip_directory_cache.update(zdc) zipimport._zip_directory_cache.update(zdc)
zipimport._zip_stat_cache.clear()
zipimport._zip_stat_cache.update(zsc)
# clear type cache # clear type cache
sys._clear_type_cache() sys._clear_type_cache()

5
Lib/test/test_pkgutil.py
View File

@ -338,11 +338,6 @@ class ImportlibMigrationTests(unittest.TestCase):
def test_main(): def test_main():
run_unittest(PkgutilTests, PkgutilPEP302Tests, ExtendPathTests, run_unittest(PkgutilTests, PkgutilPEP302Tests, ExtendPathTests,
NestedNamespacePackageTest, ImportlibMigrationTests) NestedNamespacePackageTest, ImportlibMigrationTests)
# this is necessary if test is run repeated (like when finding leaks)
import zipimport
import importlib
zipimport._zip_directory_cache.clear()
importlib.invalidate_caches()
if __name__ == '__main__': if __name__ == '__main__':