From fe3f6969f54cfd3df24f54572a809e0deb47064f Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Thu, 6 Sep 2001 16:09:41 +0000 Subject: [PATCH] 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. --- Lib/test/regrtest.py | 5 +++-- Lib/test/test_support.py | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py index 183c12b97cc..2c09f63fdf4 100755 --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -115,10 +115,11 @@ def main(tests=None, testdir=None, verbose=0, quiet=0, generate=0, elif o in ('-l', '--findleaks'): findleaks = 1 elif o in ('-u', '--use'): - use_resources = [x.lower() for x in a.split(',')] - for r in use_resources: + u = [x.lower() for x in a.split(',')] + for r in u: if r not in ('largefile', 'network'): usage(1, 'Invalid -u/--use option: %s' % a) + use_resources.extend(u) if generate and verbose: usage(2, "-g and -v don't go together!") diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py index 85399973d74..5391f68c12f 100644 --- a/Lib/test/test_support.py +++ b/Lib/test/test_support.py @@ -20,7 +20,7 @@ class TestSkipped(Error): """ 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): try: @@ -38,7 +38,7 @@ def forget(modname): pass 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: msg = "Use of the `%s' resource not enabled" % resource raise TestSkipped(msg)