Skip to content

Commit 43d8126

Browse files
miss-islingtonvstinner
miss-islington
and
vstinner
authored
[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 012f5b9) * bpo-34279, regrtest: Issue a warning if no tests have been executed (GH-10150) (cherry picked from commit 9724348) * test_regrtest: remove unused threading import (cherry picked from commit 8a73cac) Co-authored-by: Victor Stinner <[email protected]>
1 parent 77000bb commit 43d8126

File tree

7 files changed

+122
-22
lines changed

7 files changed

+122
-22
lines changed

‎Lib/test/libregrtest/cmdline.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ def _create_parser():
170170
group.add_argument('--wait', action='store_true',
171171
help='wait for user input, e.g., allow a debugger '
172172
'to be attached')
173-
group.add_argument('--slaveargs', metavar='ARGS')
173+
group.add_argument('--worker-args', metavar='ARGS')
174174
group.add_argument('-S', '--start', metavar='START',
175175
help='the name of the test at which to start.' +
176176
more_details)

‎Lib/test/libregrtest/main.py

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from test.libregrtest.runtest import (
1515
findtests, runtest, get_abs_module,
1616
STDTESTS, NOTTESTS, PASSED, FAILED, ENV_CHANGED, SKIPPED, RESOURCE_DENIED,
17-
INTERRUPTED, CHILD_ERROR,
17+
INTERRUPTED, CHILD_ERROR, TEST_DID_NOT_RUN,
1818
PROGRESS_MIN_TIME, format_test_result)
1919
from test.libregrtest.setup import setup_tests
2020
from test.libregrtest.utils import removepy, count, format_duration, printlist
@@ -79,6 +79,7 @@ def __init__(self):
7979
self.resource_denieds = []
8080
self.environment_changed = []
8181
self.rerun = []
82+
self.run_no_tests = []
8283
self.first_result = None
8384
self.interrupted = False
8485

@@ -118,6 +119,8 @@ def accumulate_result(self, test, result):
118119
elif ok == RESOURCE_DENIED:
119120
self.skipped.append(test)
120121
self.resource_denieds.append(test)
122+
elif ok == TEST_DID_NOT_RUN:
123+
self.run_no_tests.append(test)
121124
elif ok != INTERRUPTED:
122125
raise ValueError("invalid test result: %r" % ok)
123126

@@ -368,6 +371,11 @@ def display_result(self):
368371
print("%s:" % count(len(self.rerun), "re-run test"))
369372
printlist(self.rerun)
370373

374+
if self.run_no_tests:
375+
print()
376+
print(count(len(self.run_no_tests), "test"), "run no tests:")
377+
printlist(self.run_no_tests)
378+
371379
def run_tests_sequential(self):
372380
if self.ns.trace:
373381
import trace
@@ -458,6 +466,9 @@ def get_tests_result(self):
458466
result.append("FAILURE")
459467
elif self.ns.fail_env_changed and self.environment_changed:
460468
result.append("ENV CHANGED")
469+
elif not any((self.good, self.bad, self.skipped, self.interrupted,
470+
self.environment_changed)):
471+
result.append("NO TEST RUN")
461472

462473
if self.interrupted:
463474
result.append("INTERRUPTED")
@@ -582,9 +593,9 @@ def _main(self, tests, kwargs):
582593
print(msg, file=sys.stderr, flush=True)
583594
sys.exit(2)
584595

585-
if self.ns.slaveargs is not None:
586-
from test.libregrtest.runtest_mp import run_tests_slave
587-
run_tests_slave(self.ns.slaveargs)
596+
if self.ns.worker_args is not None:
597+
from test.libregrtest.runtest_mp import run_tests_worker
598+
run_tests_worker(self.ns.worker_args)
588599

589600
if self.ns.wait:
590601
input("Press any key to continue...")

‎Lib/test/libregrtest/runtest.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
RESOURCE_DENIED = -3
2020
INTERRUPTED = -4
2121
CHILD_ERROR = -5 # error in a child process
22+
TEST_DID_NOT_RUN = -6 # error in a child process
2223

2324
_FORMAT_TEST_RESULT = {
2425
PASSED: '%s passed',
@@ -28,6 +29,7 @@
2829
RESOURCE_DENIED: '%s skipped (resource denied)',
2930
INTERRUPTED: '%s interrupted',
3031
CHILD_ERROR: '%s crashed',
32+
TEST_DID_NOT_RUN: '%s run no tests',
3133
}
3234

3335
# Minimum duration of a test to display its duration or to mention that
@@ -94,6 +96,7 @@ def runtest(ns, test):
9496
ENV_CHANGED test failed because it changed the execution environment
9597
FAILED test failed
9698
PASSED test passed
99+
EMPTY_TEST_SUITE test ran no subtests.
97100
98101
If ns.xmlpath is not None, xml_data is a list containing each
99102
generated testsuite element.
@@ -197,6 +200,8 @@ def test_runner():
197200
else:
198201
print("test", test, "failed", file=sys.stderr, flush=True)
199202
return FAILED, test_time
203+
except support.TestDidNotRun:
204+
return TEST_DID_NOT_RUN, test_time
200205
except:
201206
msg = traceback.format_exc()
202207
if not ns.pgo:

