From 0e318fb6fc1cc8c54f3089fcf4bc95ac5caab339 Mon Sep 17 00:00:00 2001 From: Roland Dobai Date: Thu, 22 Feb 2024 07:03:08 +0100 Subject: [PATCH] fix(ci): Change expected message in tests after dependency checker update This should fix the tests after 5f798eb78b20a3dfdc2e5c6c1ce9a2215def9a9c has changed the error message. --- .gitlab/ci/rules.yml | 2 ++ tools/ci/exclude_check_tools_files.txt | 1 - tools/test_idf_tools/test_idf_tools_python_env.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index d574bdf88c..118d85a3dc 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -114,6 +114,8 @@ - "tools/split_paths_by_spaces.py" + - "tools/check_python_dependencies.py" + .patterns-docker: &patterns-docker - "tools/docker/**/*" diff --git a/tools/ci/exclude_check_tools_files.txt b/tools/ci/exclude_check_tools_files.txt index bfca261fb2..8fa184a3c3 100644 --- a/tools/ci/exclude_check_tools_files.txt +++ b/tools/ci/exclude_check_tools_files.txt @@ -7,7 +7,6 @@ tools/ci/check_copyright_config.yaml tools/ci/get_all_test_results.py tools/gdb_panic_server.py tools/check_term.py -tools/check_python_dependencies.py tools/python_version_checker.py tools/generate_debug_prefix_map.py tools/ci/astyle-rules.yml diff --git a/tools/test_idf_tools/test_idf_tools_python_env.py b/tools/test_idf_tools/test_idf_tools_python_env.py index 2747722aa9..bbd769b343 100644 --- a/tools/test_idf_tools/test_idf_tools_python_env.py +++ b/tools/test_idf_tools/test_idf_tools_python_env.py @@ -29,7 +29,7 @@ PYTHON_DIR = os.path.join(TOOLS_DIR, 'python_env') PYTHON_DIR_BACKUP = tempfile.mkdtemp() PYTHON_BINARY = os.path.join('Scripts', 'python.exe') if sys.platform == 'win32' else os.path.join('bin', 'python') REQ_SATISFIED = 'Python requirements are satisfied' -REQ_MISSING = "{}' - was not found and is required by the application" +REQ_MISSING = 'Package was not found and is required by the application: {}' REQ_CORE = '- {}'.format(os.path.join(IDF_PATH, 'tools', 'requirements', 'requirements.core.txt')) REQ_GDBGUI = '- {}'.format(os.path.join(IDF_PATH, 'tools', 'requirements', 'requirements.gdbgui.txt')) CONSTR = 'Constraint file: {}'.format(os.path.join(TOOLS_DIR, 'espidf.constraints'))