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.

test: isolate mocked clocks from shared modules (#11600)

Shahmir Varqha2a523451bf87
diff --git a/tests/_cli/test_cli.py b/tests/_cli/test_cli.py
index 9ffc9ab156..d8e01c61b7 100644
--- a/tests/_cli/test_cli.py
+++ b/tests/_cli/test_cli.py
@@ -20,6 +20,7 @@ import time
import urllib.error
import urllib.request
from pathlib import Path
+from types import SimpleNamespace
from typing import TYPE_CHECKING, Any
from unittest.mock import patch
@@ -154,7 +155,6 @@ def _try_fetch(
[(0, 0), (15, 0), (None, 0), (None, 5)],
)
def test_try_fetch_waits_for_startup(
- monkeypatch: pytest.MonkeyPatch,
ready_after: int | None,
request_duration: int,
) -> None:
@@ -174,9 +174,14 @@ def test_try_fetch_waits_for_startup(
raise urllib.error.URLError("Connection refused")
return response
- monkeypatch.setattr(time, "monotonic", lambda: elapsed)
- monkeypatch.setattr(time, "sleep", sleep)
- with patch("urllib.request.build_opener") as build_opener:
+ with (
+ patch.object(
+ sys.modules[__name__],
+ "time",
+ SimpleNamespace(monotonic=lambda: elapsed, sleep=sleep),
+ ),
+ patch("urllib.request.build_opener") as build_opener,
+ ):
response = build_opener.return_value.open.return_value
response.__enter__.return_value = response
response.read.return_value = b"ready"
diff --git a/tests/_cli/test_pair_forwarder.py b/tests/_cli/test_pair_forwarder.py
index a1ed360df1..cbc043eb60 100644
--- a/tests/_cli/test_pair_forwarder.py
+++ b/tests/_cli/test_pair_forwarder.py
@@ -11,6 +11,7 @@ import threading
import time
from dataclasses import replace
from pathlib import Path
+from types import SimpleNamespace
from typing import TYPE_CHECKING
from unittest.mock import Mock
@@ -211,7 +212,12 @@ def test_reconnect_wait_stops_when_harness_exits(
) -> None:
inbox = RecordingInbox()
monkeypatch.setattr(
- time, "sleep", lambda _: setattr(inbox, "living", False)
+ forwarder,
+ "time",
+ SimpleNamespace(
+ monotonic=time.monotonic,
+ sleep=lambda _: setattr(inbox, "living", False),
+ ),
)
assert not forwarder._wait_reconnect(inbox, 5)
diff --git a/tests/_plugins/stateless/status/test_progress.py b/tests/_plugins/stateless/status/test_progress.py
index 6c2a5bb0da..a5edf4910f 100644
--- a/tests/_plugins/stateless/status/test_progress.py
+++ b/tests/_plugins/stateless/status/test_progress.py
@@ -2,8 +2,9 @@
from __future__ import annotations
import time
+from types import SimpleNamespace
from typing import TYPE_CHECKING, Any
-from unittest.mock import patch
+from unittest.mock import Mock, patch
import pytest
@@ -20,6 +21,16 @@ if TYPE_CHECKING:
from collections.abc import AsyncIterator
+def frozen_progress_time(monkeypatch: pytest.MonkeyPatch) -> None:
+ now = time.time()
+ clock = SimpleNamespace(time=lambda: now)
+ monkeypatch.setattr(
+ "marimo._plugins.stateless.status._progress.time", clock
+ )
+ monkeypatch.setattr("marimo._utils.debounce.time", clock)
+
+
# Test initialization
def test_progress_init() -> None:
progress = _Progress(
@@ -84,7 +95,10 @@ def test_update_progress_slowly(mock_flush: Any) -> None:
)
# Mock sleep 120 seconds
- with patch("time.time", return_value=progress.start_time + 120):
+ with patch(
+ "marimo._plugins.stateless.status._progress.time",
+ Mock(time=Mock(return_value=progress.start_time + 120)),
+ ):
progress.update_progress(
increment=1, title="Updated", subtitle="Still Running Slowly"
)
@@ -142,43 +156,45 @@ def test_update_progress_closed(mock_flush: Any) -> None:
mock_flush.assert_called_once()
[email protected]("frozen_progress_time")
@pytest.mark.parametrize("kind", ["progress_bar", "spinner"])
@pytest.mark.parametrize("field", ["title", "subtitle"])
def test_rapid_text_updates(
mocked_kernel: MockedKernel, kind: str, field: str
) -> None:
with mocked_kernel.k._install_execution_context(cell_id=CellId_t("0")):
- with patch("time.time", return_value=time.time()):
- indicator: progress_bar[int] | spinner = (
- progress_bar(total=5) if kind == "progress_bar" else spinner()
- )
- with indicator as status:
- for text in ["first", "second", "third"]:
- status.update(
- title=text if field == "title" else None,
- subtitle=text if field == "subtitle" else None,
- )
- outputs = [
- msg.output.data
- for msg in mocked_kernel.stream.cell_notifications
- if msg.output is not None
- ]
- assert f"data-{field}='"third"'" in outputs[-1]
-
-
+ indicator: progress_bar[int] | spinner = (
+ progress_bar(total=5) if kind == "progress_bar" else spinner()
+ )
+ with indicator as status:
+ for text in ["first", "second", "third"]:
+ status.update(
+ title=text if field == "title" else None,
+ subtitle=text if field == "subtitle" else None,
+ )
+ outputs = [
+ msg.output.data
+ for msg in mocked_kernel.stream.cell_notifications
+ if msg.output is not None
+ ]
+ assert f"data-{field}='"third"'" in outputs[-1]
+
+
[email protected]("frozen_progress_time")
@pytest.mark.parametrize(
("title", "subtitle"), [(None, None), ("fixed", None), (None, "fixed")]
)
@patch("marimo._runtime.output._output.flush")
def test_numeric_updates_remain_rate_limited(
- mock_flush: Any, title: str | None, subtitle: str | None
+ mock_flush: Mock,
+ title: str | None,
+ subtitle: str | None,
) -> None:
- with patch("time.time", return_value=time.time()):
- with progress_bar(total=100, title=title, subtitle=subtitle) as bar:
- bar.update(title=title, subtitle=subtitle)
- mock_flush.reset_mock()
- bar.update(title=title, subtitle=subtitle)
- mock_flush.assert_not_called()
+ with progress_bar(total=100, title=title, subtitle=subtitle) as bar:
+ bar.update(title=title, subtitle=subtitle)
+ mock_flush.reset_mock()
+ bar.update(title=title, subtitle=subtitle)
+ mock_flush.assert_not_called()
def test_spinner_without_context():
diff --git a/tests/_runtime/test_complete.py b/tests/_runtime/test_complete.py
index e0118189f3..3b2a985175 100644
--- a/tests/_runtime/test_complete.py
+++ b/tests/_runtime/test_complete.py
@@ -5,7 +5,7 @@ import threading
import time
from collections.abc import Mapping
from inspect import signature
-from types import ModuleType
+from types import ModuleType, SimpleNamespace
from typing import Any
from unittest import mock
@@ -1001,8 +1001,8 @@ def test_get_completion_options_bails_out_when_timeout_elapsed() -> None:
times = iter([0.0, 0.0, 10.0, 10.0, 10.0, 10.0, 10.0, 10.0, 10.0, 10.0])
with mock.patch(
- "marimo._runtime.complete.time.monotonic",
- side_effect=lambda: next(times, original_monotonic()),
+ "marimo._runtime.complete.time",
+ SimpleNamespace(monotonic=lambda: next(times, original_monotonic())),
):
options = _get_completion_options(
completions, prefix="", limit=100, timeout=1.0
@@ -1171,8 +1171,8 @@ def test_infer_skipped_once_timeout_elapsed() -> None:
times = iter([0.0, 0.0, 10.0, 10.0, 10.0, 10.0, 10.0, 10.0, 10.0, 10.0])
with mock.patch(
- "marimo._runtime.complete.time.monotonic",
- side_effect=lambda: next(times, original_monotonic()),
+ "marimo._runtime.complete.time",
+ SimpleNamespace(monotonic=lambda: next(times, original_monotonic())),
):
_get_completion_options(completions, prefix="", limit=100, timeout=1.0)
diff --git a/tests/_server/files/test_os_file_system.py b/tests/_server/files/test_os_file_system.py
index 334b5447f3..270a2d5449 100644
--- a/tests/_server/files/test_os_file_system.py
+++ b/tests/_server/files/test_os_file_system.py
@@ -685,14 +685,14 @@ class TestIsMarimoFile:
py_file.write_text("print(0)".ljust(len(notebook)))
unchanged_stat = py_file.stat()
with patch(
- "marimo._server.files.os_file_system.time.monotonic",
- return_value=100,
+ "marimo._server.files.os_file_system.time",
) as clock:
+ clock.monotonic.return_value = 100
assert fs._is_marimo_file(str(py_file), unchanged_stat) is False
py_file.write_text(notebook)
- clock.return_value = 104
+ clock.monotonic.return_value = 104
assert fs._is_marimo_file(str(py_file), unchanged_stat) is False
- clock.return_value = 105
+ clock.monotonic.return_value = 105
assert fs._is_marimo_file(str(py_file), unchanged_stat) is True
def test_python_marimo_file(
diff --git a/tests/_session/state/test_session_view.py b/tests/_session/state/test_session_view.py
index 5c5cb83d23..cfe6ef7cb6 100644
--- a/tests/_session/state/test_session_view.py
+++ b/tests/_session/state/test_session_view.py
@@ -1,8 +1,8 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
+from types import SimpleNamespace
from typing import Any, Literal
-from unittest.mock import patch
import msgspec
import pytest
@@ -83,6 +83,18 @@ updated_output = CellOutput(
mimetype="text/plain",
)
+
+def fixed_time(monkeypatch: pytest.MonkeyPatch) -> None:
+ clock = SimpleNamespace(time=lambda: 123)
+ for module in (
+ "marimo._messaging.cell_output",
+ "marimo._messaging.notification",
+ "marimo._session.state.session_view",
+ ):
+ monkeypatch.setattr(f"{module}.time", clock)
+
+
initial_status: RuntimeStateType = "running"
updated_status: RuntimeStateType = "running"
@@ -1252,12 +1264,8 @@ def test_add_cell_notification(session_view: SessionView) -> None:
assert session_view.cell_notifications[cell_id].status == initial_status
-# patch time
-@patch("time.time", return_value=123)
-def test_combine_console_outputs(
- time_mock: Any, session_view: SessionView
-) -> None:
- del time_mock
[email protected]("fixed_time")
+def test_combine_console_outputs(session_view: SessionView) -> None:
session_view.add_notification(
CellNotification(
cell_id=cell_id,
@@ -1314,12 +1322,11 @@ def test_combine_console_outputs(
]
-@patch("time.time", return_value=123)
[email protected]("fixed_time")
def test_explicit_empty_console_clears_mid_run(
- time_mock: Any, session_view: SessionView
+ session_view: SessionView,
) -> None:
"""An explicit `console=[]` clears the session view, even while running."""
- del time_mock
session_view.add_notification(
CellNotification(
cell_id=cell_id,
@@ -1359,9 +1366,8 @@ def test_explicit_empty_console_clears_mid_run(
assert session_view.cell_notifications[cell_id].console == []
-@patch("time.time", return_value=123)
-def test_stdin(time_mock: Any, session_view: SessionView) -> None:
- del time_mock
[email protected]("fixed_time")
+def test_stdin(session_view: SessionView) -> None:
session_view.add_notification(
CellNotification(
cell_id=cell_id,
@@ -1390,12 +1396,11 @@ def test_stdin(time_mock: Any, session_view: SessionView) -> None:
]
-@patch("time.time", return_value=123)
[email protected]("fixed_time")
def test_merge_consecutive_text_plain_outputs(
- time_mock: Any, session_view: SessionView
+ session_view: SessionView,
) -> None:
"""Test that consecutive text/plain outputs with same channel are merged."""
- del time_mock
# Add multiple consecutive stdout outputs
session_view.add_notification(
@@ -1432,12 +1437,11 @@ def test_merge_consecutive_text_plain_outputs(
)
-@patch("time.time", return_value=123)
[email protected]("fixed_time")
def test_merge_different_channels_not_merged(
- time_mock: Any, session_view: SessionView
+ session_view: SessionView,
) -> None:
"""Test that outputs with different channels are not merged."""
- del time_mock
session_view.add_notification(
CellNotification(
@@ -1466,12 +1470,11 @@ def test_merge_different_channels_not_merged(
)
-@patch("time.time", return_value=123)
[email protected]("fixed_time")
def test_merge_different_mimetypes_not_merged(
- time_mock: Any, session_view: SessionView
+ session_view: SessionView,
) -> None:
"""Test that outputs with different mimetypes are not merged."""
- del time_mock
session_view.add_notification(
CellNotification(
@@ -1500,12 +1503,11 @@ def test_merge_different_mimetypes_not_merged(
)
-@patch("time.time", return_value=123)
[email protected]("fixed_time")
def test_merge_with_non_string_data_not_merged(
- time_mock: Any, session_view: SessionView
+ session_view: SessionView,
) -> None:
"""Test that outputs with non-string data are not merged."""
- del time_mock
session_view.add_notification(
CellNotification(
@@ -1530,9 +1532,8 @@ def test_merge_with_non_string_data_not_merged(
assert len(session_view.cell_notifications[cell_id].console) == 2
-@patch("time.time", return_value=123)
-def test_get_cell_outputs(time_mock: Any, session_view: SessionView) -> None:
- del time_mock
[email protected]("fixed_time")
+def test_get_cell_outputs(session_view: SessionView) -> None:
cell_2_id = "cell_2"
session_view.add_notification(
CellNotification(
@@ -1577,11 +1578,8 @@ def test_get_cell_outputs(time_mock: Any, session_view: SessionView) -> None:
}
-@patch("time.time", return_value=123)
-def test_get_cell_console_outputs(
- time_mock: Any, session_view: SessionView
-) -> None:
- del time_mock
[email protected]("fixed_time")
+def test_get_cell_console_outputs(session_view: SessionView) -> None:
cell_2_id = "cell_2"
session_view.add_notification(
CellNotification(
diff --git a/tests/_utils/test_subprocess.py b/tests/_utils/test_subprocess.py
index afd6d5c815..0c7dfa8576 100644
--- a/tests/_utils/test_subprocess.py
+++ b/tests/_utils/test_subprocess.py
@@ -9,7 +9,7 @@ import subprocess
import sys
import time
from typing import cast
-from unittest.mock import patch
+from unittest.mock import Mock, patch
import pytest
@@ -172,7 +172,10 @@ async def test_try_kill_process_and_group_sigkills_stubborn_child(
async def short_sleep(_delay: float) -> None:
await real_sleep(0.05)
- monkeypatch.setattr(asyncio, "sleep", short_sleep)
+ monkeypatch.setattr(
+ "marimo._utils.subprocess.asyncio",
+ Mock(wraps=asyncio, sleep=short_sleep),
+ )
script = (
"import signal, time\n"