mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-12 15:09:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Make the cleanup between -R passes deal better with ABC registries,

Browse source 
*restoring* selected registries instead of *resetting* them all.  Also
change the default for the huntrleaks parameter to None everywhere, as
its other value is a list of three elements, so it is not a bool.
This commit is contained in:
Guido van Rossum 2007-08-18 00:10:33 +00:00
parent 787794f8e2
commit 3de862df45
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Lib/test/regrtest.py
View file

@ -184,7 +184,7 @@ def usage(msg):
def main(tests=None, testdir=None, verbose=0, quiet=False, generate=False, def main(tests=None, testdir=None, verbose=0, quiet=False, generate=False,
exclude=False, single=False, randomize=False, fromfile=None, exclude=False, single=False, randomize=False, fromfile=None,
findleaks=False, use_resources=None, trace=False, coverdir='coverage', findleaks=False, use_resources=None, trace=False, coverdir='coverage',
runleaks=False, huntrleaks=False, verbose2=False, debug=False, runleaks=False, huntrleaks=None, verbose2=False, debug=False,
start=None): start=None):
"""Execute a test suite. """Execute a test suite.
@ -518,7 +518,7 @@ def findtests(testdir=None, stdtests=STDTESTS, nottests=NOTTESTS):
return stdtests + tests return stdtests + tests
def runtest(test, generate, verbose, quiet, testdir=None, def runtest(test, generate, verbose, quiet, testdir=None,
huntrleaks=False, debug=False): huntrleaks=None, debug=False):
"""Run a single test. """Run a single test.
test -- the name of the test test -- the name of the test
@ -545,7 +545,7 @@ def runtest(test, generate, verbose, quiet, testdir=None,
cleanup_test_droppings(test, verbose) cleanup_test_droppings(test, verbose)
def runtest_inner(test, generate, verbose, quiet, def runtest_inner(test, generate, verbose, quiet,
testdir=None, huntrleaks=False, debug=False): testdir=None, huntrleaks=None, debug=False):
test_support.unload(test) test_support.unload(test)
if not testdir: if not testdir:
testdir = findtestdir() testdir = findtestdir()
@ -670,7 +670,7 @@ def cleanup_test_droppings(testname, verbose):
def dash_R(the_module, test, indirect_test, huntrleaks): def dash_R(the_module, test, indirect_test, huntrleaks):
# This code is hackish and inelegant, but it seems to do the job. # This code is hackish and inelegant, but it seems to do the job.
import copy_reg import copy_reg, _abcoll
if not hasattr(sys, 'gettotalrefcount'): if not hasattr(sys, 'gettotalrefcount'):
raise Exception("Tracking reference leaks requires a debug build " raise Exception("Tracking reference leaks requires a debug build "
@ -680,6 +680,9 @@ def dash_R(the_module, test, indirect_test, huntrleaks):
fs = warnings.filters[:] fs = warnings.filters[:]
ps = copy_reg.dispatch_table.copy() ps = copy_reg.dispatch_table.copy()
pic = sys.path_importer_cache.copy() pic = sys.path_importer_cache.copy()
abcs = {obj: obj._ABCMeta__registry.copy()
for abc in [getattr(_abcoll, a) for a in _abcoll.__all__]
for obj in abc.__subclasses__() + [abc]}
if indirect_test: if indirect_test:
def run_the_test(): def run_the_test():
@ -694,13 +697,13 @@ def dash_R(the_module, test, indirect_test, huntrleaks):
repcount = nwarmup + ntracked repcount = nwarmup + ntracked
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)
dash_R_cleanup(fs, ps, pic) dash_R_cleanup(fs, ps, pic, abcs)
for i in range(repcount): for i in range(repcount):
rc = sys.gettotalrefcount() rc = 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) dash_R_cleanup(fs, ps, pic, abcs)
if i >= nwarmup: if i >= nwarmup:
deltas.append(sys.gettotalrefcount() - rc - 2) deltas.append(sys.gettotalrefcount() - rc - 2)
print(file=sys.stderr) print(file=sys.stderr)
@ -711,7 +714,7 @@ def dash_R(the_module, test, indirect_test, huntrleaks):
print(msg, file=refrep) print(msg, file=refrep)
refrep.close() refrep.close()
def dash_R_cleanup(fs, ps, pic): def dash_R_cleanup(fs, ps, pic, abcs):
import gc, copy_reg import gc, copy_reg
import _strptime, linecache, dircache import _strptime, linecache, dircache
import urlparse, urllib, urllib2, mimetypes, doctest import urlparse, urllib, urllib2, mimetypes, doctest
@ -725,10 +728,10 @@ def dash_R_cleanup(fs, ps, pic):
sys.path_importer_cache.clear() sys.path_importer_cache.clear()
sys.path_importer_cache.update(pic) sys.path_importer_cache.update(pic)
# Clear ABC registries. # Clear ABC registries, restoring previously saved ABC registries.
for abc in [getattr(_abcoll, a) for a in _abcoll.__all__]: for abc in [getattr(_abcoll, a) for a in _abcoll.__all__]:
for obj in abc.__subclasses__() + [abc]: for obj in abc.__subclasses__() + [abc]:
obj._ABCMeta__registry.clear() obj._ABCMeta__registry = abcs.get(obj, {}).copy()
obj._ABCMeta__cache.clear() obj._ABCMeta__cache.clear()
obj._ABCMeta__negative_cache.clear() obj._ABCMeta__negative_cache.clear()