Create public function to get workflow jobs

equinor · Sep 3, 2020 · a05ecf3 · a05ecf3
1 parent d59e751
commit a05ecf3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/ert_shared/plugins/plugin_manager.py b/ert_shared/plugins/plugin_manager.py
@@ -127,8 +127,8 @@ def _site_config_lines(self):
         return list(chain.from_iterable(reversed(plugin_site_config_lines)))
 
     @python3only
-    def _get_workflow_jobs(self):
-        config_workflow_jobs = self._get_installable_workflow_jobs()
+    def get_installable_workflow_jobs(self):
+        config_workflow_jobs = self._get_config_workflow_jobs()
         hooked_workflow_jobs = self.get_ertscript_workflows().get_workflows()
         installable_workflow_jobs = self._merge_internal_jobs(
             config_workflow_jobs, hooked_workflow_jobs
@@ -159,7 +159,7 @@ def get_site_config_content(self):
 
         site_config_lines.extend(install_job_lines + [""])
 
-        installable_workflow_jobs = self._get_workflow_jobs()
+        installable_workflow_jobs = self.get_installable_workflow_jobs()
 
         install_workflow_job_lines = [
             "LOAD_WORKFLOW_JOB {}".format(job_path)
@@ -213,7 +213,7 @@ def get_installable_jobs(self):
         return ErtPluginManager._merge_dicts(self.hook.installable_jobs())
 
     @python3only
-    def _get_installable_workflow_jobs(self):
+    def _get_config_workflow_jobs(self):
         return ErtPluginManager._merge_dicts(self.hook.installable_workflow_jobs())
 
     @python3only

diff --git a/tests/all/plugins/test_plugin_manager.py b/tests/all/plugins/test_plugin_manager.py
@@ -31,7 +31,7 @@ def test_no_plugins(self):
         self.assertIsNone(pm.get_rms_config_path())
 
         self.assertLess(0, len(pm.get_installable_jobs()))
-        self.assertLess(0, len(pm._get_installable_workflow_jobs()))
+        self.assertLess(0, len(pm._get_config_workflow_jobs()))
 
         self.assertListEqual(
             [
@@ -62,12 +62,10 @@ def test_with_plugins(self):
         self.assertIn(("job1", "/dummy/path/job1"), pm.get_installable_jobs().items())
         self.assertIn(("job2", "/dummy/path/job2"), pm.get_installable_jobs().items())
         self.assertIn(
-            ("wf_job1", "/dummy/path/wf_job1"),
-            pm._get_installable_workflow_jobs().items(),
+            ("wf_job1", "/dummy/path/wf_job1"), pm._get_config_workflow_jobs().items(),
         )
         self.assertIn(
-            ("wf_job2", "/dummy/path/wf_job2"),
-            pm._get_installable_workflow_jobs().items(),
+            ("wf_job2", "/dummy/path/wf_job2"), pm._get_config_workflow_jobs().items(),
         )
 
         self.assertListEqual(
@@ -108,7 +106,7 @@ def test_job_documentation(self):
     )
     def test_plugin_manager_python_2(self):
         pm = ErtPluginManager()
-        self.assertEqual(pm._get_installable_workflow_jobs(), None)
+        self.assertEqual(pm._get_config_workflow_jobs(), None)
         self.assertEqual(pm.get_installable_jobs(), None)
         self.assertEqual(pm.get_flow_config_path(), None)
         self.assertEqual(pm.get_ecl100_config_path(), None)
@@ -128,7 +126,7 @@ def test_workflows_merge(monkeypatch, tmpdir):
     tempfile_mock = Mock(return_value=tmpdir)
     monkeypatch.setattr(tempfile, "mkdtemp", tempfile_mock)
     pm = ErtPluginManager(plugins=[dummy_plugins])
-    result = pm._get_workflow_jobs()
+    result = pm.get_installable_workflow_jobs()
     assert result == expected_result