Skip to content

Commit 78ed5f3

Browse files
committed
tests: clarify platform detection and marker handling in conftest
Signed-off-by: Shizoqua <[email protected]> Signed-off-by: Lanre Shittu <[email protected]>
1 parent e72bc90 commit 78ed5f3

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

sdk/python/tests/conftest.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import tempfile
1919
from datetime import timedelta
2020
from multiprocessing import Process
21-
from sys import platform
21+
import sys
2222
from textwrap import dedent
2323
from typing import Any, Dict, List, Tuple, no_type_check
2424
from unittest import mock
@@ -126,7 +126,7 @@ def default_store(*args, **kwargs): # type: ignore[no-redef]
126126

127127

128128
def pytest_configure(config):
129-
if platform == "darwin" or platform.startswith("win"):
129+
if sys.platform == "darwin" or sys.platform.startswith("win"):
130130
multiprocessing.set_start_method("spawn", force=True)
131131
else:
132132
multiprocessing.set_start_method("fork")
@@ -287,7 +287,9 @@ def pytest_generate_tests(metafunc: pytest.Metafunc):
287287
if not _integration_test_deps_available:
288288
pytest.skip("Integration test dependencies are not available")
289289

290-
markers = {m.name: m for m in metafunc.definition.iter_markers()}
290+
own_markers = getattr(metafunc.definition, "own_markers", None)
291+
marker_iter = own_markers if own_markers is not None else metafunc.definition.iter_markers()
292+
markers = {m.name: m for m in marker_iter}
291293

292294
offline_stores = None
293295
if "universal_offline_stores" in markers:

0 commit comments

Comments
 (0)