From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 3 Mar 2015 23:12:37 +0000 (+0000)
Subject: Merge "Removing a router twice from the same agent shouldn't cause an error"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c9bd7f0dc8c82e908da3eab87189e682b8f7473e;p=openstack-build%2Fneutron-build.git

Merge "Removing a router twice from the same agent shouldn't cause an error"
---

c9bd7f0dc8c82e908da3eab87189e682b8f7473e
diff --cc neutron/tests/unit/ml2/test_ml2_plugin.py
index 1d46c172b,5dec58e49..22f76e4bc
--- a/neutron/tests/unit/ml2/test_ml2_plugin.py
+++ b/neutron/tests/unit/ml2/test_ml2_plugin.py
@@@ -505,13 -320,11 +504,10 @@@ class TestMl2DvrPortsV2(TestMl2PortsV2)
              mock.patch.object(manager.NeutronManager,
                                'get_service_plugins',
                                return_value=self.service_plugins),
 -            self.port(do_delete=False,
 -                      device_owner='compute:None'),
 +            self.port(device_owner='compute:None'),
              mock.patch.object(self.l3plugin, 'dvr_deletens_if_no_port',
                                return_value=[ns_to_delete]),
-             mock.patch.object(self.l3plugin, 'remove_router_from_l3_agent',
-                 side_effect=l3agentscheduler.RouterNotHostedByL3Agent(
-                             router_id=ns_to_delete['router_id'],
-                             agent_id=ns_to_delete['agent_id']))
+             mock.patch.object(self.l3plugin, 'remove_router_from_l3_agent')
          ) as (get_service_plugin, port, dvr_delns_ifno_port,
                remove_router_from_l3_agent):