[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 01/10] iotests/297: modify is_python_file to work from any CWD
From: |
John Snow |
Subject: |
[PATCH 01/10] iotests/297: modify is_python_file to work from any CWD |
Date: |
Fri, 25 Jun 2021 14:20:12 -0400 |
Add a directory argument to is_python_file to allow it to work correctly
no matter what CWD we happen to run it from. This is done in
anticipation of running the iotests from another directory (./python/).
Signed-off-by: John Snow <jsnow@redhat.com>
---
tests/qemu-iotests/297 | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/297 b/tests/qemu-iotests/297
index 433b732336..493dda17fb 100755
--- a/tests/qemu-iotests/297
+++ b/tests/qemu-iotests/297
@@ -39,14 +39,16 @@ SKIP_FILES = (
)
-def is_python_file(filename):
- if not os.path.isfile(filename):
+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'):
return True
- with open(filename) as f:
+ with open(filepath) as f:
try:
first_line = f.readline()
return re.match('^#!.*python', first_line) is not None
--
2.31.1
- [PATCH 00/10] python/iotests: Run iotest linters during Python CI, John Snow, 2021/06/25
- [PATCH 01/10] iotests/297: modify is_python_file to work from any CWD,
John Snow <=
- [PATCH 02/10] iotests/297: Add get_files() function, John Snow, 2021/06/25
- [PATCH 04/10] iotests/297: Create main() function, John Snow, 2021/06/25
- [PATCH 05/10] iotests/297: Separate environment setup from test execution, John Snow, 2021/06/25
- [PATCH 03/10] iotests/297: Don't rely on distro-specific linter binaries, John Snow, 2021/06/25
- [PATCH 06/10] iotests/297: Add 'directory' argument to run_linters, John Snow, 2021/06/25
- [PATCH 09/10] iotests/linters: Add entry point for Python CI linters, John Snow, 2021/06/25
- [PATCH 08/10] iotests/297: split linters.py off from 297, John Snow, 2021/06/25
- [PATCH 10/10] python: Add iotest linters to test suite, John Snow, 2021/06/25
- [PATCH 07/10] iotests/297: return error code from run_linters(), John Snow, 2021/06/25