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.
Python artificial-intelligencedagdata-sciencedata-visualizationdataflowdeveloper-toolsmachine-learningnotebookspipelinepythonreactivesqlweb-app
fix: broken tests on main (#8653)
Dylan Madisetti81be3cd94f18
diff --git a/tests/_cli/test_cli_export.py b/tests/_cli/test_cli_export.pyindex 0db7df2426..b798f457e7 100644--- a/tests/_cli/test_cli_export.py+++ b/tests/_cli/test_cli_export.py@@ -807,6 +807,10 @@ class TestExportIpynb:not DependencyManager.nbformat.has(),reason="This test requires nbformat.",)+ @pytest.mark.skipif(+ sys.platform != "linux",+ reason="Plotly template varies across versions; snapshot is linux-only.",+ )def test_export_ipynb_with_media_outputs(self, temp_marimo_file_with_media: str) -> None:diff --git a/tests/_runtime/packages/test_pypi_package_manager.py b/tests/_runtime/packages/test_pypi_package_manager.pyindex 5c88ef26e9..012be903f7 100644--- a/tests/_runtime/packages/test_pypi_package_manager.py+++ b/tests/_runtime/packages/test_pypi_package_manager.py@@ -1,10 +1,12 @@from __future__ import annotationsimport json+import osimport subprocessimport sysfrom functools import partial-from typing import TYPE_CHECKING+from pathlib import Path+from typing import Anyfrom unittest.mock import MagicMock, patchfrom marimo._ast import compiler@@ -16,14 +18,31 @@ from marimo._runtime.packages.pypi_package_manager import (VersionMap,)-if TYPE_CHECKING:- from pathlib import Path-parse_cell = partial(compiler.compile_cell, cell_id="0")PY_EXE = sys.executable+def _normalize_cmd(cmd: list[Any]) -> list[Any]:+ """Normalize path-like args (containing / or \\) to their stem."""+ return [+ Path(arg).stem+ if isinstance(arg, str) and ("/" in arg or "\\" in arg)+ else arg+ for arg in cmd+ ]+++def _assert_cmd_called_once_with(+ mock: MagicMock, expected_cmd: list[Any], **expected_kwargs: Any+) -> None:+ """Assert mock was called once, normalizing path args for cross-platform comparison."""+ mock.assert_called_once()+ call_args, call_kwargs = mock.call_args+ assert _normalize_cmd(call_args[0]) == _normalize_cmd(expected_cmd)+ assert call_kwargs == expected_kwargs++def test_module_to_package() -> None:mgr = PipPackageManager()assert mgr.module_to_package("marimo") == "marimo"@@ -324,7 +343,6 @@ async def test_uv_install_not_in_project_with_target(mock_popen: MagicMock):# Explicitly set environ, since patch doesn't work in an asynchronous# context.- import osos.environ["MARIMO_UV_TARGET"] = "target_path"result = await mgr._install("package1 package2", upgrade=False, group=None)@@ -348,7 +366,8 @@ async def test_uv_install_in_project(mock_run: MagicMock):result = await mgr._install("package1 package2", upgrade=False, group=None)- mock_run.assert_called_once_with(+ _assert_cmd_called_once_with(+ mock_run,["uv", "add", "package1", "package2", "-p", PY_EXE],)assert result is True@@ -365,7 +384,8 @@ async def test_uv_install_dev_dependency_in_project(mock_run: MagicMock):"package1 package2", upgrade=False, group="dev")- mock_run.assert_called_once_with(+ _assert_cmd_called_once_with(+ mock_run,["uv","add",@@ -389,7 +409,8 @@ async def test_uv_install_custom_group_in_project(mock_run: MagicMock):result = await mgr._install("sphinx", upgrade=False, group="docs")- mock_run.assert_called_once_with(+ _assert_cmd_called_once_with(+ mock_run,["uv","add",@@ -412,7 +433,8 @@ async def test_uv_install_no_group_in_project(mock_run: MagicMock):result = await mgr._install("requests", upgrade=False, group=None)- mock_run.assert_called_once_with(+ _assert_cmd_called_once_with(+ mock_run,["uv","add",@@ -433,7 +455,8 @@ async def test_uv_uninstall_with_group_in_project(mock_run: MagicMock):result = await mgr.uninstall("sphinx", group="docs")- mock_run.assert_called_once_with(+ _assert_cmd_called_once_with(+ mock_run,["uv", "remove", "--group", "docs", "sphinx", "-p", PY_EXE],)assert result is True@@ -448,7 +471,8 @@ async def test_uv_uninstall_not_in_project(mock_run: MagicMock):result = await mgr.uninstall("package1 package2")- mock_run.assert_called_once_with(+ _assert_cmd_called_once_with(+ mock_run,["uv", "pip", "uninstall", "package1", "package2", "-p", PY_EXE],)assert result is True@@ -463,14 +487,18 @@ async def test_uv_uninstall_in_project(mock_run: MagicMock):result = await mgr.uninstall("package1 package2")- mock_run.assert_called_once_with(+ _assert_cmd_called_once_with(+ mock_run,["uv", "remove", "package1", "package2", "-p", PY_EXE],)assert result is True@patch("subprocess.run")-def test_uv_list_packages(mock_run: MagicMock):[email protected](UvPackageManager, "dependency_tree")+def test_uv_list_packages(+ mock_dependency_tree: MagicMock, mock_run: MagicMock+):"""Test UV list packages uses pip list subcommand"""mock_output = json.dumps([@@ -479,11 +507,13 @@ def test_uv_list_packages(mock_run: MagicMock):])mock_run.return_value = MagicMock(returncode=0, stdout=mock_output)+ mock_dependency_tree.return_value = Nonemgr = UvPackageManager()packages = mgr.list_packages()- mock_run.assert_called_once_with(+ _assert_cmd_called_once_with(+ mock_run,["uv", "pip", "list", "--format=json", "-p", PY_EXE],capture_output=True,text=True,@@ -576,7 +606,8 @@ def test_uv_list_packages_tree_fallback_to_pip_list(mock_dependency_tree.assert_called_once()# Should fall back to subprocess call- mock_run.assert_called_once_with(+ _assert_cmd_called_once_with(+ mock_run,["uv", "pip", "list", "--format=json", "-p", PY_EXE],capture_output=True,text=True,@@ -785,7 +816,8 @@ async def test_uv_install_cache_error_fallback(assert call_kwargs[1]["bufsize"] == 0# Retry should add --no-cache flag- mock_run.assert_called_once_with(+ _assert_cmd_called_once_with(+ mock_run,["uv","pip",@@ -840,7 +872,8 @@ async def test_uv_install_in_project_no_fallback(mock_run: MagicMock):result = await mgr._install("package1", upgrade=False, group=None)# Should only call run once (no fallback for project mode)- mock_run.assert_called_once_with(+ _assert_cmd_called_once_with(+ mock_run,["uv", "add", "package1", "-p", PY_EXE],)