[Python-checkins] cpython: Issue #25220, libregrtest: Set support.use_resources in setup_tests()

Wed Sep 30 02:40:30 CEST 2015

https://hg.python.org/cpython/rev/6ec81abb8e6a
changeset: 98429:6ec81abb8e6a
user: Victor Stinner <victor.stinner at gmail.com>
date: Wed Sep 30 02:17:28 2015 +0200
summary:
 Issue #25220, libregrtest: Set support.use_resources in setup_tests()
* Rename setup_python() to setup_tests()
* Remove use_resources parameter of runtest()
files:
 Lib/test/libregrtest/main.py | 5 ++---
 Lib/test/libregrtest/runtest.py | 5 +----
 Lib/test/libregrtest/runtest_mp.py | 5 ++---
 Lib/test/libregrtest/setup.py | 4 +++-
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py
--- a/Lib/test/libregrtest/main.py
+++ b/Lib/test/libregrtest/main.py
@@ -10,7 +10,7 @@
 findtests, runtest_ns,
 STDTESTS, NOTTESTS, PASSED, FAILED, ENV_CHANGED, SKIPPED, RESOURCE_DENIED)
 from test.libregrtest.cmdline import _parse_args
-from test.libregrtest.setup import setup_python
+from test.libregrtest.setup import setup_tests
 from test import support
 try:
 import gc
@@ -312,7 +312,6 @@
 
 def run_tests(self):
 support.verbose = self.ns.verbose # Tell tests to be moderately quiet
- support.use_resources = self.ns.use_resources
 
 if self.ns.forever:
 def test_forever(tests):
@@ -361,7 +360,7 @@
 if self.ns.wait:
 input("Press any key to continue...")
 
- setup_python(self.ns)
+ setup_tests(self.ns)
 
 self.find_tests(tests)
 self.run_tests()
diff --git a/Lib/test/libregrtest/runtest.py b/Lib/test/libregrtest/runtest.py
--- a/Lib/test/libregrtest/runtest.py
+++ b/Lib/test/libregrtest/runtest.py
@@ -61,7 +61,7 @@
 
 
 def runtest(test, verbose, quiet,
- huntrleaks=False, use_resources=None,
+ huntrleaks=False,
 output_on_failure=False, failfast=False, match_tests=None,
 timeout=None):
 """Run a single test.
@@ -71,7 +71,6 @@
 quiet -- if true, don't print 'skipped' messages (probably redundant)
 huntrleaks -- run multiple times to test for leaks; requires a debug
 build; a triple corresponding to -R's three arguments
- use_resources -- list of extra resources to use
 output_on_failure -- if true, display test output on failure
 timeout -- dump the traceback and exit if a test takes more than
 timeout seconds
@@ -86,8 +85,6 @@
 PASSED test passed
 """
 
- if use_resources is not None:
- support.use_resources = use_resources
 use_timeout = (timeout is not None)
 if use_timeout:
 faulthandler.dump_traceback_later(timeout, exit=True)
diff --git a/Lib/test/libregrtest/runtest_mp.py b/Lib/test/libregrtest/runtest_mp.py
--- a/Lib/test/libregrtest/runtest_mp.py
+++ b/Lib/test/libregrtest/runtest_mp.py
@@ -14,7 +14,7 @@
 sys.exit(2)
 
 from test.libregrtest.runtest import runtest_ns, INTERRUPTED, CHILD_ERROR
-from test.libregrtest.setup import setup_python
+from test.libregrtest.setup import setup_tests
 
 
 # Minimum duration of a test to display its duration or to mention that
@@ -59,11 +59,10 @@
 ns_dict, testname = json.loads(slaveargs)
 ns = types.SimpleNamespace(**ns_dict)
 
- setup_python(ns)
+ setup_tests(ns)
 
 try:
 result = runtest_ns(testname, ns.verbose, ns,
- use_resources=ns.use_resources,
 output_on_failure=ns.verbose3,
 failfast=ns.failfast,
 match_tests=ns.match_tests)
diff --git a/Lib/test/libregrtest/setup.py b/Lib/test/libregrtest/setup.py
--- a/Lib/test/libregrtest/setup.py
+++ b/Lib/test/libregrtest/setup.py
@@ -13,7 +13,7 @@
 from test.libregrtest.refleak import warm_caches
 
 
-def setup_python(ns):
+def setup_tests(ns):
 # Display the Python traceback on fatal errors (e.g. segfault)
 faulthandler.enable(all_threads=True)
 
@@ -91,6 +91,8 @@
 msvcrt.CrtSetReportMode(m, msvcrt.CRTDBG_MODE_FILE)
 msvcrt.CrtSetReportFile(m, msvcrt.CRTDBG_FILE_STDERR)
 
+ support.use_resources = ns.use_resources
+
 
 def replace_stdout():
 """Set stdout encoder error handler to backslashreplace (as stderr error
-- 
Repository URL: https://hg.python.org/cpython
