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
tests: speed up pytest in notebooks (#9026)
Myles Scolnick160715378618
diff --git a/marimo/_runtime/pytest.py b/marimo/_runtime/pytest.pyindex fdad871ae7..7e449f33d1 100644--- a/marimo/_runtime/pytest.py+++ b/marimo/_runtime/pytest.py@@ -379,6 +379,8 @@ def run_pytest("no:codecov", # Disable codecov plugin to avoid duplicate reports"-p","no:sugar", # Disable sugar plugin to avoid duplicate reports+ "-p",+ "no:cacheprovider", # Skip .pytest_cache I/Onotebook_path,],plugins=[plugin],diff --git a/tests/_runtime/test_pytest_runtime.py b/tests/_runtime/test_pytest_runtime.pyindex ba39176765..864a0be71c 100644--- a/tests/_runtime/test_pytest_runtime.py+++ b/tests/_runtime/test_pytest_runtime.py@@ -4,50 +4,58 @@ import asyncioimport osimport sysfrom pathlib import Path+from typing import TYPE_CHECKINGimport pytest-[email protected](sys.platform == "win32", reason="Fails on Windows CI")-def test_smoke_test():+if TYPE_CHECKING:+ from marimo._runtime.pytest import run_pytest as _run_pytest_type+ from tests._runtime.script_data.contains_tests import app as _app_type++# Format: (passed, skipped, failed, errors)+_DEF_COUNT = {+ # fixtures, not tests+ "function_fixture": (0, 0, 0, 0),+ "scoped_fixture": (0, 0, 0, 0),+ "isolated_fixture": (0, 0, 0, 0),+ # tests+ "TestParent": (2, 0, 0, 0),+ "test_failure": (0, 0, 1, 0),+ "test_parameterized": (3, 0, 0, 0),+ "test_parameterized_collected": (2, 0, 0, 0),+ "test_sanity": (1, 0, 0, 0),+ "test_skip": (0, 1, 0, 0),+ "test_using_var_in_scope": (3, 0, 0, 0),+ "test_using_var_in_toplevel": (3, 0, 0, 0),+ # Fixtures - these now work with fixture preservation+ "test_uses_scoped_fixture": (1, 0, 0, 0),+ "test_parametrize_with_scoped_fixture": (2, 0, 0, 0),+ "TestWithClassFixture": (1, 0, 0, 0),+ "TestClassDefinitionWithFixtures": (3, 0, 0, 0),+ "test_uses_top_level_fixture": (1, 0, 0, 0),+ "test_parametrize_with_toplevel_fixture": (2, 0, 0, 0),+ "test_uses_function_fixture": (1, 0, 0, 0),+ # Fixture dependency chain test+ "base_fixture": (0, 0, 0, 0), # fixture, not a test+ "dependent_fixture": (0, 0, 0, 0), # fixture, not a test+ "test_fixture_dependency_chain": (1, 0, 0, 0),+ # Null cases - fixture not in scope / doesn't exist (errors)+ "test_cross_cell_fixture_fails": (0, 0, 0, 1),+ "test_missing_fixture": (0, 0, 0, 1),+}++_ISOLATION_DEFS = {"test_cross_cell_fixture_fails", "test_missing_fixture"}++[email protected](scope="module")+def notebook_env() -> tuple[+ type[_app_type], dict[str, object], Path, type[_run_pytest_type]+]:from marimo._runtime.pytest import run_pytestfrom tests._runtime.script_data.contains_tests import app_, lcls = app.run()lcls = dict(lcls)-- # Format: (passed, skipped, failed, errors)- def_count = {- # fixtures, not tests- "function_fixture": (0, 0, 0, 0),- "scoped_fixture": (0, 0, 0, 0),- "isolated_fixture": (0, 0, 0, 0),- # tests- "TestParent": (2, 0, 0, 0),- "test_failure": (0, 0, 1, 0),- "test_parameterized": (3, 0, 0, 0),- "test_parameterized_collected": (2, 0, 0, 0),- "test_sanity": (1, 0, 0, 0),- "test_skip": (0, 1, 0, 0),- "test_using_var_in_scope": (3, 0, 0, 0),- "test_using_var_in_toplevel": (3, 0, 0, 0),- # Fixtures - these now work with fixture preservation- "test_uses_scoped_fixture": (1, 0, 0, 0),- "test_parametrize_with_scoped_fixture": (2, 0, 0, 0),- "TestWithClassFixture": (1, 0, 0, 0),- "TestClassDefinitionWithFixtures": (3, 0, 0, 0),- "test_uses_top_level_fixture": (1, 0, 0, 0),- "test_parametrize_with_toplevel_fixture": (2, 0, 0, 0),- "test_uses_function_fixture": (1, 0, 0, 0),- # Fixture dependency chain test- "base_fixture": (0, 0, 0, 0), # fixture, not a test- "dependent_fixture": (0, 0, 0, 0), # fixture, not a test- "test_fixture_dependency_chain": (1, 0, 0, 0),- # Null cases - fixture not in scope / doesn't exist (errors)- "test_cross_cell_fixture_fails": (0, 0, 0, 1),- "test_missing_fixture": (0, 0, 0, 1),- }-path = Path(__file__).parent / "script_data/contains_tests.py"# Turn off for recursion guard@@ -57,29 +65,60 @@ def test_smoke_test():# Give time for env changes to sync (helps with race conditions on Windows)asyncio.run(asyncio.sleep(0.1))- # sanity check for run+ yield app, lcls, path, run_pytest++ if previous:+ os.environ["PYTEST_CURRENT_TEST"] = previous+ else:+ os.environ.pop("PYTEST_CURRENT_TEST", None)++[email protected](sys.platform == "win32", reason="Fails on Windows CI")+def test_batched_cells(notebook_env):+ """Batch all non-isolation cells into a single run_pytest call."""+ app, lcls, path, run_pytest = notebook_env++ batch_defs: set[str] = set()+ batch_expected = [0, 0, 0, 0] # passed, skipped, failed, errors+ for cell in app._cell_manager.cells():+ if cell and cell.__test__ and not (cell.defs & _ISOLATION_DEFS):+ batch_defs.update(cell.defs)+ for d in cell.defs:+ for i, v in enumerate(_DEF_COUNT[d]):+ batch_expected[i] += v++ response = run_pytest(defs=batch_defs, lcls=lcls, notebook_path=path)+ assert (+ response.passed,+ response.skipped,+ response.failed,+ response.errors,+ ) == tuple(batch_expected), response.output+ assert response.total == 28++[email protected](sys.platform == "win32", reason="Fails on Windows CI")+def test_isolation_cells(notebook_env):+ """Isolation tests run separately to verify fixture scoping errors."""+ app, lcls, path, run_pytest = notebook_env+total = 0for cell in app._cell_manager.cells():- if cell.__test__:+ if cell and cell.__test__ and (cell.defs & _ISOLATION_DEFS):response = run_pytest(defs=cell.defs, lcls=lcls, notebook_path=path)+ expected = tuple(+ map(sum, zip(*[_DEF_COUNT[d] for d in cell.defs]))+ )assert (response.passed,response.skipped,response.failed,response.errors,- ) == tuple(map(sum, zip(*[def_count[d] for d in cell.defs]))), (- response.output- )+ ) == expected, response.outputtotal += response.total-- os.environ["PYTEST_CURRENT_TEST"] = previous- # put it back on-- # Assert all cases captured, and nothing missed.- # Total: 0+0+0+2+1+3+2+1+1+3+3+1+2+1+3+1+2+1+0+0+1+1+1 = 30- assert total == sum(map(sum, def_count.values())) == 30+ assert total == 2def test_pytest_result_summary_includes_xfail() -> None: