From 9b1cbc5b282553e851a4206af3f72f45ad13e4e9 Mon Sep 17 00:00:00 2001
From: svlandeg <svlandeg@github.com>
Date: Fri, 23 Aug 2024 16:35:37 +0200
Subject: [PATCH] refactor unit test to avoid Python check twice

---
 .../{loging_tool.py => login_tool.py}         |  0
 tests/test_future/test_future_6465.py         | 38 +++++++++----------
 tests/test_future/test_future_9095.py         | 25 ++++++------
 3 files changed, 30 insertions(+), 33 deletions(-)
 rename tests/test_future/{loging_tool.py => login_tool.py} (100%)

diff --git a/tests/test_future/loging_tool.py b/tests/test_future/login_tool.py
similarity index 100%
rename from tests/test_future/loging_tool.py
rename to tests/test_future/login_tool.py
diff --git a/tests/test_future/test_future_6465.py b/tests/test_future/test_future_6465.py
index 57362c5c7..3277d9809 100644
--- a/tests/test_future/test_future_6465.py
+++ b/tests/test_future/test_future_6465.py
@@ -1,34 +1,32 @@
 from __future__ import annotations
 
-import sys
+from typing import Optional
 
-from ..utils import needs_py310
+from fastapi import FastAPI
+from fastapi.testclient import TestClient
+from pydantic import BaseModel
 
-if sys.version_info > (3, 10):
-    from typing import Optional
+from ..utils import needs_py310
+from .login_tool import login_required
 
-    from fastapi import FastAPI
-    from fastapi.testclient import TestClient
-    from pydantic import BaseModel
+app = FastAPI()
+client = TestClient(app)
 
-    from .loging_tool import login_required
 
-    app = FastAPI()
-    client = TestClient(app)
+class Item(BaseModel):
+    name: str
+    description: Optional[str] = None
+    price: float
+    tax: Optional[float] = None
 
-    class Item(BaseModel):
-        name: str
-        description: Optional[str] = None
-        price: float
-        tax: Optional[float] = None
 
-    @app.get("/items/")
-    @login_required
-    def get_item(id: int) -> Item:
-        return Item(name="name", price=42.42)
+@app.get("/items/")
+@login_required
+def get_item(item_id: int) -> Item:
+    return Item(name="name", price=42.42)
 
 
 @needs_py310
 def test_future_6465():
-    res = client.get("/items?id=3")
+    res = client.get("/items?item_id=3")
     assert res.status_code == 200
diff --git a/tests/test_future/test_future_9095.py b/tests/test_future/test_future_9095.py
index 44224f71b..c86cdead0 100644
--- a/tests/test_future/test_future_9095.py
+++ b/tests/test_future/test_future_9095.py
@@ -1,25 +1,24 @@
 from __future__ import annotations
 
-import sys
+from fastapi import Depends, FastAPI
+from fastapi.testclient import TestClient
+from starlette.requests import Request
 
 from ..utils import needs_py310
 
-if sys.version_info > (3, 10):
-    from fastapi import Depends, FastAPI
-    from fastapi.testclient import TestClient
-    from starlette.requests import Request
+app = FastAPI()
 
-    app = FastAPI()
+client = TestClient(app)
 
-    client = TestClient(app)
 
-    class Test:
-        def __call__(self, request: Request):
-            return "test"
+class Test:
+    def __call__(self, request: Request):
+        return "test"
 
-    @app.get("/test/")
-    def call(test: str = Depends(Test())):
-        return {"test": test}
+
+@app.get("/test/")
+def call(test: str = Depends(Test())):
+    return {"test": test}
 
 
 @needs_py310