[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 07/15] iotests/297: refactor run_[mypy|pylint] as generic exec
From: |
John Snow |
Subject: |
[PATCH v2 07/15] iotests/297: refactor run_[mypy|pylint] as generic execution shim |
Date: |
Tue, 19 Oct 2021 10:49:10 -0400 |
There's virtually nothing special here anymore; we can combine these
into a single, rather generic function.
Signed-off-by: John Snow <jsnow@redhat.com>
---
tests/qemu-iotests/297 | 42 ++++++++++++++++++++++--------------------
1 file changed, 22 insertions(+), 20 deletions(-)
diff --git a/tests/qemu-iotests/297 b/tests/qemu-iotests/297
index 189bcaf5f94..d21673a2929 100755
--- a/tests/qemu-iotests/297
+++ b/tests/qemu-iotests/297
@@ -61,27 +61,29 @@ 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,
+def run_linter(
+ tool: str,
+ args: List[str],
+ env: Optional[Mapping[str, str]] = None,
+ suppress_output: bool = False,
) -> None:
+ """
+ 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)
@@ -100,11 +102,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
- [PATCH v2 00/15] python/iotests: Run iotest linters during Python CI, 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 04/15] iotests/297: Create main() function, 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 05/15] iotests/297: Don't rely on distro-specific linter binaries, 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 07/15] iotests/297: refactor run_[mypy|pylint] as generic execution shim,
John Snow <=
- [PATCH v2 14/15] python: Add iotest linters to test suite, 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 09/15] iotests/297: update tool availability checks, John Snow, 2021/10/19
- [PATCH v2 13/15] iotests/linters: Add workaround for mypy bug #9852, John Snow, 2021/10/19
- [PATCH v2 10/15] iotests/297: split test into sub-cases, John Snow, 2021/10/19
- [PATCH v2 11/15] iotests: split linters.py out from 297, John Snow, 2021/10/19