Merge "Add the rpc service and delete manager"

2 files changed, 49 insertions, 3 deletions

diff --git a/tests/unit/rpc/test_service.py b/tests/unit/rpc/test_service.py
new file mode 100644
index 0000000..7dc20d7
--- /dev/null
+++ b/tests/unit/rpc/test_service.py
@@ -0,0 +1,47 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from openstack.common.rpc import service
+from tests import utils
+
+
+class FakeService(service.Service):
+    """Fake manager for tests"""
+    def __init__(self, host, topic):
+        super(FakeService, self).__init__(host, topic, None)
+        self.method_result = 'manager'
+
+    def test_method(self):
+        return self.method_result
+
+
+class RpcServiceManagerTestCase(utils.BaseTestCase):
+    """Test cases for Services"""
+    def setUp(self):
+        super(RpcServiceManagerTestCase, self).setUp()
+        self.config(fake_rabbit=True)
+        self.config(rpc_backend='openstack.common.rpc.impl_fake')
+        self.config(verbose=True)
+        self.config(rpc_response_timeout=5)
+        self.config(rpc_cast_timeout=5)
+
+    def test_message_default(self):
+        serv = FakeService('test-host', 'test-topic')
+        serv.start()
+        self.assertEqual(serv.test_method(), 'manager')
+        serv.stop()
diff --git a/tests/unit/test_service.py b/tests/unit/test_service.py
index 91e9155..fce6b45 100644
--- a/tests/unit/test_service.py
+++ b/tests/unit/test_service.py
@@ -29,7 +29,6 @@ from eventlet import greenthread
 from openstack.common import cfg
 from openstack.common.gettextutils import _
 from openstack.common import log as logging
-from openstack.common import manager
 from openstack.common import service
 from tests import utils
 
@@ -45,7 +44,7 @@ class ExtendedService(service.Service):
 class ServiceManagerTestCase(utils.BaseTestCase):
     """Test cases for Services"""
     def test_override_manager_method(self):
-        serv = ExtendedService('test', None)
+        serv = ExtendedService()
         serv.start()
         self.assertEqual(serv.test_method(), 'service')
 
@@ -79,7 +78,7 @@ class ServiceLauncherTest(utils.BaseTestCase):
             status = 0
             try:
                 launcher = service.ProcessLauncher()
-                serv = ServiceWithTimer('test', None)
+                serv = ServiceWithTimer()
                 launcher.launch_service(serv, workers=self.workers)
                 launcher.wait()
             except SystemExit as exc: