diff --git a/.gitignore b/.gitignore index 7aa73b086b..8c38351657 100644 --- a/.gitignore +++ b/.gitignore @@ -100,6 +100,8 @@ dependencies.lock managed_components # pytest log +pytest-embedded/ +# legacy one pytest_embedded_log/ list_job_*.txt size_info.txt diff --git a/.gitlab/ci/host-test.yml b/.gitlab/ci/host-test.yml index 49ece921d7..10141c01ba 100644 --- a/.gitlab/ci/host-test.yml +++ b/.gitlab/ci/host-test.yml @@ -291,7 +291,7 @@ test_pytest_qemu: when: always paths: - XUNIT_RESULT.xml - - pytest_embedded_log/ + - pytest-embedded/ reports: junit: XUNIT_RESULT.xml expire_in: 1 week @@ -324,7 +324,7 @@ test_pytest_linux: when: always paths: - XUNIT_RESULT.xml - - pytest_embedded_log/ + - pytest-embedded/ - "**/build*/build_log.txt" reports: junit: XUNIT_RESULT.xml diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml index c9a77a7a06..f2519d8de8 100644 --- a/.gitlab/ci/target-test.yml +++ b/.gitlab/ci/target-test.yml @@ -21,7 +21,7 @@ when: always paths: - XUNIT_RESULT.xml - - pytest_embedded_log/ + - pytest-embedded/ reports: junit: XUNIT_RESULT.xml expire_in: 1 week diff --git a/pytest.ini b/pytest.ini index c9c0c43560..069d1cf415 100644 --- a/pytest.ini +++ b/pytest.ini @@ -12,6 +12,8 @@ addopts = --skip-check-coredump y --logfile-extension ".txt" --check-duplicates y + --ignore-glob */managed_components/* + --ignore pytest-embedded # ignore DeprecationWarning filterwarnings = diff --git a/tools/ci/idf_ci_utils.py b/tools/ci/idf_ci_utils.py index 1776766eaf..f58de750ba 100644 --- a/tools/ci/idf_ci_utils.py +++ b/tools/ci/idf_ci_utils.py @@ -1,16 +1,15 @@ -# SPDX-FileCopyrightText: 2020-2023 Espressif Systems (Shanghai) CO LTD +# SPDX-FileCopyrightText: 2020-2024 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Apache-2.0 - # internal use only for CI # some CI related util functions - import logging import os import subprocess import sys -from typing import Any, List +from typing import Any +from typing import List -IDF_PATH = os.path.abspath(os.getenv('IDF_PATH', os.path.join(os.path.dirname(__file__), '..', '..'))) +IDF_PATH: str = os.path.abspath(os.getenv('IDF_PATH', os.path.join(os.path.dirname(__file__), '..', '..'))) def get_submodule_dirs(full_path: bool = False) -> List[str]: