[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 09/17] iotests/297: Don't rely on distro-specific linter binar
From: |
John Snow |
Subject: |
[PATCH v2 09/17] iotests/297: Don't rely on distro-specific linter binaries |
Date: |
Tue, 20 Jul 2021 13:33:28 -0400 |
'pylint-3' is another Fedora-ism. Use "python3 -m pylint" or "python3 -m
mypy" to access these scripts instead. This style of invocation will
prefer the "correct" tool when run in a virtual environment.
Note that we still check for "pylint-3" before the test begins -- this
check is now "overly strict", but shouldn't cause anything that was
already running correctly to start failing.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
tests/qemu-iotests/297 | 45 ++++++++++++++++++++++++------------------
1 file changed, 26 insertions(+), 19 deletions(-)
diff --git a/tests/qemu-iotests/297 b/tests/qemu-iotests/297
index 665ac0aa361..dc4460dd84b 100755
--- a/tests/qemu-iotests/297
+++ b/tests/qemu-iotests/297
@@ -87,8 +87,11 @@ def run_linters():
env['PYTHONPATH'] += os.pathsep + qemu_module_path
except KeyError:
env['PYTHONPATH'] = qemu_module_path
- subprocess.run(('pylint-3', '--score=n', '--notes=FIXME,XXX', *files),
- env=env, check=False)
+ subprocess.run(
+ ('python3', '-m', 'pylint', '--score=n', '--notes=FIXME,XXX', *files),
+ env=env,
+ check=False,
+ )
print('=== mypy ===')
sys.stdout.flush()
@@ -99,23 +102,27 @@ def run_linters():
# must not both define the __main__ module).
env['MYPYPATH'] = env['PYTHONPATH']
for filename in files:
- p = subprocess.run(('mypy',
- '--warn-unused-configs',
- '--disallow-subclassing-any',
- '--disallow-any-generics',
- '--disallow-incomplete-defs',
- '--disallow-untyped-decorators',
- '--no-implicit-optional',
- '--warn-redundant-casts',
- '--warn-unused-ignores',
- '--no-implicit-reexport',
- '--namespace-packages',
- filename),
- env=env,
- check=False,
- stdout=subprocess.PIPE,
- stderr=subprocess.STDOUT,
- universal_newlines=True)
+ p = subprocess.run(
+ (
+ 'python3', '-m', 'mypy',
+ '--warn-unused-configs',
+ '--disallow-subclassing-any',
+ '--disallow-any-generics',
+ '--disallow-incomplete-defs',
+ '--disallow-untyped-decorators',
+ '--no-implicit-optional',
+ '--warn-redundant-casts',
+ '--warn-unused-ignores',
+ '--no-implicit-reexport',
+ '--namespace-packages',
+ filename,
+ ),
+ env=env,
+ check=False,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT,
+ universal_newlines=True
+ )
if p.returncode != 0:
print(p.stdout)
--
2.31.1
- Re: [PATCH v2 01/17] iotests: use with-statement for open() calls, (continued)
- [PATCH v2 02/17] iotests: use subprocess.DEVNULL instead of open("/dev/null"), John Snow, 2021/07/20
- [PATCH v2 03/17] iotests/mirror-top-perms: Adjust import paths, John Snow, 2021/07/20
- [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 <=
- [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, 2021/07/20
- [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