diff --git a/.gitignore b/.gitignore index 6e1a94fe68..f6649933a3 100644 --- a/.gitignore +++ b/.gitignore @@ -96,4 +96,6 @@ dependencies.lock managed_components # pytest log +pytest-embedded/ +# legacy one pytest_embedded_log/ diff --git a/.gitlab/ci/host-test.yml b/.gitlab/ci/host-test.yml index b939a57c55..b78bb7a7d8 100644 --- a/.gitlab/ci/host-test.yml +++ b/.gitlab/ci/host-test.yml @@ -307,7 +307,7 @@ test_pytest_qemu: when: always paths: - XUNIT_RESULT.xml - - pytest_embedded_log/ + - pytest-embedded/ reports: junit: XUNIT_RESULT.xml expire_in: 1 week @@ -332,7 +332,7 @@ test_pytest_linux: when: always paths: - XUNIT_RESULT.xml - - pytest_embedded_log/ + - pytest-embedded/ reports: junit: XUNIT_RESULT.xml expire_in: 1 week diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml index f0a30a932f..a02947c429 100644 --- a/.gitlab/ci/target-test.yml +++ b/.gitlab/ci/target-test.yml @@ -19,7 +19,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 70acd73394..06d273115c 100644 --- a/pytest.ini +++ b/pytest.ini @@ -13,6 +13,7 @@ addopts = --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 c8335a738d..d486ec3e2f 100644 --- a/tools/ci/idf_ci_utils.py +++ b/tools/ci/idf_ci_utils.py @@ -1,7 +1,7 @@ # internal use only for CI # some CI related util functions # -# SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD +# SPDX-FileCopyrightText: 2020-2024 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Apache-2.0 # import contextlib @@ -13,7 +13,12 @@ import sys from contextlib import redirect_stdout from dataclasses import dataclass from pathlib import Path -from typing import TYPE_CHECKING, Any, List, Optional, Set, Union +from typing import Any +from typing import List +from typing import Optional +from typing import Set +from typing import TYPE_CHECKING +from typing import Union try: from idf_py_actions.constants import PREVIEW_TARGETS, SUPPORTED_TARGETS @@ -25,7 +30,7 @@ except ImportError: if TYPE_CHECKING: from _pytest.python import Function -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]: