From 60bc3d8318f637d66b07730197ea063dc1d4cc2a Mon Sep 17 00:00:00 2001
From: "Janet L. Goldstein" <jgoldste@nrao.edu>
Date: Thu, 16 Sep 2021 08:17:24 -0600
Subject: [PATCH] WS-651: lose unneeded methods; fix variable names; clarify
pydoc comments
---
shared/workspaces/test/test_capability_service.py | 4 ++--
.../workspaces/capability/services/capability_service.py | 7 +++----
.../workspaces/capability/services/interfaces.py | 8 +-------
3 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/shared/workspaces/test/test_capability_service.py b/shared/workspaces/test/test_capability_service.py
index 16314b3a5..b8913b91b 100644
--- a/shared/workspaces/test/test_capability_service.py
+++ b/shared/workspaces/test/test_capability_service.py
@@ -17,7 +17,7 @@ pytest_plugins = ["testing.utils.conftest"]
class TestCapabilityService:
"""Tests for CapabilityService methods"""
- @pytest.mark.skip("Broken due to queue/messenger rework")
+ @pytest.mark.skip("Broken due to queue/messenger rework. Does work in local `make test`")
def test_on_ingestion_complete(
self,
mock_capability_service: CapabilityService,
@@ -42,7 +42,7 @@ class TestCapabilityService:
(request,) = mock_capability_info.save_entity.call_args.args
assert request.ingested is True
- @pytest.mark.skip("As above, broken due to queue/messenger rework?")
+ @pytest.mark.skip("As above, broken due to queue/messenger rework? Succeeds locally; fails on CI")
def test_on_carta_ready(
self,
mock_capability_service: CapabilityService,
diff --git a/shared/workspaces/workspaces/capability/services/capability_service.py b/shared/workspaces/workspaces/capability/services/capability_service.py
index a0c05f22f..8714e9362 100644
--- a/shared/workspaces/workspaces/capability/services/capability_service.py
+++ b/shared/workspaces/workspaces/capability/services/capability_service.py
@@ -162,7 +162,7 @@ class CapabilityService(CapabilityServiceIF):
self.capability_info.save_entity(request)
@on_message(type="carta-ready")
- def on_carta_ready(self, wf_request_id: int, **message: Dict[str, str]):
+ def on_carta_ready(self, cp_request_id: int, **message: Dict[str, str]):
"""
Catch the RH-flavored event and save it to the capability request version metadata
@@ -171,9 +171,8 @@ class CapabilityService(CapabilityServiceIF):
"""
logger.info(f"RECEIVED CARTA READY MESSAGE: {message}")
- execution = self.capability_info.lookup_execution_by_workflow_request_id(wf_request_id)
- request = execution.capability_request
- request_version = request.current_version
+ execution = self.capability_info.lookup_execution_by_workflow_request_id(cp_request_id)
+ request_version = execution.version
request_version.workflow_metadata = {"carta_url": message["carta_url"]}
self.capability_info.save_entity(request_version)
diff --git a/shared/workspaces/workspaces/capability/services/interfaces.py b/shared/workspaces/workspaces/capability/services/interfaces.py
index 9005f9b95..48d20eebc 100644
--- a/shared/workspaces/workspaces/capability/services/interfaces.py
+++ b/shared/workspaces/workspaces/capability/services/interfaces.py
@@ -174,12 +174,6 @@ class CapabilityInfoIF(QueueReporterIF, metaclass=ABCMeta):
def lookup_execution(self, execution_id: int) -> CapabilityExecutionIF:
raise NotImplementedError
- @abstractmethod
- def lookup_execution_by_workflow_request_id(
- self, workflow_request_id: int
- ) -> CapabilityExecutionIF:
- raise NotImplementedError
-
@abstractmethod
def save_execution(self, execution: CapabilityExecutionIF):
pass
@@ -213,5 +207,5 @@ class CapabilityQueueIF(ABC):
class CapabilityServiceIF(ABC):
"""
- The capability service: clients access this to request capability runs. Just a phantom.
+ The capability service: clients access this to request capability runs.
"""
--
GitLab