Merge pull request #26 from jzuhone/pytest_refactor

Refactor tests to match new signature
acisops · Oct 23, 2020 · ea3f8ba · ea3f8ba
2 parents 2db6f5d + 36eafea
commit ea3f8ba
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 18 deletions.
diff --git a/dpa_check/tests/test_dpa_acis.py b/dpa_check/tests/test_dpa_acis.py
@@ -3,22 +3,23 @@
     RegressionTester, all_loads
 import pytest
 
-dpa_rt = RegressionTester(DPACheck, model_path, "dpa_test_spec.json")
 
-# ACIS state builder tests
-
-dpa_rt.run_models(state_builder='acis')
+@pytest.fixture(autouse=True, scope='module')
+def dpa_rt(test_root):
+    # ACIS state builder tests
+    rt = RegressionTester(DPACheck, model_path, "dpa_test_spec.json",
+                          test_root=test_root, sub_dir='acis')
+    rt.run_models(state_builder='acis')
+    return rt
 
 # Prediction tests
 
-
 @pytest.mark.parametrize('load', all_loads)
-def test_prediction(answer_store, load):
+def test_prediction(dpa_rt, answer_store, load):
     dpa_rt.run_test("prediction", load, answer_store=answer_store)
 
 # Validation tests
 
-
 @pytest.mark.parametrize('load', all_loads)
-def test_validation(answer_store, load):
+def test_validation(dpa_rt, answer_store, load):
     dpa_rt.run_test("validation", load, answer_store=answer_store)
diff --git a/dpa_check/tests/test_dpa_sql.py b/dpa_check/tests/test_dpa_sql.py
@@ -3,17 +3,19 @@
     RegressionTester, all_loads
 import pytest
 
-dpa_rt = RegressionTester(DPACheck, model_path, "dpa_test_spec.json")
 
-# SQL state builder tests
-
-dpa_rt.run_models(state_builder='sql')
+@pytest.fixture(autouse=True, scope='module')
+def dpa_rt(test_root):
+    # ACIS state builder tests
+    rt = RegressionTester(DPACheck, model_path, "dpa_test_spec.json",
+                          test_root=test_root, sub_dir='sql')
+    rt.run_models(state_builder='sql')
+    return rt
 
 # Prediction tests
 
-
 @pytest.mark.parametrize('load', all_loads)
-def test_prediction(answer_store, load):
+def test_prediction(dpa_rt, answer_store, load):
     if not answer_store:
         dpa_rt.run_test("prediction", load)
     else:
@@ -23,7 +25,7 @@ def test_prediction(answer_store, load):
 
 
 @pytest.mark.parametrize('load', all_loads)
-def test_validation(answer_store, load):
+def test_validation(dpa_rt, answer_store, load):
     if not answer_store:
         dpa_rt.run_test("validation", load)
     else:

diff --git a/dpa_check/tests/test_dpa_viols.py b/dpa_check/tests/test_dpa_viols.py
@@ -3,11 +3,11 @@
     RegressionTester
 import os
 
-dpa_rt = RegressionTester(DPACheck, model_path, "dpa_test_spec.json")
 
-
-def test_JUL3018A_viols(answer_store):
+def test_JUL3018A_viols(answer_store, test_root):
     answer_data = os.path.join(os.path.dirname(__file__), "answers",
                                "JUL3018A_viol.json")
+    dpa_rt = RegressionTester(DPACheck, model_path, "dpa_test_spec.json",
+                              test_root=test_root, sub_dir='viols')
     dpa_rt.check_violation_reporting("JUL3018A", answer_data,
                                      answer_store=answer_store)