x/vmware-nsx
Code Issues Proposed changes

Merge "BigSwitch: Stop HTTP patch before overriding"

Browse Source
This commit is contained in:
Jenkins 2014-04-08 06:14:06 +00:00 committed by Gerrit Code Review
commit 884478eebc
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/tests/unit/bigswitch/test_capabilities.py
View File

@ -72,6 +72,8 @@ class CapabilitiesTests(test_router_db.RouterDBTestBase):
# perform a task to cause capabilities to be retrieved # perform a task to cause capabilities to be retrieved
with self.floatingip_with_assoc(): with self.floatingip_with_assoc():
pass pass
# stop default HTTP patch since we need a magicmock
self.httpPatch.stop()
# now mock HTTP class instead of REST so we can see headers # now mock HTTP class instead of REST so we can see headers
conmock = mock.patch(HTTPCON).start() conmock = mock.patch(HTTPCON).start()
instance = conmock.return_value instance = conmock.return_value

4
neutron/tests/unit/bigswitch/test_router_db.py
View File

@ -39,7 +39,7 @@ from neutron.tests.unit import test_extension_extradhcpopts as test_extradhcp
from neutron.tests.unit import test_l3_plugin from neutron.tests.unit import test_l3_plugin
HTTPCON = 'neutron.plugins.bigswitch.servermanager.httplib.HTTPConnection' HTTPCON = 'neutron.plugins.bigswitch.servermanager.HTTPConnection'
_uuid = uuidutils.generate_uuid _uuid = uuidutils.generate_uuid
@ -171,6 +171,7 @@ class RouterDBTestCase(RouterDBTestBase,
net_id=psub['subnet']['network_id'], net_id=psub['subnet']['network_id'],
port_id=p1['port']['id'], port_id=p1['port']['id'],
tenant_id=tenant1_id) tenant_id=tenant1_id)
self.httpPatch.stop()
multiFloatPatch = patch( multiFloatPatch = patch(
HTTPCON, HTTPCON,
new=fake_server.VerifyMultiTenantFloatingIP) new=fake_server.VerifyMultiTenantFloatingIP)
@ -180,6 +181,7 @@ class RouterDBTestCase(RouterDBTestBase,
port_id=p2['port']['id'], port_id=p2['port']['id'],
tenant_id=tenant2_id) tenant_id=tenant2_id)
multiFloatPatch.stop() multiFloatPatch.stop()
self.httpPatch.start()
self._delete('floatingips', fl1['floatingip']['id']) self._delete('floatingips', fl1['floatingip']['id'])
self._delete('floatingips', fl2['floatingip']['id']) self._delete('floatingips', fl2['floatingip']['id'])
self._router_interface_action( self._router_interface_action(