From: Kevin Benton <blak111@gmail.com>
Date: Tue, 8 Apr 2014 03:25:23 +0000 (-0700)
Subject: BigSwitch: Stop HTTP patch before overriding
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b12e38327af83f44cc8e38a23d16bb51a2346f57;p=openstack-build%2Fneutron-build.git

BigSwitch: Stop HTTP patch before overriding

Stops the default HTTPConnection patch used by the
Big Switch tests before patching HTTPConnection with
another substitution. This prevents mock from losing
track of the default patch which was resulting in it
not consistently being stopped by the stopall call in
cleanup.

This also corrects an incorrectly targeted mock for the
HTTP patch in one of the test files.

Closes-Bug: #1303605
Change-Id: Ia5b374c5f8d3a7905d915de4f1f8d4f3a6f0e58d
---

diff --git a/neutron/tests/unit/bigswitch/test_capabilities.py b/neutron/tests/unit/bigswitch/test_capabilities.py
index 2b694210c..5dc1f29de 100644
--- a/neutron/tests/unit/bigswitch/test_capabilities.py
+++ b/neutron/tests/unit/bigswitch/test_capabilities.py
@@ -72,6 +72,8 @@ class CapabilitiesTests(test_router_db.RouterDBTestBase):
             # perform a task to cause capabilities to be retrieved
             with self.floatingip_with_assoc():
                 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
         conmock = mock.patch(HTTPCON).start()
         instance = conmock.return_value
diff --git a/neutron/tests/unit/bigswitch/test_router_db.py b/neutron/tests/unit/bigswitch/test_router_db.py
index fa4ce2843..e5b24262e 100644
--- a/neutron/tests/unit/bigswitch/test_router_db.py
+++ b/neutron/tests/unit/bigswitch/test_router_db.py
@@ -39,7 +39,7 @@ from neutron.tests.unit import test_extension_extradhcpopts as test_extradhcp
 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
 
 
@@ -171,6 +171,7 @@ class RouterDBTestCase(RouterDBTestBase,
                         net_id=psub['subnet']['network_id'],
                         port_id=p1['port']['id'],
                         tenant_id=tenant1_id)
+                    self.httpPatch.stop()
                     multiFloatPatch = patch(
                         HTTPCON,
                         new=fake_server.VerifyMultiTenantFloatingIP)
@@ -180,6 +181,7 @@ class RouterDBTestCase(RouterDBTestBase,
                         port_id=p2['port']['id'],
                         tenant_id=tenant2_id)
                     multiFloatPatch.stop()
+                    self.httpPatch.start()
                     self._delete('floatingips', fl1['floatingip']['id'])
                     self._delete('floatingips', fl2['floatingip']['id'])
                     self._router_interface_action(