x/vmware-nsx
Code Issues Proposed changes

Fix dangling patches in Cisco and Midonet tests

Browse Source 
Cisco Nexus Tests:
Explicitly stops the patch to sys.modules immediately
after use to fix sporadic failures caused by the patch
not being handled correctly by mock.patch.stopall.

Midonet Interface Test:
Removes the double-patch of the 'device_exists' method
in ip_lib.

Closes-Bug: #1307025
Closes-Bug: #1307038
Change-Id: Ie22505bb8e406a61e40819d60c76d229916a6e01
This commit is contained in:
Kevin Benton 2014-04-12 21:27:36 +00:00
parent 91facb2b36
commit f6d1087f5f
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
neutron/tests/unit/cisco/test_nexus_plugin.py
View File

@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import contextlib
import mock import mock
from oslo.config import cfg from oslo.config import cfg
@ -148,12 +149,12 @@ class TestCiscoNexusPlugin(base.BaseTestCase):
self.addCleanup(db.clear_db) self.addCleanup(db.clear_db)
# Use a mock netconf client # Use a mock netconf client
self.mock_ncclient = mock.Mock() self.mock_ncclient = mock.Mock()
self.patch_obj = mock.patch.dict('sys.modules',
{'ncclient': self.mock_ncclient})
self.patch_obj.start()
with mock.patch.object(cisco_nexus_plugin_v2.NexusPlugin, with contextlib.nested(
'__init__', new=new_nexus_init): mock.patch.dict('sys.modules', {'ncclient': self.mock_ncclient}),
mock.patch.object(cisco_nexus_plugin_v2.NexusPlugin,
'__init__', new=new_nexus_init)
):
self._cisco_nexus_plugin = cisco_nexus_plugin_v2.NexusPlugin() self._cisco_nexus_plugin = cisco_nexus_plugin_v2.NexusPlugin()
# Set the Cisco config module's first configured device IP address # Set the Cisco config module's first configured device IP address

2
neutron/tests/unit/test_linux_interface.py
View File

@ -515,8 +515,6 @@ class TestMidonetInterfaceDriver(TestBase):
self.conf = config.setup_conf() self.conf = config.setup_conf()
self.conf.register_opts(interface.OPTS) self.conf.register_opts(interface.OPTS)
config.register_root_helper(self.conf) config.register_root_helper(self.conf)
self.device_exists_p = mock.patch.object(ip_lib, 'device_exists')
self.device_exists = self.device_exists_p.start()
self.driver = interface.MidonetInterfaceDriver(self.conf) self.driver = interface.MidonetInterfaceDriver(self.conf)
self.network_id = uuidutils.generate_uuid() self.network_id = uuidutils.generate_uuid()
self.port_id = uuidutils.generate_uuid() self.port_id = uuidutils.generate_uuid()