Skip to content

Commit

Permalink
Merge branch 'fix/ci_test_cli_installer' into 'master'
Browse files Browse the repository at this point in the history
fix(ci): Change expected message in tests after dependency checker update

Closes IDFCI-2046

See merge request espressif/esp-idf!29183
  • Loading branch information
dobairoland committed Feb 22, 2024
2 parents b44387f + 0e318fb commit df39015
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .gitlab/ci/rules.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@

- "tools/split_paths_by_spaces.py"

- "tools/check_python_dependencies.py"

.patterns-docker: &patterns-docker
- "tools/docker/**/*"

Expand Down
1 change: 0 additions & 1 deletion tools/ci/exclude_check_tools_files.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/test_idf_tools/test_idf_tools_python_env.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
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'))
Expand Down

0 comments on commit df39015

Please sign in to comment.