From: Eugene Nikanorov <enikanorov@mirantis.com>
Date: Thu, 25 Jul 2013 20:45:10 +0000 (+0400)
Subject: Fix l3_agent unit tests
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=0f4f3150f4c2a2bba8712e3439a02337eb726a2b;p=openstack-build%2Fneutron-build.git

Fix l3_agent unit tests

Mock FixedIntervalLoopingCall in unit tests so
_rpc_loop doesn't interfere with the tests

fixes bug 1205085

Change-Id: I54cc152890734afc7a5b86dd9ae4ea133bd7574b
---

diff --git a/neutron/tests/unit/test_l3_agent.py b/neutron/tests/unit/test_l3_agent.py
index d2da8979d..2f9cb52bb 100644
--- a/neutron/tests/unit/test_l3_agent.py
+++ b/neutron/tests/unit/test_l3_agent.py
@@ -77,14 +77,11 @@ class TestBasicRouterOperations(base.BaseTestCase):
         self.plugin_api = mock.Mock()
         l3pluginApi_cls.return_value = self.plugin_api
 
-    def tearDown(self):
-        self.device_exists_p.stop()
-        self.l3pluginApi_cls_p.stop()
-        self.ip_cls_p.stop()
-        self.dvr_cls_p.stop()
-        self.utils_exec_p.stop()
-        self.external_process_p.stop()
-        super(TestBasicRouterOperations, self).tearDown()
+        self.looping_call_p = mock.patch(
+            'neutron.openstack.common.loopingcall.FixedIntervalLoopingCall')
+        self.looping_call_p.start()
+
+        self.addCleanup(mock.patch.stopall)
 
     def testRouterInfoCreate(self):
         id = _uuid()