x/vmware-nsx
Code Issues Proposed changes

Remove work-around for failed l3 test

Browse Source 
Since upstream neutron fix is merged now
(https://review.openstack.org/#/c/354951/),
we can safely remove the work-around for  the failed test
test_router_add_interface_delete_port_after_failure.

Change-Id: I0ce1d7486c61ad76c01c8f44470a8574126c6557
This commit is contained in:
Shih-Hao Li 2016-08-19 12:20:26 -07:00 committed by garyk
parent 4be367da5d
commit ccac373c0e
1 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
vmware_nsx/tests/unit/nsx_v/test_plugin.py
View File

@ -2498,23 +2498,6 @@ class TestExclusiveRouterTestCase(L3NatTest, L3NatTestCaseBase,
for k, v in expected:
self.assertEqual(net['network'][k], v)
def test_router_add_interface_delete_port_after_failure(self):
# Clone the same function in neutron/tests/unit/extensions/test_l3.py,
# but change self.subnet() to self.subnet(enable_dhcp=False).
with self.router() as r, self.subnet(enable_dhcp=False) as s:
plugin = manager.NeutronManager.get_plugin()
# inject a failure in the update port that happens at the end
# to ensure the port gets deleted
with mock.patch.object(
plugin, 'update_port',
side_effect=n_exc.InvalidInput(error_message='x')):
self._router_interface_action('add',
r['router']['id'],
s['subnet']['id'],
None,
webob.exc.HTTPBadRequest.code)
self.assertFalse(plugin.get_ports(context.get_admin_context()))
def test_create_router_fail_at_the_backend(self):
p = manager.NeutronManager.get_plugin()
edge_manager = p.edge_manager
@ -3326,23 +3309,6 @@ class TestVdrTestCase(L3NatTest, L3NatTestCaseBase,
def test_floatingip_same_external_and_internal(self):
self.skipTest('skipped')
def test_router_add_interface_delete_port_after_failure(self):
# Clone the same function in neutron/tests/unit/extensions/test_l3.py,
# but change self.subnet() to self.subnet(enable_dhcp=False).
with self.router() as r, self.subnet(enable_dhcp=False) as s:
plugin = manager.NeutronManager.get_plugin()
# inject a failure in the update port that happens at the end
# to ensure the port gets deleted
with mock.patch.object(
plugin, 'update_port',
side_effect=n_exc.InvalidInput(error_message='x')):
self._router_interface_action('add',
r['router']['id'],
s['subnet']['id'],
None,
webob.exc.HTTPBadRequest.code)
self.assertFalse(plugin.get_ports(context.get_admin_context()))
def test_create_router_fail_at_the_backend(self):
p = manager.NeutronManager.get_plugin()
edge_manager = p.edge_manager