update tests

haddocking · Apr 22, 2024 · 012d613 · 012d613
1 parent 870ac48
commit 012d613
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 23 deletions.
diff --git a/tests/test_consadjust_regression.py b/tests/test_consadjust_regression.py
@@ -7,7 +7,6 @@
 import pytest
 
 from . import GOLDEN_DATA_PATH
-from whiscy.modules import PARAM_PATH
 
 env = os.environ.copy()
 env["PYTHONPATH"] = str(
@@ -24,16 +23,6 @@ def cons_file():
     return Path(GOLDEN_DATA_PATH, "regression_consadjust", "2SNIE.cons")
 
 
-@pytest.fixture
-def weight_ma_file():
-    return Path(PARAM_PATH, "weight_ma.txt")
-
-
-@pytest.fixture
-def ztable_file():
-    return Path(PARAM_PATH, "ztable.txt")
-
-
 @pytest.fixture
 def acons_file():
     return Path(GOLDEN_DATA_PATH, "regression_consadjust", "2SNIE.acons")
@@ -48,12 +37,12 @@ def acons_file():
 @pytest.mark.parametrize(
     "scratch_path", ["scratch_regression_consadjust"], indirect=True
 )
-def test_regression_consadjust2SNIE(
-    scratch_path, cons_file, weight_ma_file, ztable_file, acons_file
-):
+def test_regression_consadjust2SNIE(scratch_path, cons_file, acons_file):
 
     test_prediction_output = Path(scratch_path, "test.prediction")
-    cmd_line = f"{sys.executable} {CONSADJUST_BIN} {cons_file} {weight_ma_file} {ztable_file} -o {test_prediction_output}"
+    cmd_line = (
+        f"{sys.executable} {CONSADJUST_BIN} {cons_file} -o {test_prediction_output}"
+    )
 
     result = subprocess.run(
         cmd_line.split(),

diff --git a/tests/test_parasmooth_regression.py b/tests/test_parasmooth_regression.py
@@ -7,7 +7,6 @@
 import pytest
 
 from . import GOLDEN_DATA_PATH
-from whiscy.modules import PARAM_PATH
 
 PARASMOOTH_BIN = Path(
     Path(__file__).parent.parent, "src", "whiscy", "cli_parasmooth.py"
@@ -34,11 +33,6 @@ def rd_file():
     return Path(GOLDEN_DATA_PATH, "regression_parasmooth", "2SNIE.rd")
 
 
-@pytest.fixture
-def par_file():
-    return Path(PARAM_PATH, "parasmooth.par")
-
-
 @pytest.fixture
 def prediction_file():
     return Path(GOLDEN_DATA_PATH, "regression_parasmooth", "2SNIE.parasmooth")
@@ -53,12 +47,11 @@ def test_regression_2SNIE(
     acons_file,
     lcons_file,
     rd_file,
-    par_file,
     prediction_file,
 ):
 
     test_prediction_output = Path(scratch_path, "test.prediction")
-    cmd_line = f"{sys.executable} {PARASMOOTH_BIN} {acons_file} {lcons_file} {rd_file} {par_file} -o {test_prediction_output}"
+    cmd_line = f"{sys.executable} {PARASMOOTH_BIN} {acons_file} {lcons_file} {rd_file} -o {test_prediction_output}"
 
     result = subprocess.run(
         cmd_line.split(),