summaryrefslogtreecommitdiffstats
path: root/Lib/test/libregrtest/main.py
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@redhat.com>2018-11-29 20:14:59 (GMT)
committerGitHub <noreply@github.com>2018-11-29 20:14:59 (GMT)
commit8a73cac618a050f4e74eb38ff43e48d9957a6dec (patch)
treef741b3ec314b9090d0027356d45eaea4c73fad73 /Lib/test/libregrtest/main.py
parent1659c08d5d17357597f220c4d297b19e7a59737c (diff)
downloadcpython-8a73cac618a050f4e74eb38ff43e48d9957a6dec.zip
cpython-8a73cac618a050f4e74eb38ff43e48d9957a6dec.tar.gz
cpython-8a73cac618a050f4e74eb38ff43e48d9957a6dec.tar.bz2
[3.7] bpo-34279: Synchronize regrtest with master (GH-10800)
* bpo-34605, libregrtest: Rename --slaveargs to --worker-args (GH-9099) Rename also run_tests_slave() to run_tests_worker(). (cherry picked from commit 012f5b968a738b15ae9b40c499a1c0778b0615a9) * bpo-34279, regrtest: Issue a warning if no tests have been executed (GH-10150) (cherry picked from commit 9724348b43a9005a449ba532ccd3c6726f031097) * test_regrtest: remove unused threading import
Diffstat (limited to 'Lib/test/libregrtest/main.py')
-rw-r--r--Lib/test/libregrtest/main.py19
1 files changed, 15 insertions, 4 deletions
diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py
index 1438966..8d44caf 100644
--- a/Lib/test/libregrtest/main.py
+++ b/Lib/test/libregrtest/main.py
@@ -14,7 +14,7 @@ from test.libregrtest.cmdline import _parse_args
from test.libregrtest.runtest import (
findtests, runtest, get_abs_module,
STDTESTS, NOTTESTS, PASSED, FAILED, ENV_CHANGED, SKIPPED, RESOURCE_DENIED,
- INTERRUPTED, CHILD_ERROR,
+ INTERRUPTED, CHILD_ERROR, TEST_DID_NOT_RUN,
PROGRESS_MIN_TIME, format_test_result)
from test.libregrtest.setup import setup_tests
from test.libregrtest.utils import removepy, count, format_duration, printlist
@@ -79,6 +79,7 @@ class Regrtest:
self.resource_denieds = []
self.environment_changed = []
self.rerun = []
+ self.run_no_tests = []
self.first_result = None
self.interrupted = False
@@ -118,6 +119,8 @@ class Regrtest:
elif ok == RESOURCE_DENIED:
self.skipped.append(test)
self.resource_denieds.append(test)
+ elif ok == TEST_DID_NOT_RUN:
+ self.run_no_tests.append(test)
elif ok != INTERRUPTED:
raise ValueError("invalid test result: %r" % ok)
@@ -368,6 +371,11 @@ class Regrtest:
print("%s:" % count(len(self.rerun), "re-run test"))
printlist(self.rerun)
+ if self.run_no_tests:
+ print()
+ print(count(len(self.run_no_tests), "test"), "run no tests:")
+ printlist(self.run_no_tests)
+
def run_tests_sequential(self):
if self.ns.trace:
import trace
@@ -458,6 +466,9 @@ class Regrtest:
result.append("FAILURE")
elif self.ns.fail_env_changed and self.environment_changed:
result.append("ENV CHANGED")
+ elif not any((self.good, self.bad, self.skipped, self.interrupted,
+ self.environment_changed)):
+ result.append("NO TEST RUN")
if self.interrupted:
result.append("INTERRUPTED")
@@ -580,9 +591,9 @@ class Regrtest:
print(msg, file=sys.stderr, flush=True)
sys.exit(2)
- if self.ns.slaveargs is not None:
- from test.libregrtest.runtest_mp import run_tests_slave
- run_tests_slave(self.ns.slaveargs)
+ if self.ns.worker_args is not None:
+ from test.libregrtest.runtest_mp import run_tests_worker
+ run_tests_worker(self.ns.worker_args)
if self.ns.wait:
input("Press any key to continue...")