There's virtually nothing special here anymore; we can combine these into a single, rather generic function.
Signed-off-by: John Snow <js...@redhat.com> --- tests/qemu-iotests/297 | 46 +++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/tests/qemu-iotests/297 b/tests/qemu-iotests/297 index 91029dbb34e..4c54dd39b46 100755 --- a/tests/qemu-iotests/297 +++ b/tests/qemu-iotests/297 @@ -61,29 +61,33 @@ def get_test_files() -> List[str]: return list(filter(is_python_file, check_tests)) -def run_pylint( - files: List[str], - env: Optional[Mapping[str, str]] = None, -) -> None: +def run_linter( + tool: str, + args: List[str], + env: Optional[Mapping[str, str]] = None, + suppress_output: bool = False, +) -> int: + """ + Run a python-based linting tool. - subprocess.run(('python3', '-m', 'pylint', *files), - env=env, check=False) + If suppress_output is True, capture stdout/stderr of the child + process and only print that information back to stdout if the child + process's return code was non-zero. + """ + p = subprocess.run( + ('python3', '-m', tool, *args), + env=env, + check=False, + stdout=subprocess.PIPE if suppress_output else None, + stderr=subprocess.STDOUT if suppress_output else None, + universal_newlines=True, + ) - -def run_mypy( - files: List[str], - env: Optional[Mapping[str, str]] = None, -) -> None: - p = subprocess.run((('python3', '-m', 'mypy', *files), - env=env, - check=False, - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, - universal_newlines=True) - - if p.returncode != 0: + if suppress_output and p.returncode != 0: print(p.stdout) + return p.returncode + def main() -> None: for linter in ('pylint-3', 'mypy'): @@ -100,11 +104,11 @@ def main() -> None: print('=== pylint ===') sys.stdout.flush() - run_pylint(files, env=env) + run_linter('pylint', files, env=env) print('=== mypy ===') sys.stdout.flush() - run_mypy(files, env=env) + run_linter('mypy', files, env=env, suppress_output=True) iotests.script_main(main) -- 2.31.1