From: Sebastián Ramírez <tiangolo@gmail.com>
Date: Thu, 19 Jun 2025 13:23:26 +0000 (+0200)
Subject: ✅ Refactor tests to use autouse `clear_sqlmodel` (#1406)
X-Git-Tag: 0.0.25~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75a79a3fcd2b5e2e0b4d24ac33dc5ae13ca70373;p=thirdparty%2Ffastapi%2Fsqlmodel.git

✅ Refactor tests to use autouse `clear_sqlmodel` (#1406)
---

diff --git a/tests/conftest.py b/tests/conftest.py
index a95eb3279..9e8a45cc2 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -14,8 +14,8 @@ top_level_path = Path(__file__).resolve().parent.parent
 docs_src_path = top_level_path / "docs_src"
 
 
-@pytest.fixture()
-def clear_sqlmodel():
+@pytest.fixture(autouse=True)
+def clear_sqlmodel() -> Any:
     # Clear the tables in the metadata for the default base model
     SQLModel.metadata.clear()
     # Clear the Models associated with the registry, to avoid warnings
diff --git a/tests/test_advanced/test_decimal/test_tutorial001.py b/tests/test_advanced/test_decimal/test_tutorial001.py
index 1dafdfb32..2dc562209 100644
--- a/tests/test_advanced/test_decimal/test_tutorial001.py
+++ b/tests/test_advanced/test_decimal/test_tutorial001.py
@@ -30,7 +30,7 @@ expected_calls = [
 ]
 
 
-def test_tutorial(clear_sqlmodel):
+def test_tutorial():
     from docs_src.advanced.decimal import tutorial001 as mod
 
     mod.sqlite_url = "sqlite://"
diff --git a/tests/test_advanced/test_decimal/test_tutorial001_py310.py b/tests/test_advanced/test_decimal/test_tutorial001_py310.py
index f58ea11a7..4cda8b465 100644
--- a/tests/test_advanced/test_decimal/test_tutorial001_py310.py
+++ b/tests/test_advanced/test_decimal/test_tutorial001_py310.py
@@ -31,7 +31,7 @@ expected_calls = [
 
 
 @needs_py310
-def test_tutorial(clear_sqlmodel):
+def test_tutorial():
     from docs_src.advanced.decimal import tutorial001_py310 as mod
 
     mod.sqlite_url = "sqlite://"
diff --git a/tests/test_advanced/test_uuid/test_tutorial001.py b/tests/test_advanced/test_uuid/test_tutorial001.py
index 405195f8e..b9d5a3680 100644
--- a/tests/test_advanced/test_uuid/test_tutorial001.py
+++ b/tests/test_advanced/test_uuid/test_tutorial001.py
@@ -6,7 +6,7 @@ from sqlmodel import create_engine
 from ...conftest import get_testing_print_function
 
 
-def test_tutorial(clear_sqlmodel) -> None:
+def test_tutorial() -> None:
     from docs_src.advanced.uuid import tutorial001 as mod
 
     mod.sqlite_url = "sqlite://"
diff --git a/tests/test_advanced/test_uuid/test_tutorial001_py310.py b/tests/test_advanced/test_uuid/test_tutorial001_py310.py
index ee8cb085d..1250c3287 100644
--- a/tests/test_advanced/test_uuid/test_tutorial001_py310.py
+++ b/tests/test_advanced/test_uuid/test_tutorial001_py310.py
@@ -7,7 +7,7 @@ from ...conftest import get_testing_print_function, needs_py310
 
 
 @needs_py310
-def test_tutorial(clear_sqlmodel) -> None:
+def test_tutorial() -> None:
     from docs_src.advanced.uuid import tutorial001_py310 as mod
 
     mod.sqlite_url = "sqlite://"
diff --git a/tests/test_advanced/test_uuid/test_tutorial002.py b/tests/test_advanced/test_uuid/test_tutorial002.py
index cefd95ba4..c9f4e5a35 100644
--- a/tests/test_advanced/test_uuid/test_tutorial002.py
+++ b/tests/test_advanced/test_uuid/test_tutorial002.py
@@ -6,7 +6,7 @@ from sqlmodel import create_engine
 from ...conftest import get_testing_print_function
 
 
-def test_tutorial(clear_sqlmodel) -> None:
+def test_tutorial() -> None:
     from docs_src.advanced.uuid import tutorial002 as mod
 
     mod.sqlite_url = "sqlite://"
diff --git a/tests/test_advanced/test_uuid/test_tutorial002_py310.py b/tests/test_advanced/test_uuid/test_tutorial002_py310.py
index 96f85c533..ba472e30f 100644
--- a/tests/test_advanced/test_uuid/test_tutorial002_py310.py
+++ b/tests/test_advanced/test_uuid/test_tutorial002_py310.py
@@ -7,7 +7,7 @@ from ...conftest import get_testing_print_function, needs_py310
 
 
 @needs_py310
-def test_tutorial(clear_sqlmodel) -> None:
+def test_tutorial() -> None:
     from docs_src.advanced.uuid import tutorial002_py310 as mod
 
     mod.sqlite_url = "sqlite://"
diff --git a/tests/test_tutorial/test_automatic_id_none_refresh/test_tutorial001_tutorial002.py b/tests/test_tutorial/test_automatic_id_none_refresh/test_tutorial001_tutorial002.py
index 399f431b4..5c2504710 100644
--- a/tests/test_tutorial/test_automatic_id_none_refresh/test_tutorial001_tutorial002.py
+++ b/tests/test_tutorial/test_automatic_id_none_refresh/test_tutorial001_tutorial002.py
@@ -133,7 +133,7 @@ def check_calls(calls: List[List[Union[str, Dict[str, Any]]]]):
     ]
 
 
-def test_tutorial_001(clear_sqlmodel):
+def test_tutorial_001():
     from docs_src.tutorial.automatic_id_none_refresh import tutorial001 as mod
 
     mod.sqlite_url = "sqlite://"
@@ -147,7 +147,7 @@ def test_tutorial_001(clear_sqlmodel):
     check_calls(calls)
 
 
-def test_tutorial_002(clear_sqlmodel):
+def test_tutorial_002():
     from docs_src.tutorial.automatic_id_none_refresh import tutorial002 as mod
 
     mod.sqlite_url = "sqlite://"
diff --git a/tests/test_tutorial/test_code_structure/test_tutorial001.py b/tests/test_tutorial/test_code_structure/test_tutorial001.py
index c6e315836..109c1ef5c 100644
--- a/tests/test_tutorial/test_code_structure/test_tutorial001.py
+++ b/tests/test_tutorial/test_code_structure/test_tutorial001.py
@@ -22,7 +22,7 @@ expected_calls = [
 ]
 
 
-def test_tutorial(clear_sqlmodel):
+def test_tutorial():
     from docs_src.tutorial.code_structure.tutorial001 import app, database
 
     database.sqlite_url = "sqlite://"
diff --git a/tests/test_tutorial/test_code_structure/test_tutorial001_py310.py b/tests/test_tutorial/test_code_structure/test_tutorial001_py310.py
index 44d9d920f..126bef25e 100644
--- a/tests/test_tutorial/test_code_structure/test_tutorial001_py310.py
+++ b/tests/test_tutorial/test_code_structure/test_tutorial001_py310.py
@@ -23,7 +23,7 @@ expected_calls = [
 
 
 @needs_py310
-def test_tutorial(clear_sqlmodel):
+def test_tutorial():
     from docs_src.tutorial.code_structure.tutorial001_py310 import app, database
 
     database.sqlite_url = "sqlite://"
diff --git a/tests/test_tutorial/test_code_structure/test_tutorial001_py39.py b/tests/test_tutorial/test_code_structure/test_tutorial001_py39.py
index b17917cff..02f692eac 100644
--- a/tests/test_tutorial/test_code_structure/test_tutorial001_py39.py
+++ b/tests/test_tutorial/test_code_structure/test_tutorial001_py39.py
@@ -23,7 +23,7 @@ expected_calls = [
 
 
 @needs_py39
-def test_tutorial(clear_sqlmodel):
+def test_tutorial():
     from docs_src.tutorial.code_structure.tutorial001_py39 import app, database
 
     database.sqlite_url = "sqlite://"
diff --git a/tests/test_tutorial/test_code_structure/test_tutorial002.py b/tests/test_tutorial/test_code_structure/test_tutorial002.py
index 8e7ac8f17..ccbb84909 100644
--- a/tests/test_tutorial/test_code_structure/test_tutorial002.py
+++ b/tests/test_tutorial/test_code_structure/test_tutorial002.py
@@ -22,7 +22,7 @@ expected_calls = [
 ]
 
 
-def test_tutorial(clear_sqlmodel):
+def test_tutorial():
     from docs_src.tutorial.code_structure.tutorial002 import app, database
 
     database.sqlite_url = "sqlite://"
diff --git a/tests/test_tutorial/test_code_structure/test_tutorial002_py310.py b/tests/test_tutorial/test_code_structure/test_tutorial002_py310.py
index 3eafdee83..be2848665 100644
--- a/tests/test_tutorial/test_code_structure/test_tutorial002_py310.py
+++ b/tests/test_tutorial/test_code_structure/test_tutorial002_py310.py
@@ -23,7 +23,7 @@ expected_calls = [
 
 
 @needs_py310
-def test_tutorial(clear_sqlmodel):
+def test_tutorial():
     from docs_src.tutorial.code_structure.tutorial002_py310 import app, database
 
     database.sqlite_url = "sqlite://"
diff --git a/tests/test_tutorial/test_code_structure/test_tutorial002_py39.py b/tests/test_tutorial/test_code_structure/test_tutorial002_py39.py
index 9b5eb670c..55f6a435d 100644
--- a/tests/test_tutorial/test_code_structure/test_tutorial002_py39.py
+++ b/tests/test_tutorial/test_code_structure/test_tutorial002_py39.py
@@ -23,7 +23,7 @@ expected_calls = [
 
 
 @needs_py39
-def test_tutorial(clear_sqlmodel):
+def test_tutorial():
     from docs_src.tutorial.code_structure.tutorial002_py39 import app, database
 
     database.sqlite_url = "sqlite://"
diff --git a/tests/test_tutorial/test_connect/test_create_connected_tables/test_tutorial001.py b/tests/test_tutorial/test_connect/test_create_connected_tables/test_tutorial001.py
index e3e079924..265a05931 100644
--- a/tests/test_tutorial/test_connect/test_create_connected_tables/test_tutorial001.py
+++ b/tests/test_tutorial/test_connect/test_create_connected_tables/test_tutorial001.py
@@ -3,7 +3,7 @@ from sqlalchemy.engine.reflection import Inspector
 from sqlmodel import create_engine
 
 
-def test_tutorial001(clear_sqlmodel):
+def test_tutorial001():
     from docs_src.tutorial.connect.create_tables import tutorial001 as mod
 
     mod.sqlite_url = "sqlite://"
diff --git a/tests/test_tutorial/test_connect/test_create_connected_tables/test_tutorial001_py310.py b/tests/test_tutorial/test_connect/test_create_connected_tables/test_tutorial001_py310.py
index ec2990ebf..95f15a426 100644
--- a/tests/test_tutorial/test_connect/test_create_connected_tables/test_tutorial001_py310.py
+++ b/tests/test_tutorial/test_connect/test_create_connected_tables/test_tutorial001_py310.py
@@ -6,7 +6,7 @@ from ....conftest import needs_py310
 
 
 @needs_py310
-def test_tutorial001(clear_sqlmodel):
+def test_tutorial001():
     from docs_src.tutorial.connect.create_tables import tutorial001_py310 as mod
 
     mod.sqlite_url = "sqlite://"
diff --git a/tests/test_tutorial/test_connect/test_delete/test_tutorial001.py b/tests/test_tutorial/test_connect/test_delete/test_tutorial001.py
index a5db3867e..1a9fe293b 100644
--- a/tests/test_tutorial/test_connect/test_delete/test_tutorial001.py
+++ b/tests/test_tutorial/test_connect/test_delete/test_tutorial001.py
@@ -58,7 +58,7 @@ expected_calls = [
 ]
 
 
-def test_tutorial(clear_sqlmodel):
+def test_tutorial():
     from docs_src.tutorial.connect.delete import tutorial001 as mod
 
     mod.sqlite_url = "sqlite://"
diff --git a/tests/test_tutorial/test_connect/test_delete/test_tutorial001_py310.py b/tests/test_tutorial/test_connect/test_delete/test_tutorial001_py310.py
index edc70b8a3..f1bef3ed0 100644
--- a/tests/test_tutorial/test_connect/test_delete/test_tutorial001_py310.py
+++ b/tests/test_tutorial/test_connect/test_delete/test_tutorial001_py310.py
@@ -59,7 +59,7 @@ expected_calls = [
 
 
 @needs_py310
-def test_tutorial(clear_sqlmodel):
+def test_tutorial():
     from docs_src.tutorial.connect.delete import tutorial001_py310 as mod
 
     mod.sqlite_url = "sqlite://"
diff --git a/tests/test_tutorial/test_connect/test_insert/test_tutorial001.py b/tests/test_tutorial/test_connect/test_insert/test_tutorial001.py
index 8c8a303a2..cfc08ee85 100644
--- a/tests/test_tutorial/test_connect/test_insert/test_tutorial001.py
+++ b/tests/test_tutorial/test_connect/test_insert/test_tutorial001.py
@@ -38,7 +38,7 @@ expected_calls = [
 ]
 
 
-def test_tutorial001(clear_sqlmodel):
+def test_tutorial001():
     from docs_src.tutorial.connect.insert import tutorial001 as mod
 
     mod.sqlite_url = "sqlite://"
diff --git a/tests/test_tutorial/test_connect/test_insert/test_tutorial001_py310.py b/tests/test_tutorial/test_connect/test_insert/test_tutorial001_py310.py
index 854c0068a..6dabc10b8 100644
--- a/tests/test_tutorial/test_connect/test_insert/test_tutorial001_py310.py
+++ b/tests/test_tutorial/test_connect/test_insert/test_tutorial001_py310.py
@@ -39,7 +39,7 @@ expected_calls = [
 
 
 @needs_py310
-def test_tutorial001(clear_sqlmodel):
+def test_tutorial001():
     from docs_src.tutorial.connect.insert import tutorial001_py310 as mod
 
     mod.sqlite_url = "sqlite://"
diff --git a/tests/test_tutorial/test_connect/test_select/test_tutorial001_py310_tutorial002_py310.py b/tests/test_tutorial/test_connect/test_select/test_tutorial001_py310_tutorial002_py310.py
index d3bab7f66..4809d79b6 100644
--- a/tests/test_tutorial/test_connect/test_select/test_tutorial001_py310_tutorial002_py310.py
+++ b/tests/test_tutorial/test_connect/test_select/test_tutorial001_py310_tutorial002_py310.py
@@ -63,7 +63,7 @@ expected_calls = [
 
 
 @needs_py310
-def test_tutorial001(clear_sqlmodel):
+def test_tutorial001():
     from docs_src.tutorial.connect.select import tutorial001_py310 as mod
 
     mod.sqlite_url = "sqlite://"
@@ -78,7 +78,7 @@ def test_tutorial001(clear_sqlmodel):
 
 
 @needs_py310
-def test_tutorial002(clear_sqlmodel):
+def test_tutorial002():
     from docs_src.tutorial.connect.select import tutorial002_py310 as mod
 
     mod.sqlite_url = "sqlite://"
diff --git a/tests/test_tutorial/test_connect/test_select/test_tutorial001_tutorial002.py b/tests/test_tutorial/test_connect/test_select/test_tutorial001_tutorial002.py
index 541a8ee00..c0d6b59dd 100644
--- a/tests/test_tutorial/test_connect/test_select/test_tutorial001_tutorial002.py
+++ b/tests/test_tutorial/test_connect/test_select/test_tutorial001_tutorial002.py
@@ -62,7 +62,7 @@ expected_calls = [
 ]
 
 
-def test_tutorial001(clear_sqlmodel):
+def test_tutorial001():
     from docs_src.tutorial.connect.select import tutorial001 as mod
 
     mod.sqlite_url = "sqlite://"
@@ -76,7 +76,7 @@ def test_tutorial001(clear_sqlmodel):
     assert calls == expected_calls
 
 
-def test_tutorial002(clear_sqlmodel):
+def test_tutorial002():
     from docs_src.tutorial.connect.select import tutorial002 as mod
 
     mod.sqlite_url = "sqlite://"
diff --git a/tests/test_tutorial/test_connect/test_select/test_tutorial003.py b/tests/test_tutorial/test_connect/test_select/test_tutorial003.py
index 2eab135ad..f309e1c44 100644
--- a/tests/test_tutorial/test_connect/test_select/test_tutorial003.py
+++ b/tests/test_tutorial/test_connect/test_select/test_tutorial003.py
@@ -74,7 +74,7 @@ expected_calls = [
 ]
 
 
-def test_tutorial(clear_sqlmodel):
+def test_tutorial():
     from docs_src.tutorial.connect.select import tutorial003 as mod
 
     mod.sqlite_url = "sqlite://"
diff --git a/tests/test_tutorial/test_connect/test_select/test_tutorial003_py310.py b/tests/test_tutorial/test_connect/test_select/test_tutorial003_py310.py
index 5b710c435..e826ce44a 100644
--- a/tests/test_tutorial/test_connect/test_select/test_tutorial003_py310.py
+++ b/tests/test_tutorial/test_connect/test_select/test_tutorial003_py310.py
@@ -75,7 +75,7 @@ expected_calls = [
 
 
 @needs_py310
-def test_tutorial(clear_sqlmodel):
+def test_tutorial():
     from docs_src.tutorial.connect.select import tutorial003_py310 as mod
 
     mod.sqlite_url = "sqlite://"
diff --git a/tests/test_tutorial/test_connect/test_select/test_tutorial004.py b/tests/test_tutorial/test_connect/test_select/test_tutorial004.py
index ebc273feb..a33c81485 100644
--- a/tests/test_tutorial/test_connect/test_select/test_tutorial004.py
+++ b/tests/test_tutorial/test_connect/test_select/test_tutorial004.py
@@ -48,7 +48,7 @@ expected_calls = [
 ]
 
 
-def test_tutorial(clear_sqlmodel):
+def test_tutorial():
     from docs_src.tutorial.connect.select import tutorial004 as mod
 
     mod.sqlite_url = "sqlite://"
diff --git a/tests/test_tutorial/test_connect/test_select/test_tutorial004_py310.py b/tests/test_tutorial/test_connect/test_select/test_tutorial004_py310.py
index 72974ec6c..33dd8a432 100644
--- a/tests/test_tutorial/test_connect/test_select/test_tutorial004_py310.py
+++ b/tests/test_tutorial/test_connect/test_select/test_tutorial004_py310.py
@@ -49,7 +49,7 @@ expected_calls = [
 
 
 @needs_py310
-def test_tutorial(clear_sqlmodel):
+def test_tutorial():
     from docs_src.tutorial.connect.select import tutorial004_py310 as mod
 
     mod.sqlite_url = "sqlite://"
diff --git a/tests/test_tutorial/test_connect/test_select/test_tutorial005.py b/tests/test_tutorial/test_connect/test_select/test_tutorial005.py
index 400c6483c..f7ad78dc6 100644
--- a/tests/test_tutorial/test_connect/test_select/test_tutorial005.py
+++ b/tests/test_tutorial/test_connect/test_select/test_tutorial005.py
@@ -50,7 +50,7 @@ expected_calls = [
 ]
 
 
-def test_tutorial(clear_sqlmodel):
+def test_tutorial():
     from docs_src.tutorial.connect.select import tutorial005 as mod
 
     mod.sqlite_url = "sqlite://"
diff --git a/tests/test_tutorial/test_connect/test_select/test_tutorial005_py310.py b/tests/test_tutorial/test_connect/test_select/test_tutorial005_py310.py
index a7332c18a..8cddb6455 100644
--- a/tests/test_tutorial/test_connect/test_select/test_tutorial005_py310.py
+++ b/tests/test_tutorial/test_connect/test_select/test_tutorial005_py310.py
@@ -51,7 +51,7 @@ expected_calls = [
 
 
 @needs_py310
-def test_tutorial(clear_sqlmodel):
+def test_tutorial():
     from docs_src.tutorial.connect.select import tutorial005_py310 as mod
 
     mod.sqlite_url = "sqlite://"