diff --git a/python/ngen_cal/tests/conftest.py b/python/ngen_cal/tests/conftest.py index ad877706..64881ce9 100644 --- a/python/ngen_cal/tests/conftest.py +++ b/python/ngen_cal/tests/conftest.py @@ -151,12 +151,12 @@ def catchment(nexus, fabric, workdir, mocker) -> Generator[CalibrationCatchment, output = nexus._hydro_location.get_data().rename(columns={'value':'sim_flow'}) output.set_index('value_time', inplace=True) #Override the output property so it doesn't try to reload output each time - mocker.patch(__name__+'.EvaluatableCatchment.output', + mocker.patch('ngen.cal.calibration_cathment.EvaluatableCatchment.output', new_callable=mocker.PropertyMock, return_value = output ) #Disable output saving for testing purpose - mocker.patch(__name__+'.AdjustableCatchment.save_output', + mocker.patch('ngen.cal.calibration_cathment.AdjustableCatchment.save_output', return_value=None) id = 'tst-1' @@ -217,4 +217,4 @@ def explicit_catchments(nexus, fabric, workdir) -> Generator[ List[ CalibrationC id = f"tst-{i}" cat = CalibrationCatchment(workdir, id, nexus, start, end, fabric, 'Q_Out', eval_options, data) catchments.append(cat) - yield catchments \ No newline at end of file + yield catchments