From 7f0767289dc7beaa0e744427e3e6a3dbc5b9561d Mon Sep 17 00:00:00 2001 From: Hemmo Nieminen Date: Tue, 1 Feb 2022 00:00:00 +0200 Subject: mtest: split TestRun's get_details() to multiple functions These new functions will be used individually in later commits. --- mesonbuild/mtest.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/mesonbuild/mtest.py b/mesonbuild/mtest.py index 74b68ac..ac118ae 100644 --- a/mesonbuild/mtest.py +++ b/mesonbuild/mtest.py @@ -905,11 +905,7 @@ class TestRun: def direct_stdout(self) -> bool: return self.verbose and not self.is_parallel and not self.needs_parsing - def get_details(self) -> str: - if self.res is TestResult.PENDING: - return '' - if self.returncode: - return returncode_to_status(self.returncode) + def get_results(self) -> str: if self.results: # running or succeeded passed = sum(x.result.is_ok() for x in self.results) @@ -920,6 +916,16 @@ class TestRun: return f'{passed}/{ran} subtests passed' return '' + def get_exit_status(self) -> str: + return returncode_to_status(self.returncode) + + def get_details(self) -> str: + if self.res is TestResult.PENDING: + return '' + if self.returncode: + return self.get_exit_status() + return self.get_results() + def _complete(self, returncode: int, res: TestResult, stdo: T.Optional[str], stde: T.Optional[str]) -> None: assert isinstance(res, TestResult) -- cgit v1.1