From ada6e1b79e930a60d653fafcb980a4c0a38b5c07 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Wed, 27 Jan 2016 12:20:56 +0000
Subject: [PATCH] Task #8888: onMessage -> onTaskSpecified
---
SAS/ResourceAssignment/Services/src/RABusListener.py | 4 ++--
SAS/ResourceAssignment/Services/test/tRATaskSpecified.py | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/SAS/ResourceAssignment/Services/src/RABusListener.py b/SAS/ResourceAssignment/Services/src/RABusListener.py
index efa49c6172c..ff61518e26e 100644
--- a/SAS/ResourceAssignment/Services/src/RABusListener.py
+++ b/SAS/ResourceAssignment/Services/src/RABusListener.py
@@ -65,9 +65,9 @@ class RATaskSpecifiedBusListener(AbstractBusListener):
resource_indicators = msg.content['resource_indicators']
- self.onMessage(sasId, modificationTime, resource_indicators)
+ self.onTaskSpecified(sasId, modificationTime, resource_indicators)
- def onMessage(self, sasId, modificationTime, resourceIndicators):
+ def onTaskSpecified(self, sasId, modificationTime, resourceIndicators):
pass
__all__ = ["RATaskSpecifiedBusListener"]
diff --git a/SAS/ResourceAssignment/Services/test/tRATaskSpecified.py b/SAS/ResourceAssignment/Services/test/tRATaskSpecified.py
index a4919e79f57..b392cb382ea 100644
--- a/SAS/ResourceAssignment/Services/test/tRATaskSpecified.py
+++ b/SAS/ResourceAssignment/Services/test/tRATaskSpecified.py
@@ -117,7 +117,7 @@ class TestService(unittest.TestCase):
self.lock = Lock()
self.cond = Condition(self.lock)
- def onMessage(self, sasId, modificationTime, resourceIndicators):
+ def onTaskSpecified(self, sasId, modificationTime, resourceIndicators):
self.messageReceived = True
self.sasID = sasId
@@ -146,7 +146,7 @@ class TestService(unittest.TestCase):
3 requires nothing
"""
- with RATaskSpecified("TaskSpecified", otdb_busname=self.busname, my_busname=self.busname) as jts:
+ with RATaskSpecified("OTDB.TaskSpecified", otdb_busname=self.busname, my_busname=self.busname) as jts:
# Send fake status update
with ToBus(self.status_service) as tb:
msg = EventMessage(content={
@@ -177,7 +177,7 @@ class TestService(unittest.TestCase):
3 requires nothing
"""
- with RATaskSpecified("TaskSpecified", otdb_busname=self.busname, my_busname=self.busname) as jts:
+ with RATaskSpecified("OTDB.TaskSpecified", otdb_busname=self.busname, my_busname=self.busname) as jts:
# Send fake status update
with ToBus(self.status_service) as tb:
msg = EventMessage(content={
--
GitLab