alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-09-20 00:36:01 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'ci/fix_param_tests' into 'master'

Browse Source 
ci: different test case name with different params

See merge request espressif/esp-idf!26023
This commit is contained in:
Fu Hanxi 2023-10-05 00:15:03 +08:00
commit 0a4a31286c
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
conftest.py
View File

@ -19,6 +19,7 @@ import logging
import os import os
import re import re
import sys import sys
from copy import deepcopy
from datetime import datetime from datetime import datetime
from typing import Callable, Optional from typing import Callable, Optional
@ -87,7 +88,17 @@ def test_func_name(request: FixtureRequest) -> str:
@pytest.fixture @pytest.fixture
def test_case_name(request: FixtureRequest, target: str, config: str) -> str: def test_case_name(request: FixtureRequest, target: str, config: str) -> str:
is_qemu = request._pyfuncitem.get_closest_marker('qemu') is not None is_qemu = request._pyfuncitem.get_closest_marker('qemu') is not None
return format_case_id(target, config, request.node.originalname, is_qemu=is_qemu) # type: ignore if hasattr(request._pyfuncitem, 'callspec'):
params = deepcopy(request._pyfuncitem.callspec.params) # type: ignore
else:
params = {}
filtered_params = {}
for k, v in params.items():
if k not in request.session._fixturemanager._arg2fixturedefs: # type: ignore
filtered_params[k] = v # not fixture ones
return format_case_id(target, config, request.node.originalname, is_qemu=is_qemu, params=filtered_params) # type: ignore
@pytest.fixture @pytest.fixture

5
tools/ci/idf_pytest/utils.py
View File

@ -9,7 +9,7 @@ from xml.etree import ElementTree as ET
from .constants import TARGET_MARKERS from .constants import TARGET_MARKERS
def format_case_id(target: t.Optional[str], config: t.Optional[str], case: str, is_qemu: bool = False) -> str: def format_case_id(target: t.Optional[str], config: t.Optional[str], case: str, is_qemu: bool = False, params: t.Optional[dict] = None) -> str:
parts = [] parts = []
if target: if target:
parts.append((str(target) + '_qemu') if is_qemu else str(target)) parts.append((str(target) + '_qemu') if is_qemu else str(target))
@ -17,6 +17,9 @@ def format_case_id(target: t.Optional[str], config: t.Optional[str], case: str,
parts.append(str(config)) parts.append(str(config))
parts.append(case) parts.append(case)
if params:
parts.append(str(params))
return '.'.join(parts) return '.'.join(parts)