x/vmware-nsx
Code Issues Proposed changes

Merge "Mock out tunnel_sync in test to avoid sleeping"

Browse Source
This commit is contained in:
Jenkins 2014-07-19 07:21:12 +00:00 committed by Gerrit Code Review
commit f56328738d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/tests/unit/openvswitch/test_ovs_tunnel.py
View File

@ -520,8 +520,10 @@ class TunnelTest(base.BaseTestCase):
mock.patch.object(ovs_neutron_agent.OVSNeutronAgent, mock.patch.object(ovs_neutron_agent.OVSNeutronAgent,
'scan_ports'), 'scan_ports'),
mock.patch.object(ovs_neutron_agent.OVSNeutronAgent, mock.patch.object(ovs_neutron_agent.OVSNeutronAgent,
'process_network_ports') 'process_network_ports'),
) as (log_exception, scan_ports, process_network_ports): mock.patch.object(ovs_neutron_agent.OVSNeutronAgent,
'tunnel_sync')
) as (log_exception, scan_ports, process_network_ports, ts):
log_exception.side_effect = Exception( log_exception.side_effect = Exception(
'Fake exception to get out of the loop') 'Fake exception to get out of the loop')
scan_ports.side_effect = [reply2, reply3] scan_ports.side_effect = [reply2, reply3]