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

Two small changes to the resource usage option: 

(1) Allow multiple -u options to extend each other (and the initial
    value of use_resources passed into regrtest.main()).

(2) When a test is run stand-alone (not via regrtest.py), needed
    resources are always granted.
This commit is contained in:
Guido van Rossum 2001-09-06 16:09:41 +00:00
parent 6091cd61ce
commit fe3f6969f5
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/test/regrtest.py
View File

@ -115,10 +115,11 @@ def main(tests=None, testdir=None, verbose=0, quiet=0, generate=0,
elif o in ('-l', '--findleaks'): elif o in ('-l', '--findleaks'):
findleaks = 1 findleaks = 1
elif o in ('-u', '--use'): elif o in ('-u', '--use'):
use_resources = [x.lower() for x in a.split(',')] u = [x.lower() for x in a.split(',')]
for r in use_resources: for r in u:
if r not in ('largefile', 'network'): if r not in ('largefile', 'network'):
usage(1, 'Invalid -u/--use option: %s' % a) usage(1, 'Invalid -u/--use option: %s' % a)
use_resources.extend(u)
if generate and verbose: if generate and verbose:
usage(2, "-g and -v don't go together!") usage(2, "-g and -v don't go together!")

4
Lib/test/test_support.py
View File

@ -20,7 +20,7 @@ class TestSkipped(Error):
""" """
verbose = 1 # Flag set to 0 by regrtest.py verbose = 1 # Flag set to 0 by regrtest.py
use_resources = [] # Flag set to [] by regrtest.py use_resources = None # Flag set to [] by regrtest.py
def unload(name): def unload(name):
try: try:
@ -38,7 +38,7 @@ def forget(modname):
pass pass
def requires(resource, msg=None): def requires(resource, msg=None):
if resource not in use_resources: if use_resources is not None and resource not in use_resources:
if msg is None: if msg is None:
msg = "Use of the `%s' resource not enabled" % resource msg = "Use of the `%s' resource not enabled" % resource
raise TestSkipped(msg) raise TestSkipped(msg)