From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Vladimir Sementsov-Ogievskiy" <vsementsov@virtuozzo.com>,
"Daniel Berrange" <berrange@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
qemu-block@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>,
"Markus Armbruster" <armbru@redhat.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Willian Rampazzo" <willianr@redhat.com>,
"Hanna Reitz" <hreitz@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>, "John Snow" <jsnow@redhat.com>
Subject: [PULL 09/22] iotests/297: update tool availability checks
Date: Mon, 1 Nov 2021 13:29:53 -0400 [thread overview]
Message-ID: <20211101173006.656673-10-jsnow@redhat.com> (raw)
In-Reply-To: <20211101173006.656673-1-jsnow@redhat.com>
As mentioned in 'iotests/297: Don't rely on distro-specific linter
binaries', these checks are overly strict. Update them to be in-line
with how we actually invoke the linters themselves.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Message-id: 20211019144918.3159078-10-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
---
tests/qemu-iotests/297 | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/tests/qemu-iotests/297 b/tests/qemu-iotests/297
index 76d6a23f531..b2ad8d1cbe0 100755
--- a/tests/qemu-iotests/297
+++ b/tests/qemu-iotests/297
@@ -18,7 +18,6 @@
import os
import re
-import shutil
import subprocess
import sys
from typing import List, Mapping, Optional
@@ -84,9 +83,11 @@ def run_linter(
def main() -> None:
- for linter in ('pylint-3', 'mypy'):
- if shutil.which(linter) is None:
- iotests.notrun(f'{linter} not found')
+ for linter in ('pylint', 'mypy'):
+ try:
+ run_linter(linter, ['--version'], suppress_output=True)
+ except subprocess.CalledProcessError:
+ iotests.notrun(f"'{linter}' not found")
files = get_test_files()
--
2.31.1
next prev parent reply other threads:[~2021-11-01 18:33 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-01 17:29 [PULL 00/22] Python patches John Snow
2021-11-01 17:29 ` [PULL 01/22] iotests/297: Move pylint config into pylintrc John Snow
2021-11-01 17:29 ` [PULL 02/22] iotests/297: Split mypy configuration out into mypy.ini John Snow
2021-11-01 17:29 ` [PULL 03/22] iotests/297: Add get_files() function John Snow
2021-11-01 17:29 ` [PULL 04/22] iotests/297: Create main() function John Snow
2021-11-01 17:29 ` [PULL 05/22] iotests/297: Don't rely on distro-specific linter binaries John Snow
2021-11-01 17:29 ` [PULL 06/22] iotests/297: Split run_linters apart into run_pylint and run_mypy John Snow
2021-11-01 17:29 ` [PULL 07/22] iotests/297: refactor run_[mypy|pylint] as generic execution shim John Snow
2021-11-01 17:29 ` [PULL 08/22] iotests/297: Change run_linter() to raise an exception on failure John Snow
2021-11-01 17:29 ` John Snow [this message]
2021-11-01 17:29 ` [PULL 10/22] iotests/297: split test into sub-cases John Snow
2021-11-01 17:29 ` [PULL 11/22] iotests: split linters.py out from 297 John Snow
2021-11-01 17:29 ` [PULL 12/22] iotests/linters: Add entry point for linting via Python CI John Snow
2021-11-01 17:29 ` [PULL 13/22] iotests/linters: Add workaround for mypy bug #9852 John Snow
2021-11-01 17:29 ` [PULL 14/22] python: Add iotest linters to test suite John Snow
2021-11-01 17:29 ` [PULL 15/22] python/machine: remove has_quit argument John Snow
2021-11-01 17:30 ` [PULL 16/22] python/machine: Handle QMP errors on close more meticulously John Snow
2021-11-01 17:30 ` [PULL 17/22] python/aqmp: Remove scary message John Snow
2021-11-01 17:30 ` [PULL 18/22] iotests: Accommodate async QMP Exception classes John Snow
2021-11-01 17:30 ` [PULL 19/22] iotests: Conditionally silence certain AQMP errors John Snow
2021-11-01 17:30 ` [PULL 20/22] iotests/300: avoid abnormal shutdown race condition John Snow
2021-11-01 17:30 ` [PULL 21/22] python/aqmp: Create sync QMP wrapper for iotests John Snow
2021-11-01 17:30 ` [PULL 22/22] python, iotests: replace qmp with aqmp John Snow
2021-11-09 14:07 ` Thomas Huth
2021-11-09 17:15 ` John Snow
2021-11-02 9:52 ` [PULL 00/22] Python patches Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211101173006.656673-10-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=crosa@redhat.com \
--cc=ehabkost@redhat.com \
--cc=f4bug@amsat.org \
--cc=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=vsementsov@virtuozzo.com \
--cc=wainersm@redhat.com \
--cc=willianr@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).