openstack
/
neutron
Code Issues Proposed changes

Mock out tunnel_sync in test to avoid sleeping 

The tunnel_sync call in the daemon loop for the ovs tunnel
tests blocks for 30 seconds. This patch mocks it out to stop
that.

Closes-Bug: #1340570
Change-Id: I58c3907ed564413a8251bc1bb7922e25f673db18
This commit is contained in:
Kevin Benton 2014-07-11 07:58:41 +00:00
parent 2626d14dc1
commit 40417e6782
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,
'scan_ports'),
mock.patch.object(ovs_neutron_agent.OVSNeutronAgent,
'process_network_ports')
) as (log_exception, scan_ports, process_network_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(
'Fake exception to get out of the loop')
scan_ports.side_effect = [reply2, reply3]