Skip to content

Commit b083106

Browse files
committed
Type annotation
1 parent 657740a commit b083106

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

Lib/test/libregrtest/runtest.py

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ def get_abs_module(ns: Namespace, test_name: str) -> str:
197197
return 'test.' + test_name
198198

199199

200-
def _runtest_capture_output_timeout_junit(result: TestResult, ns: Namespace):
200+
def _runtest_capture_output_timeout_junit(result: TestResult, ns: Namespace) -> None:
201201
# Capture stdout and stderr, set faulthandler timeout,
202202
# and create JUnit XML report.
203203

@@ -301,7 +301,7 @@ def save_env(ns: Namespace, test_name: str):
301301
return saved_test_environment(test_name, ns.verbose, ns.quiet, pgo=ns.pgo)
302302

303303

304-
def regrtest_runner(result, test_func, ns):
304+
def regrtest_runner(result, test_func, ns) -> None:
305305
# Run test_func(), collect statistics, and detect reference and memory
306306
# leaks.
307307

@@ -330,7 +330,7 @@ def regrtest_runner(result, test_func, ns):
330330
result.stats = stats
331331

332332

333-
def _load_run_test(result: TestResult, ns: Namespace) -> bool:
333+
def _load_run_test(result: TestResult, ns: Namespace) -> None:
334334
# Load the test function, run the test function.
335335

336336
abstest = get_abs_module(ns, result.test_name)
@@ -375,7 +375,7 @@ def _load_run_test(result: TestResult, ns: Namespace) -> bool:
375375

376376

377377
def _runtest_env_changed_exc(result: TestResult, ns: Namespace,
378-
display_failure: bool = True):
378+
display_failure: bool = True) -> None:
379379
# Detect environment changes, handle exceptions.
380380

381381
# Reset the environment_altered flag to detect if a test altered
@@ -396,12 +396,12 @@ def _runtest_env_changed_exc(result: TestResult, ns: Namespace,
396396
if not ns.quiet and not ns.pgo:
397397
print(f"{test_name} skipped -- {msg}", flush=True)
398398
result.state = State.RESOURCE_DENIED
399-
return result
399+
return
400400
except unittest.SkipTest as msg:
401401
if not ns.quiet and not ns.pgo:
402402
print(f"{test_name} skipped -- {msg}", flush=True)
403403
result.state = State.SKIPPED
404-
return result
404+
return
405405
except support.TestFailedWithDetails as exc:
406406
msg = f"test {test_name} failed"
407407
if display_failure:
@@ -411,36 +411,35 @@ def _runtest_env_changed_exc(result: TestResult, ns: Namespace,
411411
result.errors = exc.errors
412412
result.failures = exc.failures
413413
result.stats = exc.stats
414-
return result
414+
return
415415
except support.TestFailed as exc:
416416
msg = f"test {test_name} failed"
417417
if display_failure:
418418
msg = f"{msg} -- {exc}"
419419
print(msg, file=sys.stderr, flush=True)
420420
result.state = State.FAILED
421421
result.stats = exc.stats
422-
return result
422+
return
423423
except support.TestDidNotRun:
424424
result.state = State.DID_NOT_RUN
425-
return result
425+
return
426426
except KeyboardInterrupt:
427427
print()
428428
result.state = State.INTERRUPTED
429-
return result
429+
return
430430
except:
431431
if not ns.pgo:
432432
msg = traceback.format_exc()
433433
print(f"test {test_name} crashed -- {msg}",
434434
file=sys.stderr, flush=True)
435435
result.state = State.UNCAUGHT_EXC
436-
return result
436+
return
437437

438438
if support.environment_altered:
439439
result.set_env_changed()
440440
# Don't override the state if it was already set (REFLEAK or ENV_CHANGED)
441441
if result.state is None:
442442
result.state = State.PASSED
443-
return result
444443

445444

446445
def cleanup_test_droppings(test_name: str, verbose: int):

0 commit comments

Comments
 (0)