From 7012675db942fe03aba1be2e799f33f6246d6073 Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Wed, 27 Nov 2013 19:09:01 +0900 Subject: [PATCH] Mocking ryu plugin notifier in ryu plugin test Previously RPC notifier is not mocked in ryu plugin test and the plugin tries to send RPC notifications. It may interact with impl_fake RPC set up in previous tests by other plugin and sometimes leads to unexpected ovs-vsctl invoking. Change-Id: I11714a160faa4d3ded7f312c39afba0b426ccd8a Closes-Bug: #1255421 --- neutron/tests/unit/ryu/test_ryu_plugin.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/neutron/tests/unit/ryu/test_ryu_plugin.py b/neutron/tests/unit/ryu/test_ryu_plugin.py index 3bb854f98a..e0dfe283ee 100644 --- a/neutron/tests/unit/ryu/test_ryu_plugin.py +++ b/neutron/tests/unit/ryu/test_ryu_plugin.py @@ -13,6 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +import mock + +from neutron import manager from neutron.plugins.ryu.db import models_v2 as ryu_models_v2 # noqa from neutron.tests.unit.ryu import fake_ryu from neutron.tests.unit import test_db_plugin as test_plugin @@ -27,6 +30,8 @@ class RyuPluginV2TestCase(test_plugin.NeutronDbPluginV2TestCase): self.ryu_patcher.start() super(RyuPluginV2TestCase, self).setUp(self._plugin_name) self.addCleanup(self.ryu_patcher.stop) + plugin = manager.NeutronManager.get_plugin() + plugin.notifier = mock.Mock() class TestRyuBasicGet(test_plugin.TestBasicGet, RyuPluginV2TestCase):