From: Victor Stinner Date: Sat, 18 May 2024 20:21:05 +0000 (-0400) Subject: gh-119050: Add type hints to libregrtest/results.py (#119144) X-Git-Tag: v3.14.0a1~1880 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=30b4e9f9c42493136c58c56fee5553128bb32428;p=thirdparty%2FPython%2Fcpython.git gh-119050: Add type hints to libregrtest/results.py (#119144) Sort also 'omitted' in TestResults.display_result(). --- diff --git a/Lib/test/libregrtest/results.py b/Lib/test/libregrtest/results.py index 85c82052eae1..0e28435bc7d6 100644 --- a/Lib/test/libregrtest/results.py +++ b/Lib/test/libregrtest/results.py @@ -18,7 +18,7 @@ EXITCODE_INTERRUPTED = 130 # 128 + signal.SIGINT=2 class TestResults: - def __init__(self): + def __init__(self) -> None: self.bad: TestList = [] self.good: TestList = [] self.rerun_bad: TestList = [] @@ -38,22 +38,22 @@ class TestResults: # used by -T with -j self.covered_lines: set[Location] = set() - def is_all_good(self): + def is_all_good(self) -> bool: return (not self.bad and not self.skipped and not self.interrupted and not self.worker_bug) - def get_executed(self): + def get_executed(self) -> set[TestName]: return (set(self.good) | set(self.bad) | set(self.skipped) | set(self.resource_denied) | set(self.env_changed) | set(self.run_no_tests)) - def no_tests_run(self): + def no_tests_run(self) -> bool: return not any((self.good, self.bad, self.skipped, self.interrupted, self.env_changed)) - def get_state(self, fail_env_changed): + def get_state(self, fail_env_changed: bool) -> str: state = [] if self.bad: state.append("FAILURE") @@ -204,7 +204,7 @@ class TestResults: omitted = set(tests) - self.get_executed() # less important - all_tests.append((omitted, "test", "{} omitted:")) + all_tests.append((sorted(omitted), "test", "{} omitted:")) if not quiet: all_tests.append((self.skipped, "test", "{} skipped:")) all_tests.append((self.resource_denied, "test", "{} skipped (resource denied):"))