]> git.ipfire.org Git - thirdparty/fastapi/fastapi.git/commitdiff
✅ Simplify tests for `dependency_testing` (#13223)
authoralv2017 <v.alishauskaite@gmail.com>
Sat, 15 Feb 2025 14:37:48 +0000 (16:37 +0200)
committerGitHub <noreply@github.com>
Sat, 15 Feb 2025 14:37:48 +0000 (14:37 +0000)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Alejandra <90076947+alejsdev@users.noreply.github.com>
tests/test_tutorial/test_testing_dependencies/test_tutorial001.py
tests/test_tutorial/test_testing_dependencies/test_tutorial001_an.py [deleted file]
tests/test_tutorial/test_testing_dependencies/test_tutorial001_an_py310.py [deleted file]
tests/test_tutorial/test_testing_dependencies/test_tutorial001_an_py39.py [deleted file]
tests/test_tutorial/test_testing_dependencies/test_tutorial001_py310.py [deleted file]

index af26307f54c41edbc807fcd56703e313fc390c56..00ee6ab1eab26931faa73d76c9c20a787145ec75 100644 (file)
@@ -1,25 +1,48 @@
-from docs_src.dependency_testing.tutorial001 import (
-    app,
-    client,
-    test_override_in_items,
-    test_override_in_items_with_params,
-    test_override_in_items_with_q,
+import importlib
+from types import ModuleType
+
+import pytest
+
+from ...utils import needs_py39, needs_py310
+
+
+@pytest.fixture(
+    name="test_module",
+    params=[
+        "tutorial001",
+        pytest.param("tutorial001_py310", marks=needs_py310),
+        "tutorial001_an",
+        pytest.param("tutorial001_an_py39", marks=needs_py39),
+        pytest.param("tutorial001_an_py310", marks=needs_py310),
+    ],
 )
+def get_test_module(request: pytest.FixtureRequest) -> ModuleType:
+    mod: ModuleType = importlib.import_module(
+        f"docs_src.dependency_testing.{request.param}"
+    )
+    return mod
 
 
-def test_override_in_items_run():
+def test_override_in_items_run(test_module: ModuleType):
+    test_override_in_items = test_module.test_override_in_items
+
     test_override_in_items()
 
 
-def test_override_in_items_with_q_run():
+def test_override_in_items_with_q_run(test_module: ModuleType):
+    test_override_in_items_with_q = test_module.test_override_in_items_with_q
+
     test_override_in_items_with_q()
 
 
-def test_override_in_items_with_params_run():
+def test_override_in_items_with_params_run(test_module: ModuleType):
+    test_override_in_items_with_params = test_module.test_override_in_items_with_params
+
     test_override_in_items_with_params()
 
 
-def test_override_in_users():
+def test_override_in_users(test_module: ModuleType):
+    client = test_module.client
     response = client.get("/users/")
     assert response.status_code == 200, response.text
     assert response.json() == {
@@ -28,7 +51,8 @@ def test_override_in_users():
     }
 
 
-def test_override_in_users_with_q():
+def test_override_in_users_with_q(test_module: ModuleType):
+    client = test_module.client
     response = client.get("/users/?q=foo")
     assert response.status_code == 200, response.text
     assert response.json() == {
@@ -37,7 +61,8 @@ def test_override_in_users_with_q():
     }
 
 
-def test_override_in_users_with_params():
+def test_override_in_users_with_params(test_module: ModuleType):
+    client = test_module.client
     response = client.get("/users/?q=foo&skip=100&limit=200")
     assert response.status_code == 200, response.text
     assert response.json() == {
@@ -46,7 +71,9 @@ def test_override_in_users_with_params():
     }
 
 
-def test_normal_app():
+def test_normal_app(test_module: ModuleType):
+    app = test_module.app
+    client = test_module.client
     app.dependency_overrides = None
     response = client.get("/items/?q=foo&skip=100&limit=200")
     assert response.status_code == 200, response.text
diff --git a/tests/test_tutorial/test_testing_dependencies/test_tutorial001_an.py b/tests/test_tutorial/test_testing_dependencies/test_tutorial001_an.py
deleted file mode 100644 (file)
index fc1f914..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-from docs_src.dependency_testing.tutorial001_an import (
-    app,
-    client,
-    test_override_in_items,
-    test_override_in_items_with_params,
-    test_override_in_items_with_q,
-)
-
-
-def test_override_in_items_run():
-    test_override_in_items()
-
-
-def test_override_in_items_with_q_run():
-    test_override_in_items_with_q()
-
-
-def test_override_in_items_with_params_run():
-    test_override_in_items_with_params()
-
-
-def test_override_in_users():
-    response = client.get("/users/")
-    assert response.status_code == 200, response.text
-    assert response.json() == {
-        "message": "Hello Users!",
-        "params": {"q": None, "skip": 5, "limit": 10},
-    }
-
-
-def test_override_in_users_with_q():
-    response = client.get("/users/?q=foo")
-    assert response.status_code == 200, response.text
-    assert response.json() == {
-        "message": "Hello Users!",
-        "params": {"q": "foo", "skip": 5, "limit": 10},
-    }
-
-
-def test_override_in_users_with_params():
-    response = client.get("/users/?q=foo&skip=100&limit=200")
-    assert response.status_code == 200, response.text
-    assert response.json() == {
-        "message": "Hello Users!",
-        "params": {"q": "foo", "skip": 5, "limit": 10},
-    }
-
-
-def test_normal_app():
-    app.dependency_overrides = None
-    response = client.get("/items/?q=foo&skip=100&limit=200")
-    assert response.status_code == 200, response.text
-    assert response.json() == {
-        "message": "Hello Items!",
-        "params": {"q": "foo", "skip": 100, "limit": 200},
-    }
diff --git a/tests/test_tutorial/test_testing_dependencies/test_tutorial001_an_py310.py b/tests/test_tutorial/test_testing_dependencies/test_tutorial001_an_py310.py
deleted file mode 100644 (file)
index a3d27f4..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-from ...utils import needs_py310
-
-
-@needs_py310
-def test_override_in_items_run():
-    from docs_src.dependency_testing.tutorial001_an_py310 import test_override_in_items
-
-    test_override_in_items()
-
-
-@needs_py310
-def test_override_in_items_with_q_run():
-    from docs_src.dependency_testing.tutorial001_an_py310 import (
-        test_override_in_items_with_q,
-    )
-
-    test_override_in_items_with_q()
-
-
-@needs_py310
-def test_override_in_items_with_params_run():
-    from docs_src.dependency_testing.tutorial001_an_py310 import (
-        test_override_in_items_with_params,
-    )
-
-    test_override_in_items_with_params()
-
-
-@needs_py310
-def test_override_in_users():
-    from docs_src.dependency_testing.tutorial001_an_py310 import client
-
-    response = client.get("/users/")
-    assert response.status_code == 200, response.text
-    assert response.json() == {
-        "message": "Hello Users!",
-        "params": {"q": None, "skip": 5, "limit": 10},
-    }
-
-
-@needs_py310
-def test_override_in_users_with_q():
-    from docs_src.dependency_testing.tutorial001_an_py310 import client
-
-    response = client.get("/users/?q=foo")
-    assert response.status_code == 200, response.text
-    assert response.json() == {
-        "message": "Hello Users!",
-        "params": {"q": "foo", "skip": 5, "limit": 10},
-    }
-
-
-@needs_py310
-def test_override_in_users_with_params():
-    from docs_src.dependency_testing.tutorial001_an_py310 import client
-
-    response = client.get("/users/?q=foo&skip=100&limit=200")
-    assert response.status_code == 200, response.text
-    assert response.json() == {
-        "message": "Hello Users!",
-        "params": {"q": "foo", "skip": 5, "limit": 10},
-    }
-
-
-@needs_py310
-def test_normal_app():
-    from docs_src.dependency_testing.tutorial001_an_py310 import app, client
-
-    app.dependency_overrides = None
-    response = client.get("/items/?q=foo&skip=100&limit=200")
-    assert response.status_code == 200, response.text
-    assert response.json() == {
-        "message": "Hello Items!",
-        "params": {"q": "foo", "skip": 100, "limit": 200},
-    }
diff --git a/tests/test_tutorial/test_testing_dependencies/test_tutorial001_an_py39.py b/tests/test_tutorial/test_testing_dependencies/test_tutorial001_an_py39.py
deleted file mode 100644 (file)
index f03ed5e..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-from ...utils import needs_py39
-
-
-@needs_py39
-def test_override_in_items_run():
-    from docs_src.dependency_testing.tutorial001_an_py39 import test_override_in_items
-
-    test_override_in_items()
-
-
-@needs_py39
-def test_override_in_items_with_q_run():
-    from docs_src.dependency_testing.tutorial001_an_py39 import (
-        test_override_in_items_with_q,
-    )
-
-    test_override_in_items_with_q()
-
-
-@needs_py39
-def test_override_in_items_with_params_run():
-    from docs_src.dependency_testing.tutorial001_an_py39 import (
-        test_override_in_items_with_params,
-    )
-
-    test_override_in_items_with_params()
-
-
-@needs_py39
-def test_override_in_users():
-    from docs_src.dependency_testing.tutorial001_an_py39 import client
-
-    response = client.get("/users/")
-    assert response.status_code == 200, response.text
-    assert response.json() == {
-        "message": "Hello Users!",
-        "params": {"q": None, "skip": 5, "limit": 10},
-    }
-
-
-@needs_py39
-def test_override_in_users_with_q():
-    from docs_src.dependency_testing.tutorial001_an_py39 import client
-
-    response = client.get("/users/?q=foo")
-    assert response.status_code == 200, response.text
-    assert response.json() == {
-        "message": "Hello Users!",
-        "params": {"q": "foo", "skip": 5, "limit": 10},
-    }
-
-
-@needs_py39
-def test_override_in_users_with_params():
-    from docs_src.dependency_testing.tutorial001_an_py39 import client
-
-    response = client.get("/users/?q=foo&skip=100&limit=200")
-    assert response.status_code == 200, response.text
-    assert response.json() == {
-        "message": "Hello Users!",
-        "params": {"q": "foo", "skip": 5, "limit": 10},
-    }
-
-
-@needs_py39
-def test_normal_app():
-    from docs_src.dependency_testing.tutorial001_an_py39 import app, client
-
-    app.dependency_overrides = None
-    response = client.get("/items/?q=foo&skip=100&limit=200")
-    assert response.status_code == 200, response.text
-    assert response.json() == {
-        "message": "Hello Items!",
-        "params": {"q": "foo", "skip": 100, "limit": 200},
-    }
diff --git a/tests/test_tutorial/test_testing_dependencies/test_tutorial001_py310.py b/tests/test_tutorial/test_testing_dependencies/test_tutorial001_py310.py
deleted file mode 100644 (file)
index 776b916..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-from ...utils import needs_py310
-
-
-@needs_py310
-def test_override_in_items_run():
-    from docs_src.dependency_testing.tutorial001_py310 import test_override_in_items
-
-    test_override_in_items()
-
-
-@needs_py310
-def test_override_in_items_with_q_run():
-    from docs_src.dependency_testing.tutorial001_py310 import (
-        test_override_in_items_with_q,
-    )
-
-    test_override_in_items_with_q()
-
-
-@needs_py310
-def test_override_in_items_with_params_run():
-    from docs_src.dependency_testing.tutorial001_py310 import (
-        test_override_in_items_with_params,
-    )
-
-    test_override_in_items_with_params()
-
-
-@needs_py310
-def test_override_in_users():
-    from docs_src.dependency_testing.tutorial001_py310 import client
-
-    response = client.get("/users/")
-    assert response.status_code == 200, response.text
-    assert response.json() == {
-        "message": "Hello Users!",
-        "params": {"q": None, "skip": 5, "limit": 10},
-    }
-
-
-@needs_py310
-def test_override_in_users_with_q():
-    from docs_src.dependency_testing.tutorial001_py310 import client
-
-    response = client.get("/users/?q=foo")
-    assert response.status_code == 200, response.text
-    assert response.json() == {
-        "message": "Hello Users!",
-        "params": {"q": "foo", "skip": 5, "limit": 10},
-    }
-
-
-@needs_py310
-def test_override_in_users_with_params():
-    from docs_src.dependency_testing.tutorial001_py310 import client
-
-    response = client.get("/users/?q=foo&skip=100&limit=200")
-    assert response.status_code == 200, response.text
-    assert response.json() == {
-        "message": "Hello Users!",
-        "params": {"q": "foo", "skip": 5, "limit": 10},
-    }
-
-
-@needs_py310
-def test_normal_app():
-    from docs_src.dependency_testing.tutorial001_py310 import app, client
-
-    app.dependency_overrides = None
-    response = client.get("/items/?q=foo&skip=100&limit=200")
-    assert response.status_code == 200, response.text
-    assert response.json() == {
-        "message": "Hello Items!",
-        "params": {"q": "foo", "skip": 100, "limit": 200},
-    }