From d88b72c275d9463cb7c1067f7c1a5a49482707d4 Mon Sep 17 00:00:00 2001
From: chausman <chausman@nrao.edu>
Date: Fri, 19 Feb 2021 10:58:46 -0700
Subject: [PATCH] tweaks to engine interface and testing skeleton (to be
flushed out next week)
---
.../workspaces/test/test_capability_engine.py | 19 +++++++++++++++++++
.../capability/services/capability_engine.py | 2 --
.../capability/services/interfaces.py | 5 ++++-
3 files changed, 23 insertions(+), 3 deletions(-)
create mode 100644 shared/workspaces/test/test_capability_engine.py
diff --git a/shared/workspaces/test/test_capability_engine.py b/shared/workspaces/test/test_capability_engine.py
new file mode 100644
index 000000000..59da7bcd9
--- /dev/null
+++ b/shared/workspaces/test/test_capability_engine.py
@@ -0,0 +1,19 @@
+from workspaces.capability.services.capability_info import CapabilityInfo
+from workspaces.capability.services.capability_engine import CapabilityEngine
+
+pytest_plugins = ["testing.utils.conftest"]
+
+"""
+Tests for CapabilityEngine
+"""
+
+def test_load_engine():
+ pass
+
+
+def test_execute():
+ pass
+
+
+def test_submit_workflow_request():
+ pass
diff --git a/shared/workspaces/workspaces/capability/services/capability_engine.py b/shared/workspaces/workspaces/capability/services/capability_engine.py
index b83427072..4aa361035 100644
--- a/shared/workspaces/workspaces/capability/services/capability_engine.py
+++ b/shared/workspaces/workspaces/capability/services/capability_engine.py
@@ -35,8 +35,6 @@ class CapabilityEngine(CapabilityEngineIF):
def execute(self):
"""
Communicate with workflow service and send a request to run a workflow with given settings
-
- :param execution:
"""
step_sequence = CapabilitySequence.from_str(self.execution.steps)
# Grab value of current step (workflow name)
diff --git a/shared/workspaces/workspaces/capability/services/interfaces.py b/shared/workspaces/workspaces/capability/services/interfaces.py
index 82fb5c7b4..89f2312ad 100644
--- a/shared/workspaces/workspaces/capability/services/interfaces.py
+++ b/shared/workspaces/workspaces/capability/services/interfaces.py
@@ -101,9 +101,12 @@ class CapabilityEngineIF(ABC):
"""
Executes a prepare and run workflow step of a capability
"""
+ @abstractmethod
+ def load_engine(self, execution: CapabilityExecutionIF):
+ pass
@abstractmethod
- def execute(self, execution: CapabilityExecutionIF):
+ def execute(self):
pass
@abstractmethod
--
GitLab