‎Lib/test/libregrtest/runtest_mp.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,23 @@
2828

2929

3030
def run_test_in_subprocess(testname, ns):
31-
"""Run the given test in a subprocess with --slaveargs.
31+
"""Run the given test in a subprocess with --worker-args.
3232
3333
ns is the option Namespace parsed from command-line arguments. regrtest
34-
is invoked in a subprocess with the --slaveargs argument; when the
34+
is invoked in a subprocess with the --worker-args argument; when the
3535
subprocess exits, its return code, stdout and stderr are returned as a
3636
3-tuple.
3737
"""
3838
from subprocess import Popen, PIPE
3939

4040
ns_dict = vars(ns)
41-
slaveargs = (ns_dict, testname)
42-
slaveargs = json.dumps(slaveargs)
41+
worker_args = (ns_dict, testname)
42+
worker_args = json.dumps(worker_args)
4343

4444
cmd = [sys.executable, *support.args_from_interpreter_flags(),
4545
'-u', # Unbuffered stdout and stderr
4646
'-m', 'test.regrtest',
47-
'--slaveargs', slaveargs]
47+
'--worker-args', worker_args]
4848
if ns.pgo:
4949
cmd += ['--pgo']
5050

@@ -62,8 +62,8 @@ def run_test_in_subprocess(testname, ns):
6262
return retcode, stdout, stderr
6363

6464

65-
def run_tests_slave(slaveargs):
66-
ns_dict, testname = json.loads(slaveargs)
65+
def run_tests_worker(worker_args):
66+
ns_dict, testname = json.loads(worker_args)
6767
ns = types.SimpleNamespace(**ns_dict)
6868

6969
setup_tests(ns)

‎Lib/test/support/__init__.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
# globals
7575
"PIPE_MAX_SIZE", "verbose", "max_memuse", "use_resources", "failfast",
7676
# exceptions
77-
"Error", "TestFailed", "ResourceDenied",
77+
"Error", "TestFailed", "TestDidNotRun", "ResourceDenied",
7878
# imports
7979
"import_module", "import_fresh_module", "CleanImport",
8080
# modules
@@ -120,6 +120,9 @@ class Error(Exception):
120120
class TestFailed(Error):
121121
"""Test failed."""
122122

123+
class TestDidNotRun(Error):
124+
"""Test did not run any subtests."""
125+
123126
class ResourceDenied(unittest.SkipTest):
124127
"""Test skipped because it requested a disallowed resource.
125128
@@ -1916,6 +1919,8 @@ def _run_suite(suite):
19161919
if junit_xml_list is not None:
19171920
junit_xml_list.append(result.get_xml_element())
19181921

1922+
if not result.testsRun:
1923+
raise TestDidNotRun
19191924
if not result.wasSuccessful():
19201925
if len(result.errors) == 1 and not result.failures:
19211926
err = result.errors[0][1]

‎Lib/test/test_regrtest.py

Lines changed: 85 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ def test_wait(self):
6666
ns = libregrtest._parse_args(['--wait'])
6767
self.assertTrue(ns.wait)
6868

69-
def test_slaveargs(self):
70-
ns = libregrtest._parse_args(['--slaveargs', '[[], {}]'])
71-
self.assertEqual(ns.slaveargs, '[[], {}]')
72-
self.checkError(['--slaveargs'], 'expected one argument')
69+
def test_worker_args(self):
70+
ns = libregrtest._parse_args(['--worker-args', '[[], {}]'])
71+
self.assertEqual(ns.worker_args, '[[], {}]')
72+
self.checkError(['--worker-args'], 'expected one argument')
7373

7474
def test_start(self):
7575
for opt in '-S', '--start':
@@ -351,11 +351,20 @@ def setUp(self):
351351
self.tmptestdir = tempfile.mkdtemp()
352352
self.addCleanup(support.rmtree, self.tmptestdir)
353353

354-
def create_test(self, name=None, code=''):
354+
def create_test(self, name=None, code=None):
355355
if not name:
356356
name = 'noop%s' % BaseTestCase.TEST_UNIQUE_ID
357357
BaseTestCase.TEST_UNIQUE_ID += 1
358358

359+
if code is None:
360+
code = textwrap.dedent("""
361+
import unittest
362+
363+
class Tests(unittest.TestCase):
364+
def test_empty_test(self):
365+
pass
366+
""")
367+
359368
# test_regrtest cannot be run twice in parallel because
360369
# of setUp() and create_test()
361370
name = self.TESTNAME_PREFIX + name
@@ -390,7 +399,7 @@ def parse_executed_tests(self, output):
390399

