From c9c7a37498db84b0b7f211c3f3e1ea4535b7cc12 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Mon, 13 Mar 2017 15:29:32 +0000
Subject: [PATCH] Task #10473: Typo fixes to get initial implementation working
---
LCS/PyServiceSkeleton/lib/serviceskeleton.py | 4 ++--
LCS/PyServiceSkeleton/test/t_serviceskeleton.py | 2 +-
LCS/PyServiceSkeleton/test/t_serviceskeleton_rpc.py | 8 +++-----
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/LCS/PyServiceSkeleton/lib/serviceskeleton.py b/LCS/PyServiceSkeleton/lib/serviceskeleton.py
index f8e9d3a7c62..6a2914bbca2 100644
--- a/LCS/PyServiceSkeleton/lib/serviceskeleton.py
+++ b/LCS/PyServiceSkeleton/lib/serviceskeleton.py
@@ -17,14 +17,14 @@ class ServiceSkeletonHandler(MessageHandlerInterface):
super(ServiceSkeletonHandler, self).__init__(**kwargs)
self.service2MethodMap = {
- 'ExampleFunction': self._exampleFunction,
+ 'ExampleFunction': self.example_function,
}
def prepare_loop(self):
""" Tread-local initialisation. """
pass
- def _exampleFunction(self, arg1):
+ def example_function(self, arg1):
""" Example service call. """
return { "result": True, "arg1": arg1 }
diff --git a/LCS/PyServiceSkeleton/test/t_serviceskeleton.py b/LCS/PyServiceSkeleton/test/t_serviceskeleton.py
index 1b5780a88c4..f7f652504b8 100755
--- a/LCS/PyServiceSkeleton/test/t_serviceskeleton.py
+++ b/LCS/PyServiceSkeleton/test/t_serviceskeleton.py
@@ -22,7 +22,7 @@ import unittest
from lofar.lcs.serviceskeleton.serviceskeleton import ServiceSkeletonHandler
-class ServiceSkeletonHandler(unittest.TestCase):
+class TestServiceSkeletonHandler(unittest.TestCase):
def setUp(self):
""" Per-test setup. """
diff --git a/LCS/PyServiceSkeleton/test/t_serviceskeleton_rpc.py b/LCS/PyServiceSkeleton/test/t_serviceskeleton_rpc.py
index a8cd7732b26..f04c7f904c7 100755
--- a/LCS/PyServiceSkeleton/test/t_serviceskeleton_rpc.py
+++ b/LCS/PyServiceSkeleton/test/t_serviceskeleton_rpc.py
@@ -23,20 +23,18 @@ import mock
import uuid
from lofar.lcs.serviceskeleton.config import DEFAULT_SERVICENAME, DEFAULT_BUSNAME
-from lofar.lcs.serviceskeleton.skeletonservice_rpc import SkeletonServiceRPC
+from lofar.lcs.serviceskeleton.serviceskeleton_rpc import ServiceSkeletonRPC
from qpid.messaging.message import Message as QpidMessage
class TestServiceSkeletonRPC(unittest.TestCase):
- message_id = str(uuid.uuid4())
-
message_properties={
"SystemName": "LOFAR",
"MessageType": "ReplyMessage",
"MessageId": str(uuid.uuid4()),
"status": "OK"
- })
+ }
def setUp(self):
# the mock library had difficulty to mock ToBus and FromBus probably to some weir naming issue.
@@ -56,7 +54,7 @@ class TestServiceSkeletonRPC(unittest.TestCase):
def test_project_details_query(self, qpid_mock):
self.receiver_mock.fetch.return_value = QpidMessage(
{ "result": True, "arg1": "foo" },
- properties=message_properties)
+ properties=self.message_properties)
self.install_mock(qpid_mock)
--
GitLab