feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

ci: apply new fix in pytest-embedded 1.10

Browse Source
This commit is contained in:
Fu Hanxi
2024-05-07 09:19:00 +02:00
parent f39f8d4a3f
commit 32c0b6c3f1
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
conftest.py
View File

@@ -15,7 +15,6 @@ import os
import re import re
import sys import sys
import xml.etree.ElementTree as ET import xml.etree.ElementTree as ET
from datetime import datetime
from fnmatch import fnmatch from fnmatch import fnmatch
from typing import Callable from typing import Callable
from typing import List from typing import List
@@ -183,7 +182,7 @@ def item_skip_targets(item: Item) -> List[str]:
# temp markers should always use keyword arguments `targets` and `reason` # temp markers should always use keyword arguments `targets` and `reason`
if not temp_marker.kwargs.get('targets') or not temp_marker.kwargs.get('reason'): if not temp_marker.kwargs.get('targets') or not temp_marker.kwargs.get('reason'):
raise ValueError( raise ValueError(
f'`{marker_name}` should always use keyword arguments `targets` and `reason`. ' f'`{marker_name}` should always use keyword arguments `targets` and `reason`. ' # noqa
f'For example: ' f'For example: '
f'`@pytest.mark.{marker_name}(targets=["esp32"], reason="IDF-xxxx, will fix it ASAP")`' f'`@pytest.mark.{marker_name}(targets=["esp32"], reason="IDF-xxxx, will fix it ASAP")`'
) )
@@ -227,15 +226,10 @@ def idf_path() -> str:
return os.path.dirname(__file__) return os.path.dirname(__file__)
@pytest.fixture(scope='session', autouse=True) @pytest.fixture(scope='session')
def session_tempdir() -> str: def session_root_logdir(idf_path: str) -> str:
_tmpdir = os.path.join( """Session scoped log dir for pytest-embedded"""
os.path.dirname(__file__), return idf_path
'pytest_embedded_log',
datetime.now().strftime('%Y-%m-%d_%H-%M-%S'),
)
os.makedirs(_tmpdir, exist_ok=True)
return _tmpdir
@pytest.fixture @pytest.fixture