Refactor TestRpcWorker and TestWorkerService

TestRpcWorker and TestWorkerService have a duplicate test_reset.
This patch introduces a base class from which tests for service
workers can inherit.

Change-Id: Ic4690c3b066b03c2fbb463f1329208ad1307d83d

diff --git a/neutron/tests/unit/test_service.py b/neutron/tests/unit/test_service.py
index 582449f5a3665805f742c39faeac023b79fb9d84..6b66245f5f36e25dddb508b084c1a154a35bf5d1 100644 (file)
--- a/neutron/tests/unit/test_service.py
+++ b/neutron/tests/unit/test_service.py
@@ -16,18 +16,12 @@
 import mock
 
 from neutron import service
-from neutron.tests import base
+from neutron.tests.unit import test_wsgi
 
 
-class TestRpcWorker(base.BaseTestCase):
+class TestRpcWorker(test_wsgi.TestServiceBase):
 
-    @mock.patch("neutron.policy.refresh")
-    @mock.patch("neutron.common.config.setup_logging")
-    def test_reset(self, setup_logging_mock, refresh_mock):
+    def test_reset(self):
         _plugin = mock.Mock()
-
         rpc_worker = service.RpcWorker(_plugin)
-        rpc_worker.reset()
-
-        setup_logging_mock.assert_called_once_with()
-        refresh_mock.assert_called_once_with()
+        self._test_reset(rpc_worker)

diff --git a/neutron/tests/unit/test_wsgi.py b/neutron/tests/unit/test_wsgi.py
index 3331f450f8014eb9be1d65a31e4f625b681523b0..68c3c64cf4a9a981e95381c3c62cbaf11f426fe5 100644 (file)
--- a/neutron/tests/unit/test_wsgi.py
+++ b/neutron/tests/unit/test_wsgi.py
@@ -50,7 +50,19 @@ def open_no_proxy(*args, **kwargs):
     return opener.open(*args, **kwargs)
 
 
-class TestWorkerService(base.BaseTestCase):
+class TestServiceBase(base.BaseTestCase):
+    """Service tests base."""
+
+    @mock.patch("neutron.policy.refresh")
+    @mock.patch("neutron.common.config.setup_logging")
+    def _test_reset(self, worker_service, setup_logging_mock, refresh_mock):
+        worker_service.reset()
+
+        setup_logging_mock.assert_called_once_with()
+        refresh_mock.assert_called_once_with()
+
+
+class TestWorkerService(TestServiceBase):
     """WorkerService tests."""
 
     @mock.patch('neutron.db.api.get_engine')
@@ -65,17 +77,12 @@ class TestWorkerService(base.BaseTestCase):
         workerservice.start()
         self.assertFalse(apimock.called)
 
-    @mock.patch("neutron.policy.refresh")
-    @mock.patch("neutron.common.config.setup_logging")
-    def test_reset(self, setup_logging_mock, refresh_mock):
+    def test_reset(self):
         _service = mock.Mock()
         _app = mock.Mock()
 
         worker_service = wsgi.WorkerService(_service, _app)
-        worker_service.reset()
-
-        setup_logging_mock.assert_called_once_with()
-        refresh_mock.assert_called_once_with()
+        self._test_reset(worker_service)
 
 
 class TestWSGIServer(base.BaseTestCase):