alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ci_pytest_7.x' into 'master'

Browse Source 
ci: make pytest build script compatible with pytest 7.x

See merge request espressif/esp-idf!17032
This commit is contained in:
Ivan Grokhotkov 2022-02-05 09:06:09 +00:00
commit 3441dd1e98
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/ci/idf_ci_utils.py
View File

@ -105,6 +105,11 @@ def get_pytest_dirs(folder: str) -> List[str]:
raise RuntimeError('pytest collection failed')
sys.stdout.flush() # print instantly
test_file_paths = set(node.fspath for node in collector.nodes)
try:
test_file_paths = set(node.path for node in collector.nodes)
except AttributeError:
# pytest 6.x
test_file_paths = set(node.fspath for node in collector.nodes)
return [os.path.dirname(file) for file in test_file_paths]