mirror
/
tiangolo.fastapi
mirror of https://github.com/tiangolo/fastapi
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

remove deprecated event warnings and TODOs

pull/14773/head
Pravin Kamble 6 months ago
parent
f6467ce58d
commit
157aa23b14
5 changed files with 168 additions and 193 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      tests/test_tutorial/test_events/test_tutorial001.py
  2. 4
      tests/test_tutorial/test_events/test_tutorial002.py
  3. 174
      tests/test_tutorial/test_sql_databases/test_tutorial001.py
  4. 172
      tests/test_tutorial/test_sql_databases/test_tutorial002.py
  5. 7
      tests/test_tutorial/test_testing/test_tutorial003.py

4
tests/test_tutorial/test_events/test_tutorial001.py
View File

@ -5,8 +5,8 @@ from fastapi.testclient import TestClient
@pytest.fixture(name="app", scope="module") @pytest.fixture(name="app", scope="module")
def get_app(): def get_app():
with pytest.warns(DeprecationWarning): from docs_src.events.tutorial001_py39 import app
from docs_src.events.tutorial001_py39 import app
yield app yield app

4
tests/test_tutorial/test_events/test_tutorial002.py
View File

@ -5,8 +5,8 @@ from fastapi.testclient import TestClient
@pytest.fixture(name="app", scope="module") @pytest.fixture(name="app", scope="module")
def get_app(): def get_app():
with pytest.warns(DeprecationWarning): from docs_src.events.tutorial002_py39 import app
from docs_src.events.tutorial002_py39 import app
yield app yield app

174
tests/test_tutorial/test_sql_databases/test_tutorial001.py
View File

