From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
Eduardo Habkost <ehabkost@redhat.com>,
qemu-block@nongnu.org, Markus Armbruster <armbru@redhat.com>,
Max Reitz <mreitz@redhat.com>, Cleber Rosa <crosa@redhat.com>,
John Snow <jsnow@redhat.com>
Subject: [PATCH v2 08/17] iotests/297: Include sub-directories when finding tests to lint
Date: Tue, 20 Jul 2021 13:33:27 -0400 [thread overview]
Message-ID: <20210720173336.1876937-9-jsnow@redhat.com> (raw)
In-Reply-To: <20210720173336.1876937-1-jsnow@redhat.com>
Choosing to interpret the SKIP_FILES list as a list of filenames instead
of a list of paths, to keep things simple.
Signed-off-by: John Snow <jsnow@redhat.com>
---
tests/qemu-iotests/297 | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/tests/qemu-iotests/297 b/tests/qemu-iotests/297
index 0bc11958059..665ac0aa361 100755
--- a/tests/qemu-iotests/297
+++ b/tests/qemu-iotests/297
@@ -40,13 +40,8 @@ SKIP_FILES = (
)
-def is_python_file(filename: str, directory: str = '.') -> bool:
- filepath = os.path.join(directory, filename)
-
- if not os.path.isfile(filepath):
- return False
-
- if filename.endswith('.py'):
+def is_python_file(filepath: str) -> bool:
+ if filepath.endswith('.py'):
return True
with open(filepath) as f:
@@ -58,10 +53,20 @@ def is_python_file(filename: str, directory: str = '.') -> bool:
def get_test_files(directory: str = '.') -> List[str]:
- return [
- f for f in (set(os.listdir(directory)) - set(SKIP_FILES))
- if is_python_file(f, directory)
- ]
+ files = []
+
+ iotests.logger.debug("get_test_files(%s)", directory)
+ for dirent in os.scandir(directory):
+ if dirent.name in SKIP_FILES:
+ continue
+
+ relpath = os.path.join(directory, dirent.name)
+ if dirent.is_dir():
+ files.extend(get_test_files(relpath))
+ elif is_python_file(relpath):
+ files.append(relpath)
+
+ return files
def run_linters():
--
2.31.1
next prev parent reply other threads:[~2021-07-20 17:43 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-20 17:33 [PATCH v2 00/17] python/iotests: Run iotest linters during Python CI John Snow
2021-07-20 17:33 ` [PATCH v2 01/17] iotests: use with-statement for open() calls John Snow
2021-07-20 17:55 ` Philippe Mathieu-Daudé
2021-07-20 17:33 ` [PATCH v2 02/17] iotests: use subprocess.DEVNULL instead of open("/dev/null") John Snow
2021-07-20 17:57 ` Philippe Mathieu-Daudé
2021-07-20 17:33 ` [PATCH v2 03/17] iotests/mirror-top-perms: Adjust import paths John Snow
2021-07-20 17:57 ` Philippe Mathieu-Daudé
2021-07-20 17:33 ` [PATCH v2 04/17] iotests/migrate-bitmaps-postcopy-test: declare instance variables John Snow
2021-07-20 17:33 ` [PATCH v2 05/17] iotests/migrate-bitmaps-test: delint John Snow
2021-07-20 17:33 ` [PATCH v2 06/17] iotests/297: modify is_python_file to work from any CWD John Snow
2021-07-20 17:33 ` [PATCH v2 07/17] iotests/297: Add get_files() function John Snow
2021-07-20 17:33 ` John Snow [this message]
2021-07-20 17:33 ` [PATCH v2 09/17] iotests/297: Don't rely on distro-specific linter binaries John Snow
2021-07-20 17:59 ` Philippe Mathieu-Daudé
2021-07-20 17:33 ` [PATCH v2 10/17] iotests/297: Create main() function John Snow
2021-07-20 17:33 ` [PATCH v2 11/17] iotests/297: Separate environment setup from test execution John Snow
2021-07-20 17:33 ` [PATCH v2 12/17] iotests/297: Add 'directory' argument to run_linters John Snow
2021-07-20 17:33 ` [PATCH v2 13/17] iotests/297: return error code from run_linters() John Snow
2021-07-20 17:33 ` [PATCH v2 14/17] iotests/297: split linters.py off from 297 John Snow
2021-07-20 17:33 ` [PATCH v2 15/17] iotests/linters: Add entry point for Python CI linters John Snow
2021-07-20 17:33 ` [PATCH v2 16/17] python: Add iotest linters to test suite John Snow
2021-07-20 17:33 ` [PATCH v2 17/17] iotests/linters: check mypy files all at once John Snow
2021-07-20 19:17 ` [PATCH v2 00/17] python/iotests: Run iotest linters during Python CI John Snow
2021-08-24 15:13 ` Hanna Reitz
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=20210720173336.1876937-9-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=armbru@redhat.com \
--cc=crosa@redhat.com \
--cc=ehabkost@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.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).