tests: Improve fixtures typing #TidyFridy

tests/conftest.py

@@ -1,25 +1,16 @@
 import subprocess
 import sys
-from dataclasses import dataclass
 from pathlib import Path
 from typing import Mapping
 
 import pytest
 import requests
 
+from tests.scenario import Scenario
 from tests.services import API_URL, EDITOAST_URL
 from tests.utils.timetable import create_op_study, create_project, create_scenario
 
 
-@dataclass(frozen=True)
-class Scenario:
-    project: int
-    op_study: int
-    scenario: int
-    infra: int
-    timetable: int
-
-
 def _load_generated_infra(name: str) -> int:
     generator = Path(__file__).resolve().parents[1] / "core/examples/generated/generate.py"
     output = Path("/tmp/osrd-generated-examples")

tests/tests/scenario.py

@@ -0,0 +1,10 @@
+from dataclasses import dataclass
+
+
+@dataclass(frozen=True)
+class Scenario:
+    project: int
+    op_study: int
+    scenario: int
+    infra: int
+    timetable: int

tests/tests/test_pathfinding.py

@@ -1,12 +1,13 @@
+from .scenario import Scenario
 from .services import API_URL
 from .utils.simulation import _get_waypoints_dummy_infra, run_pathfinding
 
 
-def test_pathfinding_small_infra(small_scenario):
+def test_pathfinding_small_infra(small_scenario: Scenario):
     run_pathfinding(
         API_URL, small_scenario.infra, [{"track_section": "TE1", "offset": 0}, {"track_section": "TE0", "offset": 0}]
     )
 
 
-def test_pathfinding_dummy_infra(dummy_scenario):
+def test_pathfinding_dummy_infra(dummy_scenario: Scenario):
     run_pathfinding(API_URL, dummy_scenario.infra, _get_waypoints_dummy_infra(API_URL, dummy_scenario.infra))

tests/tests/test_rtk_sync.py

@@ -1,7 +1,7 @@
 import subprocess
 from pathlib import Path
 
-FRONT_FOLDER = Path(__file__).parent.parent.parent / "front"
+FRONT_FOLDER = Path(__file__).parents[2] / "front"
 MIDDLEWARE_FOLDER = FRONT_FOLDER / "src" / "common" / "api"
 MIDDLEWARE_FILES = {
     "api": MIDDLEWARE_FOLDER / "osrdEditoastApi.ts",

tests/tests/test_simulation.py

@@ -1,6 +1,7 @@
+from .scenario import Scenario
 from .services import API_URL
 from .utils.simulation import run_simulation
 
 
-def test_dummy_simulation(dummy_scenario):
+def test_dummy_simulation(dummy_scenario: Scenario):
     run_simulation(API_URL, dummy_scenario)

tests/tests/test_stdcm.py

@@ -7,12 +7,13 @@
     delete_project,
 )
 
+from .scenario import Scenario
 from .services import API_URL
 from .utils.simulation import _get_rolling_stock_id
 from .utils.stdcm import add_train
 
 
-def test_empty_timetable(small_scenario):
+def test_empty_timetable(small_scenario: Scenario):
     infra_id = small_scenario.infra
     project = create_project(API_URL)
     op_study = create_op_study(API_URL, project)
@@ -32,7 +33,7 @@ def test_empty_timetable(small_scenario):
         raise RuntimeError(f"STDCM error {r.status_code}: {r.content}")
 
 
-def test_between_trains(small_scenario):
+def test_between_trains(small_scenario: Scenario):
     start = {"track_section": "TE1", "offset": 0}
     stop = {"track_section": "TE0", "offset": 0}
     add_train(API_URL, small_scenario, start, stop, 0)

tests/tests/test_timetable.py

@@ -1,9 +1,10 @@
 import requests
 
+from .scenario import Scenario
 from .services import API_URL
 
 
-def test_get_timetable(dummy_scenario):
+def test_get_timetable(dummy_scenario: Scenario):
     r = requests.get(
         API_URL
         + f"projects/{dummy_scenario.project}/studies/{dummy_scenario.op_study}/scenarios/{dummy_scenario.scenario}/"

tests/tests/test_train_schedule.py

@@ -1,10 +1,11 @@
 import requests
 
+from .scenario import Scenario
 from .services import API_URL
 from .utils.simulation import run_simulation, update_simulation_with_mareco_allowances
 
 
-def test_get_and_update_schedule_result(dummy_scenario):
+def test_get_and_update_schedule_result(dummy_scenario: Scenario):
     schedule_id = run_simulation(API_URL, dummy_scenario)
     response = requests.get(f"{API_URL}train_schedule/{schedule_id}/result/")
     if response.status_code // 100 != 2: