Skip to content

A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.

tests: DRY up text fixtures/helpers (#8648)

Myles Scolnick99716472e274
diff --git a/tests/_ai/llm/test_impl.py b/tests/_ai/llm/test_impl.py
index 02aedb0b6c..1a4cbdee22 100644
--- a/tests/_ai/llm/test_impl.py
+++ b/tests/_ai/llm/test_impl.py
@@ -25,44 +25,40 @@ if TYPE_CHECKING:
from pydantic_ai.settings import ModelSettings
-def mock_openai_client():
- """Fixture for mocking the OpenAI client."""
- with patch("openai.OpenAI") as mock_openai_class:
- mock_client = MagicMock()
- mock_openai_class.return_value = mock_client
-
- # Setup the streaming response structure
- mock_chunk = MagicMock()
- mock_choice = MagicMock()
- mock_delta = MagicMock()
- mock_delta.content = "Test response"
- mock_choice.delta = mock_delta
- mock_chunk.choices = [mock_choice]
-
- # Return an iterable for streaming
- mock_client.chat.completions.create.return_value = [mock_chunk]
-
- yield mock_client, mock_openai_class
-
-
-def mock_groq_client():
- """Fixture for mocking the Groq client."""
- with patch("groq.Groq") as mock_groq_class:
- mock_client = MagicMock()
- mock_groq_class.return_value = mock_client
-
- # Setup the response structure
- mock_response = MagicMock()
- mock_choice = MagicMock()
- mock_message = MagicMock()
- mock_message.content = "Test response"
- mock_choice.message = mock_message
- mock_response.choices = [mock_choice]
- mock_client.chat.completions.create.return_value = mock_response
-
- yield mock_client, mock_groq_class
+def _make_chat_client_fixture(patch_path: str, *, streaming: bool = False):
+ @pytest.fixture
+ def _fixture():
+ with patch(patch_path) as mock_class:
+ mock_client = MagicMock()
+ mock_class.return_value = mock_client
+ if streaming:
+ mock_chunk = MagicMock()
+ mock_choice = MagicMock()
+ mock_delta = MagicMock()
+ mock_delta.content = "Test response"
+ mock_choice.delta = mock_delta
+ mock_chunk.choices = [mock_choice]
+ mock_client.chat.completions.create.return_value = [mock_chunk]
+ else:
+ mock_response = MagicMock()
+ mock_choice = MagicMock()
+ mock_message = MagicMock()
+ mock_message.content = "Test response"
+ mock_choice.message = mock_message
+ mock_response.choices = [mock_choice]
+ mock_client.chat.completions.create.return_value = (
+ mock_response
+ )
+ yield mock_client, mock_class
+
+ return _fixture
+
+
+mock_openai_client = _make_chat_client_fixture("openai.OpenAI", streaming=True)
+mock_groq_client = _make_chat_client_fixture("groq.Groq")
+mock_azure_openai_client = _make_chat_client_fixture(
+ "openai.AzureOpenAI", streaming=True
+)
@pytest.fixture
@@ -97,30 +93,9 @@ def mock_google_client():
yield mock_client, mock_google_class
-def mock_azure_openai_client():
- """Fixture for mocking the Azure OpenAI client."""
- with patch("openai.AzureOpenAI") as mock_azure_openai_class:
- mock_client = MagicMock()
- mock_azure_openai_class.return_value = mock_client
-
- # Setup the streaming response structure
- mock_chunk = MagicMock()
- mock_choice = MagicMock()
- mock_delta = MagicMock()
- mock_delta.content = "Test response"
- mock_choice.delta = mock_delta
- mock_chunk.choices = [mock_choice]
-
- # Return an iterable for streaming
- mock_client.chat.completions.create.return_value = [mock_chunk]
-
- yield mock_client, mock_azure_openai_class
-
-
@pytest.fixture
def mock_litellm_completion():
- """Fixture for mocking the OpenAI client."""
+ """Fixture for mocking the litellm completion function."""
with patch("litellm.completion") as mock_litellm_completion:
# Setup the response structure
mock_response = MagicMock()
diff --git a/tests/_server/api/endpoints/test_auto_instantiate.py b/tests/_server/api/endpoints/test_auto_instantiate.py
index 5b46024e98..a2c7afe441 100644
--- a/tests/_server/api/endpoints/test_auto_instantiate.py
+++ b/tests/_server/api/endpoints/test_auto_instantiate.py
@@ -74,7 +74,7 @@ class TestAutoInstantiateRunMode:
self, client: TestClient
) -> None:
"""In run mode, auto_instantiated should be True."""
- from tests._server.conftest import get_session_manager
+ from tests._server.mocks import get_session_manager
session_manager = get_session_manager(client)
session_id = "test-run-mode"
@@ -99,7 +99,7 @@ class TestAutoInstantiateRunMode:
The @requires("edit") decorator checks for edit permissions, and in run mode
users only have "read" permissions, so they get 401 Unauthorized.
"""
- from tests._server.conftest import get_session_manager
+ from tests._server.mocks import get_session_manager
session_manager = get_session_manager(client)
session_id = "test-instantiate-run"
diff --git a/tests/_server/api/endpoints/test_execution.py b/tests/_server/api/endpoints/test_execution.py
index 33b1b558f6..1b24434213 100644
--- a/tests/_server/api/endpoints/test_execution.py
+++ b/tests/_server/api/endpoints/test_execution.py
@@ -10,8 +10,12 @@ import pytest
from marimo._types.ids import CellId_t, SessionId
from marimo._utils.lists import first
-from tests._server.conftest import get_session_manager
-from tests._server.mocks import token_header, with_read_session, with_session
+from tests._server.mocks import (
+ get_session_manager,
+ token_header,
+ with_read_session,
+ with_session,
+)
if TYPE_CHECKING:
from starlette.testclient import TestClient
diff --git a/tests/_server/api/endpoints/test_export.py b/tests/_server/api/endpoints/test_export.py
index 0b5fffb964..176f45e455 100644
--- a/tests/_server/api/endpoints/test_export.py
+++ b/tests/_server/api/endpoints/test_export.py
@@ -18,8 +18,8 @@ from marimo._messaging.notification import CellNotification
from marimo._output.utils import uri_encode_component
from marimo._types.ids import CellId_t, SessionId
from marimo._utils.platform import is_windows
-from tests._server.conftest import get_session_manager
from tests._server.mocks import (
+ get_session_manager,
token_header,
with_read_session,
with_session,
diff --git a/tests/_server/api/endpoints/test_files.py b/tests/_server/api/endpoints/test_files.py
index c3368949c2..ddc75ccdcc 100644
--- a/tests/_server/api/endpoints/test_files.py
+++ b/tests/_server/api/endpoints/test_files.py
@@ -13,8 +13,8 @@ import msgspec
import pytest
from marimo._utils.platform import is_windows
-from tests._server.conftest import get_session_manager
from tests._server.mocks import (
+ get_session_manager,
token_header,
with_read_session,
with_session,
diff --git a/tests/_server/api/endpoints/test_home.py b/tests/_server/api/endpoints/test_home.py
index b3868a116e..01d97663a7 100644
--- a/tests/_server/api/endpoints/test_home.py
+++ b/tests/_server/api/endpoints/test_home.py
@@ -14,8 +14,7 @@ import pytest
from marimo._server.file_router import AppFileRouter
from marimo._server.models.home import MarimoFile
from marimo._session.model import SessionMode
-from tests._server.conftest import get_session_manager
-from tests._server.mocks import token_header, with_session
+from tests._server.mocks import get_session_manager, token_header, with_session
if TYPE_CHECKING:
from starlette.testclient import TestClient
diff --git a/tests/_server/api/endpoints/test_kiosk.py b/tests/_server/api/endpoints/test_kiosk.py
index a28583248e..5787a94890 100644
--- a/tests/_server/api/endpoints/test_kiosk.py
+++ b/tests/_server/api/endpoints/test_kiosk.py
@@ -1,73 +1,26 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING, Any
import pytest
-from marimo._messaging.msgspec_encoder import asdict
-from marimo._messaging.notification import (
- KernelCapabilitiesNotification,
- KernelReadyNotification,
+from tests._server.api.endpoints.ws_helpers import (
+ HEADERS as _HEADERS,
+ assert_kernel_ready_response,
+ create_response,
)
-from marimo._utils.parse_dataclass import parse_raw
-from tests._server.mocks import token_header
if TYPE_CHECKING:
from starlette.testclient import TestClient, WebSocketTestSession
-def create_response(
- partial_response: dict[str, Any],
-) -> dict[str, Any]:
- response: dict[str, Any] = {
- "cell_ids": ["Hbol"],
- "codes": ["import marimo as mo"],
- "names": ["__"],
- "layout": None,
- "resumed": False,
- "ui_values": {},
- "last_executed_code": {},
- "last_execution_time": {},
- "kiosk": False,
- "configs": [{"disabled": False, "hide_code": False}],
- "app_config": {"width": "full"},
- "capabilities": asdict(KernelCapabilitiesNotification()),
- }
- response.update(partial_response)
- return response
-
-
HEADERS = {
- **token_header("fake-token"),
+ **_HEADERS,
"Marimo-Session-Id": "123",
}
-def assert_kernel_ready_response(
- raw_data: dict[str, Any], response: Optional[dict[str, Any]] = None
-) -> None:
- if response is None:
- response = create_response({})
- data = parse_raw(raw_data["data"], KernelReadyNotification)
- expected = parse_raw(response, KernelReadyNotification)
- assert data.cell_ids == expected.cell_ids
- assert data.codes == expected.codes
- assert data.names == expected.names
- assert data.layout == expected.layout
- assert data.resumed == expected.resumed
- assert data.ui_values == expected.ui_values
- assert data.configs == expected.configs
- assert data.app_config == expected.app_config
- assert data.kiosk == expected.kiosk
- assert data.capabilities == expected.capabilities
-
-
-def assert_parse_ready_response(raw_data: dict[str, Any]) -> None:
- data = parse_raw(raw_data["data"], KernelReadyNotification)
- assert data is not None
-
-
@pytest.mark.skip
async def test_connect_kiosk_with_session(client: TestClient) -> None:
# Create the first session
diff --git a/tests/_server/api/endpoints/test_resume_session.py b/tests/_server/api/endpoints/test_resume_session.py
index 9cf324a2de..27d4584b49 100644
--- a/tests/_server/api/endpoints/test_resume_session.py
+++ b/tests/_server/api/endpoints/test_resume_session.py
@@ -7,73 +7,24 @@ from contextlib import contextmanager
from typing import TYPE_CHECKING, Any, Optional
from marimo._config.manager import UserConfigManager
-from marimo._messaging.msgspec_encoder import asdict
from marimo._messaging.notification import (
CellNotification,
- KernelCapabilitiesNotification,
KernelReadyNotification,
)
from marimo._session import Session
from marimo._types.ids import SessionId
from marimo._utils.parse_dataclass import parse_raw
-from tests._server.conftest import get_session_manager
-from tests._server.mocks import token_header
+from tests._server.api.endpoints.ws_helpers import (
+ assert_kernel_ready_response,
+ create_response,
+ headers,
+)
+from tests._server.mocks import get_session_manager
if TYPE_CHECKING:
from starlette.testclient import TestClient
-def create_response(
- partial_response: dict[str, Any],
-) -> dict[str, Any]:
- response: dict[str, Any] = {
- "cell_ids": ["Hbol"],
- "codes": ["import marimo as mo"],
- "names": ["__"],
- "layout": None,
- "resumed": False,
- "ui_values": {},
- "last_executed_code": {},
- "last_execution_time": {},
- "kiosk": False,
- "configs": [{"disabled": False, "hide_code": False}],
- "app_config": {"width": "full"},
- "capabilities": asdict(KernelCapabilitiesNotification()),
- }
- response.update(partial_response)
- return response
-
-
-def headers(session_id: str) -> dict[str, str]:
- return {
- "Marimo-Session-Id": session_id,
- **token_header("fake-token"),
- }
-
-
-HEADERS = {
- **token_header("fake-token"),
-}
-
-
-def assert_kernel_ready_response(
- raw_data: dict[str, Any], response: dict[str, Any]
-) -> None:
- data = parse_raw(raw_data["data"], KernelReadyNotification)
- print(response)
- expected = parse_raw(response, KernelReadyNotification)
- assert data.cell_ids == expected.cell_ids
- assert data.codes == expected.codes
- assert data.names == expected.names
- assert data.layout == expected.layout
- assert data.resumed == expected.resumed
- assert data.ui_values == expected.ui_values
- assert data.configs == expected.configs
- assert data.app_config == expected.app_config
- assert data.last_execution_time == expected.last_execution_time
- assert data.capabilities == expected.capabilities
-
-
def get_session(
client: TestClient, session_id: SessionId
) -> Optional[Session]:
diff --git a/tests/_server/api/endpoints/test_terminal.py b/tests/_server/api/endpoints/test_terminal.py
index a44100c041..febcd3e586 100644
--- a/tests/_server/api/endpoints/test_terminal.py
+++ b/tests/_server/api/endpoints/test_terminal.py
@@ -22,7 +22,7 @@ from marimo._server.api.endpoints.terminal import (
)
from marimo._server.session_manager import SessionManager
from marimo._session.model import SessionMode
-from tests._server.conftest import get_session_manager
+from tests._server.mocks import get_session_manager
if TYPE_CHECKING:
from starlette.testclient import TestClient
diff --git a/tests/_server/api/endpoints/test_ws.py b/tests/_server/api/endpoints/test_ws.py
index 65f4f27f92..bd809441c3 100644
--- a/tests/_server/api/endpoints/test_ws.py
+++ b/tests/_server/api/endpoints/test_ws.py
@@ -4,7 +4,7 @@ from __future__ import annotations
import asyncio
from contextlib import contextmanager
from pathlib import Path
-from typing import TYPE_CHECKING, Any, Callable, Optional
+from typing import TYPE_CHECKING, Any, Callable
from unittest.mock import MagicMock, patch
import pytest
@@ -12,11 +12,7 @@ from starlette.websockets import WebSocketDisconnect
from marimo._config.config import ExperimentalConfig
from marimo._config.manager import UserConfigManager
-from marimo._messaging.msgspec_encoder import asdict
-from marimo._messaging.notification import (
- KernelCapabilitiesNotification,
- KernelReadyNotification,
-)
+from marimo._messaging.notification import KernelReadyNotification
from marimo._server.api.endpoints.ws.ws_connection_validator import (
ConnectionParams,
)
@@ -24,50 +20,20 @@ from marimo._server.codes import WebSocketCodes
from marimo._server.session_manager import SessionManager
from marimo._session.model import ConnectionState, SessionMode
from marimo._utils.parse_dataclass import parse_raw
-from tests._server.conftest import (
- get_kernel_tasks,
- get_session_manager,
- get_user_config_manager,
+from tests._server.api.endpoints.ws_helpers import (
+ HEADERS,
+ assert_kernel_ready_response,
+ assert_parse_ready_response,
+ create_response,
+ headers,
)
-from tests._server.mocks import token_header
+from tests._server.conftest import get_kernel_tasks, get_user_config_manager
+from tests._server.mocks import get_session_manager
if TYPE_CHECKING:
from starlette.testclient import TestClient, WebSocketTestSession
-def create_response(
- partial_response: dict[str, Any],
-) -> dict[str, Any]:
- response: dict[str, Any] = {
- "cell_ids": ["Hbol"],
- "codes": ["import marimo as mo"],
- "names": ["__"],
- "layout": None,
- "resumed": False,
- "ui_values": {},
- "last_executed_code": {},
- "last_execution_time": {},
- "kiosk": False,
- "configs": [{"disabled": False, "hide_code": False}],
- "app_config": {"width": "full"},
- "capabilities": asdict(KernelCapabilitiesNotification()),
- }
- response.update(partial_response)
- return response
-
-
-HEADERS = {
- **token_header("fake-token"),
-}
-
-
-def headers(session_id: str) -> dict[str, str]:
- return {
- "Marimo-Session-Id": session_id,
- **token_header("fake-token"),
- }
-
-
def _create_ws_url(session_id: str) -> str:
return f"/ws?session_id={session_id}&access_token=fake-token"
@@ -76,30 +42,6 @@ WS_URL = _create_ws_url("123")
OTHER_WS_URL = _create_ws_url("456")
-def assert_kernel_ready_response(
- raw_data: dict[str, Any], response: Optional[dict[str, Any]] = None
-) -> None:
- if response is None:
- response = create_response({})
- data = parse_raw(raw_data["data"], KernelReadyNotification)
- expected = parse_raw(response, KernelReadyNotification)
- assert data.cell_ids == expected.cell_ids
- assert data.codes == expected.codes
- assert data.names == expected.names
- assert data.layout == expected.layout
- assert data.resumed == expected.resumed
- assert data.ui_values == expected.ui_values
- assert data.configs == expected.configs
- assert data.app_config == expected.app_config
- assert data.kiosk == expected.kiosk
- assert data.capabilities == expected.capabilities
-
-
-def assert_parse_ready_response(raw_data: dict[str, Any]) -> None:
- data = parse_raw(raw_data["data"], KernelReadyNotification)
- assert data is not None
-
-
def test_ws(client: TestClient) -> None:
with client.websocket_connect(WS_URL) as websocket:
data = websocket.receive_json()
diff --git a/tests/_server/api/endpoints/test_ws_rtc.py b/tests/_server/api/endpoints/test_ws_rtc.py
index b3d6496ecb..6059a36415 100644
--- a/tests/_server/api/endpoints/test_ws_rtc.py
+++ b/tests/_server/api/endpoints/test_ws_rtc.py
@@ -2,21 +2,20 @@ from __future__ import annotations
import asyncio
from contextlib import contextmanager
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING
import pytest
from starlette.websockets import WebSocketDisconnect
from marimo._config.manager import UserConfigManager
-from marimo._messaging.msgspec_encoder import asdict
-from marimo._messaging.notification import (
- KernelCapabilitiesNotification,
- KernelReadyNotification,
-)
from marimo._server.api.endpoints.ws_endpoint import DOC_MANAGER
-from marimo._utils.parse_dataclass import parse_raw
-from tests._server.conftest import get_session_manager, get_user_config_manager
-from tests._server.mocks import token_header
+from tests._server.api.endpoints.ws_helpers import (
+ assert_kernel_ready_response,
+ assert_parse_ready_response,
+ create_response,
+)
+from tests._server.conftest import get_user_config_manager
+from tests._server.mocks import get_session_manager
if TYPE_CHECKING:
from collections.abc import AsyncGenerator
@@ -24,63 +23,6 @@ if TYPE_CHECKING:
from starlette.testclient import TestClient
-def create_response(
- partial_response: dict[str, Any],
-) -> dict[str, Any]:
- response: dict[str, Any] = {
- "cell_ids": ["Hbol"],
- "codes": ["import marimo as mo"],
- "names": ["__"],
- "layout": None,
- "resumed": False,
- "ui_values": {},
- "last_executed_code": {},
- "last_execution_time": {},
- "kiosk": False,
- "configs": [{"disabled": False, "hide_code": False}],
- "app_config": {"width": "full"},
- "capabilities": asdict(KernelCapabilitiesNotification()),
- }
- response.update(partial_response)
- return response
-
-
-def headers(session_id: str) -> dict[str, str]:
- return {
- "Marimo-Session-Id": session_id,
- **token_header("fake-token"),
- }
-
-
-HEADERS = {
- **token_header("fake-token"),
-}
-
-
-def assert_kernel_ready_response(
- raw_data: dict[str, Any], response: Optional[dict[str, Any]] = None
-) -> None:
- if response is None:
- response = create_response({})
- data = parse_raw(raw_data["data"], KernelReadyNotification)
- expected = parse_raw(response, KernelReadyNotification)
- assert data.cell_ids == expected.cell_ids
- assert data.codes == expected.codes
- assert data.names == expected.names
- assert data.layout == expected.layout
- assert data.resumed == expected.resumed
- assert data.ui_values == expected.ui_values
- assert data.configs == expected.configs
- assert data.app_config == expected.app_config
- assert data.kiosk == expected.kiosk
- assert data.capabilities == expected.capabilities
-
-
-def assert_parse_ready_response(raw_data: dict[str, Any]) -> None:
- data = parse_raw(raw_data["data"], KernelReadyNotification)
- assert data is not None
-
-
@pytest.fixture # type: ignore
async def setup_loro_docs() -> AsyncGenerator[None, None]:
"""Setup and teardown for loro_docs tests"""
diff --git a/tests/_server/api/endpoints/ws_helpers.py b/tests/_server/api/endpoints/ws_helpers.py
new file mode 100644
index 0000000000..327b9f91d9
--- /dev/null
+++ b/tests/_server/api/endpoints/ws_helpers.py
@@ -0,0 +1,70 @@
+# Copyright 2026 Marimo. All rights reserved.
+from __future__ import annotations
+
+from typing import Any, Optional
+
+from marimo._messaging.msgspec_encoder import asdict
+from marimo._messaging.notification import (
+ KernelCapabilitiesNotification,
+ KernelReadyNotification,
+)
+from marimo._utils.parse_dataclass import parse_raw
+from tests._server.mocks import token_header
+
+
+def create_response(
+ partial_response: dict[str, Any],
+) -> dict[str, Any]:
+ response: dict[str, Any] = {
+ "cell_ids": ["Hbol"],
+ "codes": ["import marimo as mo"],
+ "names": ["__"],
+ "layout": None,
+ "resumed": False,
+ "ui_values": {},
+ "last_executed_code": {},
+ "last_execution_time": {},
+ "kiosk": False,
+ "configs": [{"disabled": False, "hide_code": False}],
+ "app_config": {"width": "full"},
+ "capabilities": asdict(KernelCapabilitiesNotification()),
+ }
+ response.update(partial_response)
+ return response
+
+
+HEADERS = {
+ **token_header("fake-token"),
+}
+
+
+def headers(session_id: str) -> dict[str, str]:
+ return {
+ "Marimo-Session-Id": session_id,
+ **token_header("fake-token"),
+ }
+
+
+def assert_kernel_ready_response(
+ raw_data: dict[str, Any], response: Optional[dict[str, Any]] = None
+) -> None:
+ if response is None:
+ response = create_response({})
+ data = parse_raw(raw_data["data"], KernelReadyNotification)
+ expected = parse_raw(response, KernelReadyNotification)
+ assert data.cell_ids == expected.cell_ids
+ assert data.codes == expected.codes
+ assert data.names == expected.names
+ assert data.layout == expected.layout
+ assert data.resumed == expected.resumed
+ assert data.ui_values == expected.ui_values
+ assert data.configs == expected.configs
+ assert data.app_config == expected.app_config
+ assert data.kiosk == expected.kiosk
+ assert data.last_execution_time == expected.last_execution_time
+ assert data.capabilities == expected.capabilities
+
+
+def assert_parse_ready_response(raw_data: dict[str, Any]) -> None:
+ data = parse_raw(raw_data["data"], KernelReadyNotification)
+ assert data is not None
diff --git a/tests/_server/conftest.py b/tests/_server/conftest.py
index 963e977d65..1307636a0a 100644
--- a/tests/_server/conftest.py
+++ b/tests/_server/conftest.py
@@ -20,9 +20,7 @@ from marimo._server.session_manager import SessionManager
from marimo._server.utils import initialize_asyncio
from marimo._session.queue import ProcessLike
from marimo._session.session import SessionImpl
-from marimo._session.state.session_view import SessionView
from tests._server.mocks import get_mock_session_manager
-from tests.utils import assert_serialize_roundtrip
if TYPE_CHECKING:
from collections.abc import Generator, Iterator
@@ -124,10 +122,6 @@ def client(user_config_manager: UserConfigManager) -> Iterator[TestClient]:
sys.modules["__main__"] = main
-def get_session_manager(client: TestClient) -> SessionManager:
- return client.app.state.session_manager # type: ignore
-
-
def get_session_config_manager(client: TestClient) -> UserConfigManager:
"""Assumes only one active session."""
sessions = list(
@@ -139,14 +133,3 @@ def get_session_config_manager(client: TestClient) -> UserConfigManager:
def get_user_config_manager(client: TestClient) -> UserConfigManager:
return client.app.state.config_manager # type: ignore
-
-
-def session_view() -> Generator[SessionView, None, None]:
- sv = SessionView()
-
- yield sv
-
- # Test all operations can be serialized/deserialized
- for operation in sv.notifications:
- assert_serialize_roundtrip(operation)
diff --git a/tests/_session/conftest.py b/tests/_session/conftest.py
deleted file mode 100644
index c3f1133482..0000000000
--- a/tests/_session/conftest.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2026 Marimo. All rights reserved.
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-import pytest
-
-from marimo._session.state.session_view import SessionView
-from tests.utils import assert_serialize_roundtrip
-
-if TYPE_CHECKING:
- from collections.abc import Generator
-
-
-def session_view() -> Generator[SessionView, None, None]:
- sv = SessionView()
-
- yield sv
-
- # Test all operations can be serialized/deserialized
- for operation in sv.notifications:
- assert_serialize_roundtrip(operation)
diff --git a/tests/conftest.py b/tests/conftest.py
index ac410602e9..14b6bb460c 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -43,6 +43,7 @@ from marimo._runtime.runtime import Kernel
from marimo._save.stubs.module_stub import ModuleStub
from marimo._server.utils import initialize_mimetypes
from marimo._session.model import SessionMode
+from marimo._session.state.session_view import SessionView
from marimo._types.ids import CellId_t
if TYPE_CHECKING:
@@ -302,85 +303,50 @@ def executing_kernel() -> Generator[Kernel, None, None]:
FIXTURE_DIR = Path(__file__).parent / "fixtures"
-def temp_marimo_file(tmp_path: Path) -> str:
- fixture_file = FIXTURE_DIR / "notebook.py"
- tmp_file = tmp_path / "test" / "notebook.py"
- tmp_file.parent.mkdir(parents=True, exist_ok=True)
- shutil.copy(fixture_file, tmp_file)
- return str(tmp_file)
-
-
-def temp_sandboxed_marimo_file(tmp_path: Path) -> str:
- fixture_file = FIXTURE_DIR / "notebook_sandboxed.py"
- tmp_file = tmp_path / "sandboxed" / "notebook.py"
- tmp_file.parent.mkdir(parents=True, exist_ok=True)
- shutil.copy(fixture_file, tmp_file)
- return str(tmp_file)
-
+def _make_temp_fixture(fixture_name: str, subdir: str):
+ @pytest.fixture
+ def _fixture(tmp_path: Path) -> str:
+ fixture_file = FIXTURE_DIR / fixture_name
+ tmp_file = tmp_path / subdir / fixture_name.split("/")[-1]
+ tmp_file.parent.mkdir(parents=True, exist_ok=True)
+ shutil.copy(fixture_file, tmp_file)
+ return str(tmp_file)
-def temp_async_marimo_file(tmp_path: Path) -> str:
- fixture_file = FIXTURE_DIR / "notebook_async.py"
- tmp_file = tmp_path / "async" / "notebook.py"
- tmp_file.parent.mkdir(parents=True, exist_ok=True)
- shutil.copy(fixture_file, tmp_file)
- return str(tmp_file)
+ return _fixture
-def temp_unparsable_marimo_file(tmp_path: Path) -> str:
- fixture_file = FIXTURE_DIR / "notebook_unparsable.py"
- tmp_file = tmp_path / "unparsable" / "notebook.py"
- tmp_file.parent.mkdir(parents=True, exist_ok=True)
- shutil.copy(fixture_file, tmp_file)
- return str(tmp_file)
-
-
-def temp_marimo_file_with_md(tmp_path: Path) -> str:
- fixture_file = FIXTURE_DIR / "notebook_with_md.py"
- tmp_file = tmp_path / "with_md" / "notebook.py"
- tmp_file.parent.mkdir(parents=True, exist_ok=True)
- shutil.copy(fixture_file, tmp_file)
- return str(tmp_file)
-
-
-def temp_marimo_file_with_media(tmp_path: Path) -> str:
- fixture_file = FIXTURE_DIR / "notebook_with_media.py"
- tmp_file = tmp_path / "with_media" / "notebook.py"
- tmp_file.parent.mkdir(parents=True, exist_ok=True)
- shutil.copy(fixture_file, tmp_file)
- return str(tmp_file)
+temp_marimo_file = _make_temp_fixture("notebook.py", "test")
+temp_sandboxed_marimo_file = _make_temp_fixture(
+ "notebook_sandboxed.py", "sandboxed"
+)
+temp_async_marimo_file = _make_temp_fixture("notebook_async.py", "async")
+temp_unparsable_marimo_file = _make_temp_fixture(
+ "notebook_unparsable.py", "unparsable"
+)
+temp_marimo_file_with_md = _make_temp_fixture("notebook_with_md.py", "with_md")
+temp_marimo_file_with_media = _make_temp_fixture(
+ "notebook_with_media.py", "with_media"
+)
+temp_md_marimo_file = _make_temp_fixture("notebook.md", "with_md")
+temp_marimo_file_with_errors = _make_temp_fixture(
+ "notebook_with_errors.py", "with_errors"
+)
+temp_marimo_file_with_multiple_definitions = _make_temp_fixture(
+ "notebook_with_multiple_definitions.py", "with_multiple_definitions"
+)
@pytest.fixture
-def temp_md_marimo_file(tmp_path: Path) -> str:
- fixture_file = FIXTURE_DIR / "notebook.md"
- tmp_file = tmp_path / "with_md" / "notebook.md"
- tmp_file.parent.mkdir(parents=True, exist_ok=True)
- shutil.copy(fixture_file, tmp_file)
- return str(tmp_file)
+def session_view() -> Generator[SessionView, None, None]:
+ from tests.utils import assert_serialize_roundtrip
+ sv = SessionView()
-def temp_marimo_file_with_errors(tmp_path: Path) -> str:
- fixture_file = FIXTURE_DIR / "notebook_with_errors.py"
- tmp_file = tmp_path / "with_errors" / "notebook.py"
- tmp_file.parent.mkdir(parents=True, exist_ok=True)
- shutil.copy(fixture_file, tmp_file)
- return str(tmp_file)
+ yield sv
-
-def temp_marimo_file_with_multiple_definitions(tmp_path: Path) -> str:
- fixture_file = FIXTURE_DIR / "notebook_with_multiple_definitions.py"
- tmp_file = tmp_path / "with_multiple_definitions" / "notebook.py"
- tmp_file.parent.mkdir(parents=True, exist_ok=True)
- shutil.copy(fixture_file, tmp_file)
- return str(tmp_file)
+ # Test all operations can be serialized/deserialized
+ for operation in sv.notifications:
+ assert_serialize_roundtrip(operation)
# Factory to create ExecuteCellCommands and abstract away cell ID