@ -1,5 +1,4 @@
import importlib import importlib
import warnings
import pytest import pytest
from dirty_equals import IsInt from dirty_equals import IsInt
@ -30,12 +29,9 @@ def clear_sqlmodel():
) )
def get_client(request: pytest.FixtureRequest): def get_client(request: pytest.FixtureRequest):
clear_sqlmodel() clear_sqlmodel()
# TODO: remove when updating SQL tutorial to use new lifespan API mod = importlib.import_module(f"docs_src.sql_databases.{request.param}")
with warnings.catch_warnings(record=True): clear_sqlmodel()
warnings.simplefilter("always") importlib.reload(mod)
mod = importlib.import_module(f"docs_src.sql_databases.{request.param}")
clear_sqlmodel()
importlib.reload(mod)
mod.sqlite_url = "sqlite://" mod.sqlite_url = "sqlite://"
mod.engine = create_engine( mod.engine = create_engine(
mod.sqlite_url, connect_args={"check_same_thread": False}, poolclass=StaticPool mod.sqlite_url, connect_args={"check_same_thread": False}, poolclass=StaticPool
@ -48,99 +44,95 @@ def get_client(request: pytest.FixtureRequest):
def test_crud_app(client: TestClient): def test_crud_app(client: TestClient):
# TODO: this warns that SQLModel.from_orm is deprecated in Pydantic v1, refactor # No heroes before creating
# this if using obj.model_validate becomes independent of Pydantic v2 response = client.get("heroes/")
with warnings.catch_warnings(record=True): assert response.status_code == 200, response.text
warnings.simplefilter("always") assert response.json() == []
# No heroes before creating
response = client.get("heroes/") # Create a hero
assert response.status_code == 200, response.text response = client.post(
assert response.json() == [] "/heroes/",
json={
"id": 999,
"name": "Dead Pond",
"age": 30,
"secret_name": "Dive Wilson",
},
)
assert response.status_code == 200, response.text
assert response.json() == snapshot(
{"age": 30, "secret_name": "Dive Wilson", "id": 999, "name": "Dead Pond"}
)
# Read a hero
hero_id = response.json()["id"]
response = client.get(f"/heroes/{hero_id}")
assert response.status_code == 200, response.text
assert response.json() == snapshot(
{"name": "Dead Pond", "age": 30, "id": 999, "secret_name": "Dive Wilson"}
)
# Read all heroes
# Create more heroes first
response = client.post(
"/heroes/",
json={"name": "Spider-Boy", "age": 18, "secret_name": "Pedro Parqueador"},
)
assert response.status_code == 200, response.text
response = client.post(
"/heroes/", json={"name": "Rusty-Man", "secret_name": "Tommy Sharp"}
)
assert response.status_code == 200, response.text
# Create a hero response = client.get("/heroes/")
response = client.post( assert response.status_code == 200, response.text
"/heroes/", assert response.json() == snapshot(
json={ [
"id": 999, {
"name": "Dead Pond", "name": "Dead Pond",
"age": 30, "age": 30,
"id": IsInt(),
"secret_name": "Dive Wilson", "secret_name": "Dive Wilson",
}, },
) {
assert response.status_code == 200, response.text "name": "Spider-Boy",
assert response.json() == snapshot( "age": 18,
{"age": 30, "secret_name": "Dive Wilson", "id": 999, "name": "Dead Pond"} "id": IsInt(),
) "secret_name": "Pedro Parqueador",
},
# Read a hero {
hero_id = response.json()["id"] "name": "Rusty-Man",
response = client.get(f"/heroes/{hero_id}") "age": None,
assert response.status_code == 200, response.text "id": IsInt(),
assert response.json() == snapshot( "secret_name": "Tommy Sharp",
{"name": "Dead Pond", "age": 30, "id": 999, "secret_name": "Dive Wilson"} },
) ]
)
# Read all heroes
# Create more heroes first
response = client.post(
"/heroes/",
json={"name": "Spider-Boy", "age": 18, "secret_name": "Pedro Parqueador"},
)
assert response.status_code == 200, response.text
response = client.post(
"/heroes/", json={"name": "Rusty-Man", "secret_name": "Tommy Sharp"}
)
assert response.status_code == 200, response.text
response = client.get("/heroes/")
assert response.status_code == 200, response.text
assert response.json() == snapshot(
[
{
"name": "Dead Pond",
"age": 30,
"id": IsInt(),
"secret_name": "Dive Wilson",
},
{
"name": "Spider-Boy",
"age": 18,
"id": IsInt(),
"secret_name": "Pedro Parqueador",
},
{
"name": "Rusty-Man",
"age": None,
"id": IsInt(),
"secret_name": "Tommy Sharp",
},
]
)
response = client.get("/heroes/?offset=1&limit=1") response = client.get("/heroes/?offset=1&limit=1")
assert response.status_code == 200, response.text assert response.status_code == 200, response.text
assert response.json() == snapshot( assert response.json() == snapshot(
[ [
{ {
"name": "Spider-Boy", "name": "Spider-Boy",
"age": 18, "age": 18,
"id": IsInt(), "id": IsInt(),
"secret_name": "Pedro Parqueador", "secret_name": "Pedro Parqueador",
} }
] ]
) )
# Delete a hero # Delete a hero
response = client.delete(f"/heroes/{hero_id}") response = client.delete(f"/heroes/{hero_id}")
assert response.status_code == 200, response.text assert response.status_code == 200, response.text
assert response.json() == snapshot({"ok": True}) assert response.json() == snapshot({"ok": True})
response = client.get(f"/heroes/{hero_id}") response = client.get(f"/heroes/{hero_id}")
assert response.status_code == 404, response.text assert response.status_code == 404, response.text
response = client.delete(f"/heroes/{hero_id}") response = client.delete(f"/heroes/{hero_id}")
assert response.status_code == 404, response.text assert response.status_code == 404, response.text
assert response.json() == snapshot({"detail": "Hero not found"}) assert response.json() == snapshot({"detail": "Hero not found"})
def test_openapi_schema(client: TestClient): def test_openapi_schema(client: TestClient):

172
tests/test_tutorial/test_sql_databases/test_tutorial002.py
View File

@ -1,5 +1,4 @@
import importlib import importlib
import warnings
import pytest import pytest
from dirty_equals import IsInt from dirty_equals import IsInt
@ -30,12 +29,9 @@ def clear_sqlmodel():
) )
def get_client(request: pytest.FixtureRequest): def get_client(request: pytest.FixtureRequest):
clear_sqlmodel() clear_sqlmodel()
# TODO: remove when updating SQL tutorial to use new lifespan API mod = importlib.import_module(f"docs_src.sql_databases.{request.param}")
with warnings.catch_warnings(record=True): clear_sqlmodel()
warnings.simplefilter("always") importlib.reload(mod)
mod = importlib.import_module(f"docs_src.sql_databases.{request.param}")
clear_sqlmodel()
importlib.reload(mod)
mod.sqlite_url = "sqlite://" mod.sqlite_url = "sqlite://"
mod.engine = create_engine( mod.engine = create_engine(
mod.sqlite_url, connect_args={"check_same_thread": False}, poolclass=StaticPool mod.sqlite_url, connect_args={"check_same_thread": False}, poolclass=StaticPool
@ -48,103 +44,93 @@ def get_client(request: pytest.FixtureRequest):
def test_crud_app(client: TestClient): def test_crud_app(client: TestClient):
# TODO: this warns that SQLModel.from_orm is deprecated in Pydantic v1, refactor # No heroes before creating
# this if using obj.model_validate becomes independent of Pydantic v2 response = client.get("heroes/")
with warnings.catch_warnings(record=True): assert response.status_code == 200, response.text
warnings.simplefilter("always") assert response.json() == []
# No heroes before creating
response = client.get("heroes/")
assert response.status_code == 200, response.text
assert response.json() == []
# Create a hero # Create a hero
response = client.post( response = client.post(
"/heroes/", "/heroes/",
json={ json={
"id": 9000, "id": 9000,
"name": "Dead Pond", "name": "Dead Pond",
"age": 30, "age": 30,
"secret_name": "Dive Wilson", "secret_name": "Dive Wilson",
}, },
) )
assert response.status_code == 200, response.text assert response.status_code == 200, response.text
assert response.json() == snapshot( assert response.json() == snapshot({"age": 30, "id": IsInt(), "name": "Dead Pond"})
{"age": 30, "id": IsInt(), "name": "Dead Pond"} assert response.json()["id"] != 9000, "The ID should be generated by the database"
)
assert response.json()["id"] != 9000, (
"The ID should be generated by the database"
)
# Read a hero # Read a hero
hero_id = response.json()["id"] hero_id = response.json()["id"]
response = client.get(f"/heroes/{hero_id}") response = client.get(f"/heroes/{hero_id}")
assert response.status_code == 200, response.text assert response.status_code == 200, response.text
assert response.json() == snapshot( assert response.json() == snapshot({"name": "Dead Pond", "age": 30, "id": IsInt()})
{"name": "Dead Pond", "age": 30, "id": IsInt()}
)
# Read all heroes # Read all heroes
# Create more heroes first # Create more heroes first
response = client.post( response = client.post(
"/heroes/", "/heroes/",
json={"name": "Spider-Boy", "age": 18, "secret_name": "Pedro Parqueador"}, json={"name": "Spider-Boy", "age": 18, "secret_name": "Pedro Parqueador"},
) )
assert response.status_code == 200, response.text assert response.status_code == 200, response.text
response = client.post( response = client.post(
"/heroes/", json={"name": "Rusty-Man", "secret_name": "Tommy Sharp"} "/heroes/", json={"name": "Rusty-Man", "secret_name": "Tommy Sharp"}
) )
assert response.status_code == 200, response.text assert response.status_code == 200, response.text
response = client.get("/heroes/") response = client.get("/heroes/")
assert response.status_code == 200, response.text assert response.status_code == 200, response.text
assert response.json() == snapshot( assert response.json() == snapshot(
[ [
{"name": "Dead Pond", "age": 30, "id": IsInt()}, {"name": "Dead Pond", "age": 30, "id": IsInt()},
{"name": "Spider-Boy", "age": 18, "id": IsInt()}, {"name": "Spider-Boy", "age": 18, "id": IsInt()},
{"name": "Rusty-Man", "age": None, "id": IsInt()}, {"name": "Rusty-Man", "age": None, "id": IsInt()},
] ]
) )
response = client.get("/heroes/?offset=1&limit=1") response = client.get("/heroes/?offset=1&limit=1")
assert response.status_code == 200, response.text assert response.status_code == 200, response.text
assert response.json() == snapshot( assert response.json() == snapshot(
[{"name": "Spider-Boy", "age": 18, "id": IsInt()}] [{"name": "Spider-Boy", "age": 18, "id": IsInt()}]
) )
# Update a hero # Update a hero
response = client.patch( response = client.patch(
f"/heroes/{hero_id}", json={"name": "Dog Pond", "age": None} f"/heroes/{hero_id}", json={"name": "Dog Pond", "age": None}
) )
assert response.status_code == 200, response.text assert response.status_code == 200, response.text
assert response.json() == snapshot( assert response.json() == snapshot(
{"name": "Dog Pond", "age": None, "id": Is(hero_id)} {"name": "Dog Pond", "age": None, "id": Is(hero_id)}
) )
# Get updated hero # Get updated hero
response = client.get(f"/heroes/{hero_id}") response = client.get(f"/heroes/{hero_id}")
assert response.status_code == 200, response.text assert response.status_code == 200, response.text
assert response.json() == snapshot( assert response.json() == snapshot(
{"name": "Dog Pond", "age": None, "id": Is(hero_id)} {"name": "Dog Pond", "age": None, "id": Is(hero_id)}
) )
# Delete a hero # Delete a hero
response = client.delete(f"/heroes/{hero_id}") response = client.delete(f"/heroes/{hero_id}")
assert response.status_code == 200, response.text assert response.status_code == 200, response.text
assert response.json() == snapshot({"ok": True}) assert response.json() == snapshot({"ok": True})
# The hero is no longer found # The hero is no longer found
response = client.get(f"/heroes/{hero_id}") response = client.get(f"/heroes/{hero_id}")
assert response.status_code == 404, response.text assert response.status_code == 404, response.text
# Delete a hero that does not exist # Delete a hero that does not exist
response = client.delete(f"/heroes/{hero_id}") response = client.delete(f"/heroes/{hero_id}")
assert response.status_code == 404, response.text assert response.status_code == 404, response.text
assert response.json() == snapshot({"detail": "Hero not found"}) assert response.json() == snapshot({"detail": "Hero not found"})
# Update a hero that does not exist # Update a hero that does not exist
response = client.patch(f"/heroes/{hero_id}", json={"name": "Dog Pond"}) response = client.patch(f"/heroes/{hero_id}", json={"name": "Dog Pond"})
assert response.status_code == 404, response.text assert response.status_code == 404, response.text
assert response.json() == snapshot({"detail": "Hero not found"}) assert response.json() == snapshot({"detail": "Hero not found"})
def test_openapi_schema(client: TestClient): def test_openapi_schema(client: TestClient):

7
tests/test_tutorial/test_testing/test_tutorial003.py
View File

@ -1,7 +1,4 @@
import pytest
def test_main(): def test_main():
with pytest.warns(DeprecationWarning): from docs_src.app_testing.tutorial003_py39 import test_read_items
from docs_src.app_testing.tutorial003_py39 import test_read_items
test_read_items() test_read_items()

Write Preview
Loading…
Cancel
Save