| Message ID | 20211019144918.3159078-10-jsnow@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | python/iotests: Run iotest linters during Python CI | expand |
On 19.10.21 16:49, John Snow wrote: > As mentioned in 'iotests/297: Don't rely on distro-specific linter > binaries', these checks are overly strict. Update them to be in-line > with how we actually invoke the linters themselves. > > Signed-off-by: John Snow <jsnow@redhat.com> > --- > tests/qemu-iotests/297 | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) Reviewed-by: Hanna Reitz <hreitz@redhat.com>
diff --git a/tests/qemu-iotests/297 b/tests/qemu-iotests/297 index 76d6a23f531..b2ad8d1cbe0 100755 --- a/tests/qemu-iotests/297 +++ b/tests/qemu-iotests/297 @@ -18,7 +18,6 @@ import os import re -import shutil import subprocess import sys from typing import List, Mapping, Optional @@ -84,9 +83,11 @@ def run_linter( def main() -> None: - for linter in ('pylint-3', 'mypy'): - if shutil.which(linter) is None: - iotests.notrun(f'{linter} not found') + for linter in ('pylint', 'mypy'): + try: + run_linter(linter, ['--version'], suppress_output=True) + except subprocess.CalledProcessError: + iotests.notrun(f"'{linter}' not found") files = get_test_files()
As mentioned in 'iotests/297: Don't rely on distro-specific linter binaries', these checks are overly strict. Update them to be in-line with how we actually invoke the linters themselves. Signed-off-by: John Snow <jsnow@redhat.com> --- tests/qemu-iotests/297 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)