x/vmware-nsx
Code Issues Proposed changes

Merge "Use renamed _fail_second_call() in cisco nexus tests"

Browse Source
This commit is contained in:
Jenkins 2014-09-12 17:32:49 +00:00 committed by Gerrit Code Review
commit 29c37fc2ad
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
neutron/tests/unit/ml2/drivers/cisco/nexus/test_cisco_mech.py
View File

@ -305,8 +305,8 @@ class TestCiscoPortsV2(CiscoML2MechanismTestCase,
'create_port') as patched_plugin:
def side_effect(*args, **kwargs):
return self._do_side_effect(patched_plugin, orig,
*args, **kwargs)
return self._fail_second_call(patched_plugin, orig,
*args, **kwargs)
patched_plugin.side_effect = side_effect
with self.network() as net:
@ -339,8 +339,8 @@ class TestCiscoPortsV2(CiscoML2MechanismTestCase,
'create_port') as patched_plugin:
def side_effect(*args, **kwargs):
return self._do_side_effect(patched_plugin, orig,
*args, **kwargs)
return self._fail_second_call(patched_plugin, orig,
*args, **kwargs)
patched_plugin.side_effect = side_effect
res = self._create_port_bulk(self.fmt, 2, net['network']['id'],
@ -680,8 +680,8 @@ class TestCiscoNetworksV2(CiscoML2MechanismTestCase,
with mock.patch.object(plugin_obj,
'create_network') as patched_plugin:
def side_effect(*args, **kwargs):
return self._do_side_effect(patched_plugin, orig,
*args, **kwargs)
return self._fail_second_call(patched_plugin, orig,
*args, **kwargs)
patched_plugin.side_effect = side_effect
res = self._create_network_bulk(self.fmt, 2, 'test', True)
LOG.debug("response is %s" % res)
@ -700,8 +700,8 @@ class TestCiscoNetworksV2(CiscoML2MechanismTestCase,
'create_network') as patched_plugin:
def side_effect(*args, **kwargs):
return self._do_side_effect(patched_plugin, orig,
*args, **kwargs)
return self._fail_second_call(patched_plugin, orig,
*args, **kwargs)
patched_plugin.side_effect = side_effect
res = self._create_network_bulk(self.fmt, 2, 'test', True)
@ -732,8 +732,8 @@ class TestCiscoSubnetsV2(CiscoML2MechanismTestCase,
'create_subnet') as patched_plugin:
def side_effect(*args, **kwargs):
self._do_side_effect(patched_plugin, orig,
*args, **kwargs)
self._fail_second_call(patched_plugin, orig,
*args, **kwargs)
patched_plugin.side_effect = side_effect
with self.network() as net:
@ -754,8 +754,8 @@ class TestCiscoSubnetsV2(CiscoML2MechanismTestCase,
with mock.patch.object(plugin_obj,
'create_subnet') as patched_plugin:
def side_effect(*args, **kwargs):
return self._do_side_effect(patched_plugin, orig,
*args, **kwargs)
return self._fail_second_call(patched_plugin, orig,
*args, **kwargs)
patched_plugin.side_effect = side_effect
with self.network() as net: