Resolve issues caught by unittests

Author: andreas-el

src/ert/_c_wrappers/enkf/model_config.py

@@ -40,14 +40,10 @@ def __init__(
             else self.DEFAULT_HISTORY_SOURCE
         )
 
-        self.has_valid_runpath = False
-
         if runpath_format_string is None:
             self.runpath_format_string = self.DEFAULT_RUNPATH
-            self.has_valid_runpath = True
         elif "%d" in runpath_format_string:
             self.runpath_format_string = runpath_format_string
-            self.has_valid_runpath = True
             logger.warning(
                 "RUNPATH keyword should use syntax "
                 f"`{self.DEFAULT_RUNPATH}` "
@@ -109,9 +105,6 @@ def get_history_num_steps(self) -> int:
             return len(self.time_map)
         return 0
 
-    def is_valid_runpath(self) -> bool:
-        return self.has_valid_runpath
-
     def __repr__(self):
         return f"ModelConfig(\n{self}\n)"
 

src/ert/gui/tools/load_results/load_results_tool.py

@@ -14,7 +14,7 @@ def __init__(self, facade):
         )
         self.__import_widget = None
         self.__dialog = None
-        self.setEnabled(self.is_valid_run_path())
+        self.setEnabled(True)
 
     def trigger(self):
         if self.__import_widget is None:

src/ert/libres_facade.py

@@ -160,7 +160,12 @@ def have_observations(self) -> bool:
         return self._enkf_main.have_observations()
 
     def is_valid_runpath(self) -> bool:
-        return self._enkf_main.getModelConfig().is_valid_runpath()
+        iter_0_paths = set(self.get_run_paths([True] * self.get_ensemble_size(), 0))
+        iter_1_paths = set(self.get_run_paths([True] * self.get_ensemble_size(), 1))
+        return (
+            len(iter_0_paths) == self.get_ensemble_size()
+            and iter_0_paths != iter_1_paths
+        )
 
     @property
     def run_path(self) -> str:

tests/test_config_parsing/test_model_config.py

@@ -47,22 +47,19 @@ def test_default_model_config_ens_path(tmpdir):
 def test_default_model_config_run_path(tmpdir):
     mc = ModelConfig(num_realizations=1)
     assert mc.runpath_format_string == "simulations/realization-<IENS>/iter-<ITER>"
-    assert mc.is_valid_runpath()
 
 
 def test_invalid_model_config_run_path(tmpdir):
     mc = ModelConfig(
         num_realizations=1, runpath_format_string="realization-no-specifier"
     )
     assert mc.runpath_format_string == "realization-no-specifier"
-    assert not mc.is_valid_runpath()
 
 
 def test_deprecated_model_config_run_path(tmpdir):
     runpath = "simulations/realization-%d/iter-%d"
     mc = ModelConfig(num_realizations=1, runpath_format_string=runpath)
     assert mc.runpath_format_string == runpath
-    assert mc.is_valid_runpath()
 
 
 @given(config_generators())

tests/unit_tests/gui/test_gui_load.py

@@ -27,7 +27,6 @@ def fixture_patch_enkf_main(monkeypatch, tmp_path):
     mocked_enkf_main.getWorkflowList.return_value.getWorkflowNames.return_value = [
         "my_workflow"
     ]
-    mocked_enkf_main.getModelConfig.return_value.is_valid_runpath.return_value = True
 
     res_config_mock = Mock()
     type(res_config_mock).config_path = PropertyMock(return_value=tmp_path)

tests/unit_tests/gui/tools/test_case_tool.py

@@ -77,7 +77,7 @@ def test_that_case_tool_can_copy_case_state(qtbot):
 @pytest.mark.parametrize(
     "run_path, expected",
     [
-        ("valid_%d", True),
+        ("valid_%d", False),
         ("valid_%d/iter_%d", True),
         ("invalid", False),
     ],