Skip to content

Commit bc48780

Browse files
committed
tests(conftest): Only prepare doctest fixtures on DoctestItems
1 parent f10f776 commit bc48780

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

libtmux/conftest.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import pytest
66

7+
from _pytest.doctest import DoctestItem
78
from _pytest.fixtures import SubRequest
89
from _pytest.monkeypatch import MonkeyPatch
910

@@ -105,15 +106,12 @@ def session(request: SubRequest, server: Server) -> "Session":
105106

106107
@pytest.fixture(autouse=True)
107108
def add_doctest_fixtures(
109+
request: SubRequest,
108110
doctest_namespace: t.Dict[str, t.Any],
109-
# usefixtures / autouse
110-
clear_env: t.Any,
111-
# Normal fixtures
112-
server: "Server",
113-
session: "Session",
114111
) -> None:
115-
if which("tmux"):
116-
doctest_namespace["server"] = server
112+
if isinstance(request._pyfuncitem, DoctestItem) and which("tmux"):
113+
doctest_namespace["server"] = request.getfixturevalue("server")
114+
session: "Session" = request.getfixturevalue("session")
117115
doctest_namespace["session"] = session
118116
doctest_namespace["window"] = session.attached_window
119117
doctest_namespace["pane"] = session.attached_pane

0 commit comments

Comments
 (0)