[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 11/17] iotests/297: Separate environment setup from test execu
From: |
John Snow |
Subject: |
[PATCH v2 11/17] iotests/297: Separate environment setup from test execution |
Date: |
Tue, 20 Jul 2021 13:33:30 -0400 |
Move environment setup into main(), leaving pure test execution behind
in run_linters().
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
tests/qemu-iotests/297 | 36 +++++++++++++++++++++---------------
1 file changed, 21 insertions(+), 15 deletions(-)
diff --git a/tests/qemu-iotests/297 b/tests/qemu-iotests/297
index 7ef4cdc7615..961c9170d21 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
@@ -69,24 +69,16 @@ def get_test_files(directory: str = '.') -> List[str]:
return files
-def run_linters():
- files = get_test_files()
-
- iotests.logger.debug('Files to be checked:')
- iotests.logger.debug(', '.join(sorted(files)))
+def run_linters(
+ files: List[str],
+ env: Optional[Mapping[str, str]] = None,
+) -> None:
print('=== pylint ===')
sys.stdout.flush()
# Todo notes are fine, but fixme's or xxx's should probably just be
# fixed (in tests, at least)
- env = os.environ.copy()
- qemu_module_path = os.path.join(os.path.dirname(__file__),
- '..', '..', 'python')
- try:
- env['PYTHONPATH'] += os.pathsep + qemu_module_path
- except KeyError:
- env['PYTHONPATH'] = qemu_module_path
subprocess.run(
('python3', '-m', 'pylint', '--score=n', '--notes=FIXME,XXX', *files),
env=env,
@@ -100,7 +92,6 @@ def run_linters():
# will interpret all given files as belonging together (i.e., they
# may not both define the same classes, etc.; most notably, they
# must not both define the __main__ module).
- env['MYPYPATH'] = env['PYTHONPATH']
for filename in files:
p = subprocess.run(
(
@@ -133,7 +124,22 @@ 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()
+ qemu_module_path = os.path.join(os.path.dirname(__file__),
+ '..', '..', 'python')
+ try:
+ env['PYTHONPATH'] += os.pathsep + qemu_module_path
+ except KeyError:
+ env['PYTHONPATH'] = qemu_module_path
+
+ env['MYPYPATH'] = env['PYTHONPATH']
+
+ run_linters(files, env=env)
iotests.script_main(main)
--
2.31.1
- Re: [PATCH v2 03/17] iotests/mirror-top-perms: Adjust import paths, (continued)
- [PATCH v2 04/17] iotests/migrate-bitmaps-postcopy-test: declare instance variables, John Snow, 2021/07/20
- [PATCH v2 05/17] iotests/migrate-bitmaps-test: delint, John Snow, 2021/07/20
- [PATCH v2 06/17] iotests/297: modify is_python_file to work from any CWD, John Snow, 2021/07/20
- [PATCH v2 07/17] iotests/297: Add get_files() function, John Snow, 2021/07/20
- [PATCH v2 10/17] iotests/297: Create main() function, John Snow, 2021/07/20
- [PATCH v2 09/17] iotests/297: Don't rely on distro-specific linter binaries, John Snow, 2021/07/20
- [PATCH v2 08/17] iotests/297: Include sub-directories when finding tests to lint, John Snow, 2021/07/20
- [PATCH v2 12/17] iotests/297: Add 'directory' argument to run_linters, John Snow, 2021/07/20
- [PATCH v2 11/17] iotests/297: Separate environment setup from test execution,
John Snow <=
- [PATCH v2 16/17] python: Add iotest linters to test suite, John Snow, 2021/07/20
- [PATCH v2 15/17] iotests/linters: Add entry point for Python CI linters, John Snow, 2021/07/20
- [PATCH v2 13/17] iotests/297: return error code from run_linters(), John Snow, 2021/07/20
- [PATCH v2 14/17] iotests/297: split linters.py off from 297, John Snow, 2021/07/20
- [PATCH v2 17/17] iotests/linters: check mypy files all at once, John Snow, 2021/07/20
- Re: [PATCH v2 00/17] python/iotests: Run iotest linters during Python CI, John Snow, 2021/07/20