[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 08/15] iotests/297: Change run_linter() to raise an exception
From: |
John Snow |
Subject: |
[PATCH v2 08/15] iotests/297: Change run_linter() to raise an exception on failure |
Date: |
Tue, 19 Oct 2021 10:49:11 -0400 |
Instead of using a process return code as the python function return
value (or just not returning anything at all), allow run_linter() to
raise an exception instead.
The responsibility for printing output on error shifts from the function
itself to the caller, who will know best how to present/format that
information. (Also, "suppress_output" is now a lot more accurate of a
parameter name.)
Signed-off-by: John Snow <jsnow@redhat.com>
---
tests/qemu-iotests/297 | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/tests/qemu-iotests/297 b/tests/qemu-iotests/297
index d21673a2929..76d6a23f531 100755
--- a/tests/qemu-iotests/297
+++ b/tests/qemu-iotests/297
@@ -70,22 +70,18 @@ def run_linter(
"""
Run a python-based linting tool.
- 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.
+ :param suppress_output: If True, suppress all stdout/stderr output.
+ :raise CalledProcessError: If the linter process exits with failure.
"""
- p = subprocess.run(
+ subprocess.run(
('python3', '-m', tool, *args),
env=env,
- check=False,
+ check=True,
stdout=subprocess.PIPE if suppress_output else None,
stderr=subprocess.STDOUT if suppress_output else None,
universal_newlines=True,
)
- if suppress_output and p.returncode != 0:
- print(p.stdout)
-
def main() -> None:
for linter in ('pylint-3', 'mypy'):
@@ -102,11 +98,19 @@ def main() -> None:
print('=== pylint ===')
sys.stdout.flush()
- run_linter('pylint', files, env=env)
+ try:
+ run_linter('pylint', files, env=env)
+ except subprocess.CalledProcessError:
+ # pylint failure will be caught by diffing the IO.
+ pass
print('=== mypy ===')
sys.stdout.flush()
- run_linter('mypy', files, env=env, suppress_output=True)
+ try:
+ run_linter('mypy', files, env=env, suppress_output=True)
+ except subprocess.CalledProcessError as exc:
+ if exc.output:
+ print(exc.output)
iotests.script_main(main)
--
2.31.1
- [PATCH v2 05/15] iotests/297: Don't rely on distro-specific linter binaries, (continued)
- [PATCH v2 05/15] iotests/297: Don't rely on distro-specific linter binaries, John Snow, 2021/10/19
- [PATCH v2 02/15] iotests/297: Split mypy configuration out into mypy.ini, John Snow, 2021/10/19
- [PATCH v2 06/15] iotests/297: Split run_linters apart into run_pylint and run_mypy, John Snow, 2021/10/19
- [PATCH v2 07/15] iotests/297: refactor run_[mypy|pylint] as generic execution shim, John Snow, 2021/10/19
- [PATCH v2 09/15] iotests/297: update tool availability checks, John Snow, 2021/10/19
- [PATCH v2 10/15] iotests/297: split test into sub-cases, John Snow, 2021/10/19
- [PATCH v2 08/15] iotests/297: Change run_linter() to raise an exception on failure,
John Snow <=
- [PATCH v2 12/15] iotests/linters: Add entry point for linting via Python CI, John Snow, 2021/10/19
[PATCH v2 14/15] python: Add iotest linters to test suite, John Snow, 2021/10/19
[PATCH v2 13/15] iotests/linters: Add workaround for mypy bug #9852, John Snow, 2021/10/19
[PATCH v2 11/15] iotests: split linters.py out from 297, John Snow, 2021/10/19