espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-05 05:34:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

ci(pytest): upgrade to 0.7.0

Browse Source
This commit is contained in:
Fu Hanxi
2022-04-25 17:26:29 +08:00
parent 4a7315b1b0
commit 5c997bd5dd
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -73,7 +73,7 @@ variables:
TEST_ENV_CONFIG_REPO: "https://gitlab-ci-token:${BOT_TOKEN}@${CI_SERVER_HOST}:${CI_SERVER_PORT}/qa/ci-test-runner-configs.git" TEST_ENV_CONFIG_REPO: "https://gitlab-ci-token:${BOT_TOKEN}@${CI_SERVER_HOST}:${CI_SERVER_PORT}/qa/ci-test-runner-configs.git"
CI_AUTO_TEST_SCRIPT_REPO_URL: "https://gitlab-ci-token:${BOT_TOKEN}@${CI_SERVER_HOST}:${CI_SERVER_PORT}/qa/auto_test_script.git" CI_AUTO_TEST_SCRIPT_REPO_URL: "https://gitlab-ci-token:${BOT_TOKEN}@${CI_SERVER_HOST}:${CI_SERVER_PORT}/qa/auto_test_script.git"
CI_AUTO_TEST_SCRIPT_REPO_BRANCH: "ci/v4.1" CI_AUTO_TEST_SCRIPT_REPO_BRANCH: "ci/v4.1"
PYTEST_EMBEDDED_VERSION: "0.6.0" PYTEST_EMBEDDED_VERSION: "0.7.0"
# cache python dependencies # cache python dependencies
PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"

8
conftest.py
View File

@@ -29,7 +29,7 @@ from _pytest.python import Function
from _pytest.reports import TestReport from _pytest.reports import TestReport
from _pytest.runner import CallInfo from _pytest.runner import CallInfo
from _pytest.terminal import TerminalReporter from _pytest.terminal import TerminalReporter
from pytest_embedded.plugin import apply_count, parse_configuration from pytest_embedded.plugin import multi_dut_argument, multi_dut_fixture
from pytest_embedded.utils import find_by_suffix from pytest_embedded.utils import find_by_suffix
SUPPORTED_TARGETS = ['esp32', 'esp32s2', 'esp32c3', 'esp32s3', 'esp32c2'] SUPPORTED_TARGETS = ['esp32', 'esp32s2', 'esp32c3', 'esp32s3', 'esp32c2']
@@ -75,7 +75,7 @@ def session_tempdir() -> str:
@pytest.fixture @pytest.fixture
@parse_configuration @multi_dut_argument
def config(request: FixtureRequest) -> str: def config(request: FixtureRequest) -> str:
return getattr(request, 'param', None) or DEFAULT_SDKCONFIG return getattr(request, 'param', None) or DEFAULT_SDKCONFIG
@@ -91,7 +91,7 @@ def test_case_name(request: FixtureRequest, target: str, config: str) -> str:
@pytest.fixture @pytest.fixture
@apply_count @multi_dut_fixture
def build_dir(app_path: str, target: Optional[str], config: Optional[str]) -> str: def build_dir(app_path: str, target: Optional[str], config: Optional[str]) -> str:
""" """
Check local build dir with the following priority: Check local build dir with the following priority:
@@ -137,7 +137,7 @@ def build_dir(app_path: str, target: Optional[str], config: Optional[str]) -> st
@pytest.fixture(autouse=True) @pytest.fixture(autouse=True)
@apply_count @multi_dut_fixture
def junit_properties( def junit_properties(
test_case_name: str, record_xml_attribute: Callable[[str, object], None] test_case_name: str, record_xml_attribute: Callable[[str, object], None]
) -> None: ) -> None:

2
tools/test_apps/system/panic/conftest.py
View File

@@ -138,7 +138,7 @@ class PanicTestDut(IdfDut):
"""Extract the core dump from flash, run espcoredump on it""" """Extract the core dump from flash, run espcoredump on it"""
coredump_file_name = os.path.join(self.logdir, 'coredump_data.bin') coredump_file_name = os.path.join(self.logdir, 'coredump_data.bin')
logging.info('Writing flash binary core dump to %s', coredump_file_name) logging.info('Writing flash binary core dump to %s', coredump_file_name)
self.serial.dump_flash(coredump_file_name, partition='coredump') self.serial.dump_flash(partition='coredump', output=coredump_file_name)
output_file_name = os.path.join(self.logdir, 'coredump_flash_result.txt') output_file_name = os.path.join(self.logdir, 'coredump_flash_result.txt')
self._call_espcoredump( self._call_espcoredump(