use conftest for fixtures, fixing all flake8 warnings

ModischFabrications · Apr 10, 2024 · 06cdf82 · 06cdf82
1 parent 143f34d
commit 06cdf82
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 5 deletions.
diff --git a/tests/test_fixtures.py → tests/conftest.py b/tests/test_fixtures.py → tests/conftest.py
@@ -6,6 +6,8 @@
 from app.solver.data.Result import Result
 
 
+# conftest.py is a magic pytest file for fixtures that is imported automatically
+
 def load_json(json_path: Path):
     assert json_path.exists()
 

diff --git a/tests/solver/data/test_Job.py b/tests/solver/data/test_Job.py
@@ -2,7 +2,6 @@
 
 from app.solver.data.Job import Job, INS, NS
 from app.solver.data.Job import QNS
-from tests.test_fixtures import testjob_s
 
 
 def test_constructor():

diff --git a/tests/solver/data/test_Result.py b/tests/solver/data/test_Result.py
@@ -2,7 +2,6 @@
 
 from app.solver.data.Job import NS
 from app.solver.data.Result import Result, SolverType, ResultEntry
-from tests.test_fixtures import testjob_s
 
 
 def test_constructor(testjob_s):

diff --git a/tests/solver/test_multi.py b/tests/solver/test_multi.py
@@ -5,7 +5,7 @@
 from app.solver.data.Job import Job, QNS, INS, NS
 from app.solver.data.Result import Result, ResultEntry
 from app.solver.solver import _solve_bruteforce, _solve_FFD, _solve_gapfill
-from tests.test_fixtures import load_json
+from tests.conftest import load_json
 
 
 def test_job_from_json():

diff --git a/tests/solver/test_solver.py b/tests/solver/test_solver.py
@@ -9,7 +9,7 @@
     _solve_gapfill,
     _solve_FFD, solve,
 )
-from tests.test_fixtures import load_json, testjob_s
+from tests.conftest import load_json
 
 
 @pytest.mark.parametrize("solver", [_solve_bruteforce, _solve_FFD, _solve_gapfill])

diff --git a/tests/test_main.py b/tests/test_main.py
@@ -5,7 +5,6 @@
 
 from app.main import app
 from app.solver.data.Result import Result
-from tests.test_fixtures import testjob_s, testresult_s
 
 client: TestClient = TestClient(app)