SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iotests/297: Split run_linters apart into run_pylint and run_mypy

Browse Source 
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>
Message-id: 20211019144918.3159078-7-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
John Snow 2021-10-19 10:49:09 -04:00
parent f1be6219c5
commit 2d804f55b4
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tests/qemu-iotests/297
View File

@ -21,7 +21,7 @@ import re
import shutil import shutil
import subprocess import subprocess
import sys import sys
from typing import List from typing import List, Mapping, Optional
import iotests import iotests
@ -61,23 +61,19 @@ def get_test_files() -> List[str]:
return list(filter(is_python_file, check_tests)) return list(filter(is_python_file, check_tests))
def run_linters(): def run_pylint(
files = get_test_files() 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), subprocess.run(('python3', '-m', 'pylint', *files),
env=env, check=False) 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), p = subprocess.run(('python3', '-m', 'mypy', *files),
env=env, env=env,
check=False, check=False,
@ -94,7 +90,21 @@ def main() -> None:
if shutil.which(linter) is None: if shutil.which(linter) is None:
iotests.notrun(f'{linter} not found') 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) iotests.script_main(main)