[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 09/15] iotests/297: update tool availability checks
From: |
John Snow |
Subject: |
[PATCH v2 09/15] iotests/297: update tool availability checks |
Date: |
Tue, 19 Oct 2021 10:49:12 -0400 |
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(-)
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()
--
2.31.1
- [PATCH v2 00/15] python/iotests: Run iotest linters during Python CI, John Snow, 2021/10/19
- [PATCH v2 01/15] iotests/297: Move pylint config into pylintrc, John Snow, 2021/10/19
- [PATCH v2 03/15] iotests/297: Add get_files() function, John Snow, 2021/10/19
- [PATCH v2 04/15] iotests/297: Create main() function, John Snow, 2021/10/19
- [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 <=
- [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, 2021/10/19
- [PATCH v2 12/15] iotests/linters: Add entry point for linting via Python CI, John Snow, 2021/10/19