391400
def check_executed_tests(self, output, tests, skipped=(), failed=(),
392401
env_changed=(), omitted=(),
393-
rerun=(),
402+
rerun=(), no_test_ran=(),
394403
randomize=False, interrupted=False,
395404
fail_env_changed=False):
396405
if isinstance(tests, str):
@@ -405,6 +414,8 @@ def check_executed_tests(self, output, tests, skipped=(), failed=(),
405414
omitted = [omitted]
406415
if isinstance(rerun, str):
407416
rerun = [rerun]
417+
if isinstance(no_test_ran, str):
418+
no_test_ran = [no_test_ran]
408419

409420
executed = self.parse_executed_tests(output)
410421
if randomize:
@@ -447,8 +458,12 @@ def list_regex(line_format, tests):
447458
regex = "Re-running test %r in verbose mode" % name
448459
self.check_line(output, regex)
449460

461+
if no_test_ran:
462+
regex = list_regex('%s test%s run no tests', no_test_ran)
463+
self.check_line(output, regex)
464+
450465
good = (len(tests) - len(skipped) - len(failed)
451-
- len(omitted) - len(env_changed))
466+
- len(omitted) - len(env_changed) - len(no_test_ran))
452467
if good:
453468
regex = r'%s test%s OK\.$' % (good, plural(good))
454469
if not skipped and not failed and good > 1:
@@ -465,12 +480,16 @@ def list_regex(line_format, tests):
465480
result.append('ENV CHANGED')
466481
if interrupted:
467482
result.append('INTERRUPTED')
468-
if not result:
483+
if not any((good, result, failed, interrupted, skipped,
484+
env_changed, fail_env_changed)):
485+
result.append("NO TEST RUN")
486+
elif not result:
469487
result.append('SUCCESS')
470488
result = ', '.join(result)
471489
if rerun:
472490
self.check_line(output, 'Tests result: %s' % result)
473491
result = 'FAILURE then %s' % result
492+
474493
self.check_line(output, 'Tests result: %s' % result)
475494

476495
def parse_random_seed(self, output):
@@ -649,7 +668,14 @@ def test_resources(self):
649668
# test -u command line option
650669
tests = {}
651670
for resource in ('audio', 'network'):
652-
code = 'from test import support\nsupport.requires(%r)' % resource
671+
code = textwrap.dedent("""
672+
from test import support; support.requires(%r)
673+
import unittest
674+
class PassingTest(unittest.TestCase):
675+
def test_pass(self):
676+
pass
677+
""" % resource)
678+
653679
tests[resource] = self.create_test(resource, code)
654680
test_names = sorted(tests.values())
655681

@@ -983,6 +1009,56 @@ def test_bug(self):
9831009
output = self.run_tests("-w", testname, exitcode=2)
9841010
self.check_executed_tests(output, [testname],
9851011
failed=testname, rerun=testname)
1012+
def test_no_tests_ran(self):
1013+
code = textwrap.dedent("""
1014+
import unittest
1015+
1016+
class Tests(unittest.TestCase):
1017+
def test_bug(self):
1018+
pass
1019+
""")
1020+
testname = self.create_test(code=code)
1021+
1022+
output = self.run_tests(testname, "-m", "nosuchtest", exitcode=0)
1023+
self.check_executed_tests(output, [testname], no_test_ran=testname)
1024+
1025+
def test_no_tests_ran_multiple_tests_nonexistent(self):
1026+
code = textwrap.dedent("""
1027+
import unittest
1028+
1029+
class Tests(unittest.TestCase):
1030+
def test_bug(self):
1031+
pass
1032+
""")
1033+
testname = self.create_test(code=code)
1034+
testname2 = self.create_test(code=code)
1035+
1036+
output = self.run_tests(testname, testname2, "-m", "nosuchtest", exitcode=0)
1037+
self.check_executed_tests(output, [testname, testname2],
1038+
no_test_ran=[testname, testname2])
1039+
1040+
def test_no_test_ran_some_test_exist_some_not(self):
1041+
code = textwrap.dedent("""
1042+
import unittest
1043+
1044+
class Tests(unittest.TestCase):
1045+
def test_bug(self):
1046+
pass
1047+
""")
1048+
testname = self.create_test(code=code)
1049+
other_code = textwrap.dedent("""
1050+
import unittest
1051+
1052+
class Tests(unittest.TestCase):
1053+
def test_other_bug(self):
1054+
pass
1055+
""")
1056+
testname2 = self.create_test(code=other_code)
1057+
1058+
output = self.run_tests(testname, testname2, "-m", "nosuchtest",
1059+
"-m", "test_other_bug", exitcode=0)
1060+
self.check_executed_tests(output, [testname, testname2],
1061+
no_test_ran=[testname])
9861062

9871063

9881064
class TestUtils(unittest.TestCase):

‎Misc/NEWS.d/next/Tests/2018-10-27-13-41-55.bpo-34279.v0Xqxe.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
regrtest issue a warning when no tests have been executed in a particular
2+
test file. Also, a new final result state is issued if no test have been
3+
executed across all test files. Patch by Pablo Galindo.

0 commit comments

Comments
 (0)