[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 13/17] iotests/297: return error code from run_linters()
From: |
John Snow |
Subject: |
[PATCH v2 13/17] iotests/297: return error code from run_linters() |
Date: |
Tue, 20 Jul 2021 13:33:32 -0400 |
This turns run_linters() into a bit of a hybrid test; returning non-zero
on failed execution while also printing diffable information. This is
done for the benefit of the avocado simple test runner, which will soon
be attempting to execute this test from a different environment.
(Note: universal_newlines is added to the pylint invocation for type
consistency with the mypy run -- it's not strictly necessary, but it
avoids some typing errors caused by our re-use of the 'p' variable.)
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
tests/qemu-iotests/297 | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/tests/qemu-iotests/297 b/tests/qemu-iotests/297
index b2bf7928c5d..ca9ee72d2fa 100755
--- a/tests/qemu-iotests/297
+++ b/tests/qemu-iotests/297
@@ -73,19 +73,22 @@ def run_linters(
files: List[str],
directory: str = '.',
env: Optional[Mapping[str, str]] = None,
-) -> None:
+) -> int:
+ ret = 0
print('=== pylint ===')
sys.stdout.flush()
# Todo notes are fine, but fixme's or xxx's should probably just be
# fixed (in tests, at least)
- subprocess.run(
+ p = subprocess.run(
('python3', '-m', 'pylint', '--score=n', '--notes=FIXME,XXX', *files),
cwd=directory,
env=env,
check=False,
+ universal_newlines=True,
)
+ ret += p.returncode
print('=== mypy ===')
sys.stdout.flush()
@@ -118,9 +121,12 @@ def run_linters(
universal_newlines=True
)
+ ret += p.returncode
if p.returncode != 0:
print(p.stdout)
+ return ret
+
def main() -> None:
for linter in ('pylint-3', 'mypy'):
--
2.31.1
- [PATCH v2 06/17] iotests/297: modify is_python_file to work from any CWD, (continued)
- [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, 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 <=
- [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