[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 11/16] iotests/297: return error code from run_linters()
From: |
John Snow |
Subject: |
[PATCH v3 11/16] iotests/297: return error code from run_linters() |
Date: |
Thu, 16 Sep 2021 00:09:50 -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 e05c99972e..f9ddfb53a0 100755
--- a/tests/qemu-iotests/297
+++ b/tests/qemu-iotests/297
@@ -68,19 +68,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()
@@ -113,9 +116,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 v3 07/16] iotests/297: Don't rely on distro-specific linter binaries, (continued)
- [PATCH v3 07/16] iotests/297: Don't rely on distro-specific linter binaries, John Snow, 2021/09/16
- [PATCH v3 08/16] iotests/297: Create main() function, John Snow, 2021/09/16
- [PATCH v3 09/16] iotests/297: Separate environment setup from test execution, John Snow, 2021/09/16
- [PATCH v3 10/16] iotests/297: Add 'directory' argument to run_linters, John Snow, 2021/09/16
- [PATCH v3 11/16] iotests/297: return error code from run_linters(),
John Snow <=
- [PATCH v3 13/16] iotests/linters: Add entry point for Python CI linters, John Snow, 2021/09/16
- [PATCH v3 15/16] python: Add iotest linters to test suite, John Snow, 2021/09/16
- [PATCH v3 12/16] iotests/297: split linters.py off from 297, John Snow, 2021/09/16
- [PATCH v3 14/16] iotests/linters: Add workaround for mypy bug #9852, John Snow, 2021/09/16