[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 06/15] iotests/297: Split run_linters apart into run_pylint an
From: |
John Snow |
Subject: |
[PATCH v2 06/15] iotests/297: Split run_linters apart into run_pylint and run_mypy |
Date: |
Tue, 19 Oct 2021 10:49:09 -0400 |
Move environment setup into main(), and split the actual linter
execution into run_pylint and run_mypy, respectively.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
---
tests/qemu-iotests/297 | 38 ++++++++++++++++++++++++--------------
1 file changed, 24 insertions(+), 14 deletions(-)
diff --git a/tests/qemu-iotests/297 b/tests/qemu-iotests/297
index c1bddb9ce0e..189bcaf5f94 100755
--- a/tests/qemu-iotests/297
+++ b/tests/qemu-iotests/297
@@ -21,7 +21,7 @@ import re
import shutil
import subprocess
import sys
-from typing import List
+from typing import List, Mapping, Optional
import iotests
@@ -61,23 +61,19 @@ def get_test_files() -> List[str]:
return list(filter(is_python_file, check_tests))
-def run_linters():
- files = get_test_files()
+def run_pylint(
+ files: List[str],
+ env: Optional[Mapping[str, str]] = None,
+) -> None:
- iotests.logger.debug('Files to be checked:')
- iotests.logger.debug(', '.join(sorted(files)))
-
- print('=== pylint ===')
- sys.stdout.flush()
-
- env = os.environ.copy()
subprocess.run(('python3', '-m', 'pylint', *files),
env=env, check=False)
- print('=== mypy ===')
- sys.stdout.flush()
- env['MYPYPATH'] = env['PYTHONPATH']
+def run_mypy(
+ files: List[str],
+ env: Optional[Mapping[str, str]] = None,
+) -> None:
p = subprocess.run(('python3', '-m', 'mypy', *files),
env=env,
check=False,
@@ -94,7 +90,21 @@ def main() -> None:
if shutil.which(linter) is None:
iotests.notrun(f'{linter} not found')
- run_linters()
+ files = get_test_files()
+
+ iotests.logger.debug('Files to be checked:')
+ iotests.logger.debug(', '.join(sorted(files)))
+
+ env = os.environ.copy()
+ env['MYPYPATH'] = env['PYTHONPATH']
+
+ print('=== pylint ===')
+ sys.stdout.flush()
+ run_pylint(files, env=env)
+
+ print('=== mypy ===')
+ sys.stdout.flush()
+ run_mypy(files, env=env)
iotests.script_main(main)
--
2.31.1
- [PATCH v2 04/15] iotests/297: Create main() function, (continued)
- [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, 2021/10/19
- [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 <=
- [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