aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJohn Snow <jsnow@redhat.com>2021-10-19 10:49:11 -0400
committerJohn Snow <jsnow@redhat.com>2021-11-01 11:54:59 -0400
commit752f425d832d1d4e00f39e80835dd249fb44e698 (patch)
tree1a9dfbd102eb190029ad5490e59aceebf227b7cc /tests
parenta4bde736295bd0951005d7292b99086825f74f8a (diff)
iotests/297: Change run_linter() to raise an exception on failure
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> Reviewed-by: Hanna Reitz <hreitz@redhat.com> Message-id: 20211019144918.3159078-9-jsnow@redhat.com Signed-off-by: John Snow <jsnow@redhat.com>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/qemu-iotests/29724
1 files changed, 14 insertions, 10 deletions
diff --git a/tests/qemu-iotests/297 b/tests/qemu-iotests/297
index d21673a292..76d6a23f53 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)