From 05247c9a86a032260c4582defc095eb8b9a0f45d Mon Sep 17 00:00:00 2001 From: Irina Efode Date: Wed, 26 Jul 2023 13:36:45 +0300 Subject: [PATCH] [IE TESTS] Fix parallel runner to run any test (#18787) * [IE TESTS] Fix parallel runner to run any test * Fix run_conformance on Macos --- .../layer_tests_summary/run_parallel.py | 11 +++++++---- .../layer_tests_summary/utils/constants.py | 1 + .../layer_tests_summary/utils/file_utils.py | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/tests/test_utils/functional_test_utils/layer_tests_summary/run_parallel.py b/src/tests/test_utils/functional_test_utils/layer_tests_summary/run_parallel.py index 4c8f02c32a9b76..466ab3646efb0a 100644 --- a/src/tests/test_utils/functional_test_utils/layer_tests_summary/run_parallel.py +++ b/src/tests/test_utils/functional_test_utils/layer_tests_summary/run_parallel.py @@ -279,15 +279,18 @@ def __get_test_list_by_runtime(self): with open(test_list_file_name) as test_list_file: test_suite = "" for test_name in test_list_file.read().split('\n'): + if "Running main() from" in test_name: + continue + if not ' ' in test_name: + test_suite = test_name + continue pos = test_name.find('#') - if pos > 0: - real_test_name = test_suite + test_name[2:pos-2] + if pos > 0 or test_suite != "": + real_test_name = test_suite + (test_name[2:pos-2] if pos > 0 else test_name[2:]) if constants.DISABLED_PREFIX in real_test_name: self._disabled_tests.append(real_test_name) else: test_list.append(f'"{self.__replace_restricted_symbols(real_test_name)}":') - else: - test_suite = test_name test_list_file.close() os.remove(test_list_file_name) logger.info(f"Len test_list_runtime (without disabled tests): {len(test_list)}") diff --git a/src/tests/test_utils/functional_test_utils/layer_tests_summary/utils/constants.py b/src/tests/test_utils/functional_test_utils/layer_tests_summary/utils/constants.py index 2a503977c7091f..a5cef0ce3ebf9f 100644 --- a/src/tests/test_utils/functional_test_utils/layer_tests_summary/utils/constants.py +++ b/src/tests/test_utils/functional_test_utils/layer_tests_summary/utils/constants.py @@ -18,6 +18,7 @@ REF_COEF = "[ CONFORMANCE ] Influence coefficient: " IS_WIN = "windows" in platform or "win32" in platform +IS_MACOS = "darwin" in platform OS_SCRIPT_EXT = ".bat" if IS_WIN else "" OS_BIN_FILE_EXT = ".exe" if IS_WIN else "" diff --git a/src/tests/test_utils/functional_test_utils/layer_tests_summary/utils/file_utils.py b/src/tests/test_utils/functional_test_utils/layer_tests_summary/utils/file_utils.py index 002d7b91a7751b..731ff63c6e7a88 100644 --- a/src/tests/test_utils/functional_test_utils/layer_tests_summary/utils/file_utils.py +++ b/src/tests/test_utils/functional_test_utils/layer_tests_summary/utils/file_utils.py @@ -71,7 +71,8 @@ def unzip_archieve(zip_path: os.path, dst_path: os.path): def find_latest_dir(in_dir: Path, pattern_list = list()): get_latest_dir = lambda path: sorted(Path(path).iterdir(), key=os.path.getmtime) entities = get_latest_dir(in_dir) - entities.reverse() + if not constants.IS_MACOS: + entities.reverse() for entity in entities: if entity.is_dir():