Split out file discovery into its own method to begin separating out the "environment setup" and "test execution" phases.
Signed-off-by: John Snow <js...@redhat.com> --- tests/qemu-iotests/297 | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/297 b/tests/qemu-iotests/297 index 3e86f788fc..b3a56a3a29 100755 --- a/tests/qemu-iotests/297 +++ b/tests/qemu-iotests/297 @@ -21,6 +21,7 @@ import re import shutil import subprocess import sys +from typing import List import iotests @@ -56,10 +57,15 @@ def is_python_file(filename: str, directory: str = '.') -> bool: return False +def get_test_files(directory: str = '.') -> List[str]: + named_test_dir = os.path.join(directory, 'tests') + named_tests = [f"tests/{entry}" for entry in os.listdir(named_test_dir)] + check_tests = set(os.listdir(directory) + named_tests) - set(SKIP_FILES) + return list(filter(lambda f: is_python_file(f, directory), check_tests)) + + def run_linters(): - named_tests = [f'tests/{entry}' for entry in os.listdir('tests')] - check_tests = set(os.listdir('.') + named_tests) - set(SKIP_FILES) - files = [filename for filename in check_tests if is_python_file(filename)] + files = get_test_files() iotests.logger.debug('Files to be checked:') iotests.logger.debug(', '.join(sorted(files))) -- 2.31.1