openstack
/
neutron
Code Issues Proposed changes

Merge "Fix test tautology for DVR"

changes/15/161815/1
Jenkins 2015-03-05 17:49:47 +00:00 committed by Gerrit Code Review
parent a8873dc8d6 ccbabbeebf
commit 56967bd950
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
neutron/tests/unit/db/test_l3_dvr_db.py
View File

@ -159,15 +159,16 @@ class L3DvrTestCase(testlib_api.SqlTestCase):
with mock.patch.object(manager.NeutronManager, 'get_plugin') as gp:
plugin = mock.Mock()
gp.return_value = plugin
plugin.get_ports.return_value = [port]
plugin.assertRaises(l3.L3PortInUse,
plugin.delete_port,
self.ctx,
'my_port_id')
plugin._get_port.return_value = port
self.assertRaises(l3.L3PortInUse,
self.mixin.prevent_l3_port_deletion,
self.ctx,
port['id'])
def test_prevent_delete_floatingip_agent_gateway_port(self):
port = {
'id': 'my_port_id',
'fixed_ips': mock.ANY,
'device_owner': l3_const.DEVICE_OWNER_AGENT_GW
}
self._test_prepare_direct_delete_dvr_internal_ports(port)
@ -175,6 +176,7 @@ class L3DvrTestCase(testlib_api.SqlTestCase):
def test_prevent_delete_csnat_port(self):
port = {
'id': 'my_port_id',
'fixed_ips': mock.ANY,
'device_owner': l3_const.DEVICE_OWNER_ROUTER_SNAT
}
self._test_prepare_direct_delete_dvr_internal_ports(port)