x/vmware-nsx
Code Issues Proposed changes

Mock the udevadm in the TunnelTestWithMTU test

Browse Source 
When running the neutron.tests.unit.openvswitch.test_ovs_tunnel.
TunnelTestWithMTU unit test failure occurs because the udevadm is
timing out waiting on a mock-ed device.

Co-Authored-By: Salvatore Orlando <salv.orlando@gmail.com>

Change-Id: I0e16295be66513c2257831bf62fd6a0c19f3b8a4
Closes-Bug: #1253506
This commit is contained in:
dekehn
2013-11-20 22:03:51 -07:00
parent f0bd2ddb40
commit a98f479da3
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -214,6 +214,9 @@ class TunnelTest(base.BaseTestCase):
self.get_bridges_expected = [ self.get_bridges_expected = [
mock.call('sudo') mock.call('sudo')
] ]
self.execute = mock.patch('neutron.agent.linux.utils.execute').start()
self.execute_expected = [mock.call(['/sbin/udevadm', 'settle',
'--timeout=10'])]
def _verify_mock_call(self, mock_obj, expected): def _verify_mock_call(self, mock_obj, expected):
mock_obj.assert_has_calls(expected) mock_obj.assert_has_calls(expected)
@@ -233,6 +236,7 @@ class TunnelTest(base.BaseTestCase):
self._verify_mock_call(self.get_bridges, self.get_bridges_expected) self._verify_mock_call(self.get_bridges, self.get_bridges_expected)
self._verify_mock_call(self.inta, self.inta_expected) self._verify_mock_call(self.inta, self.inta_expected)
self._verify_mock_call(self.intb, self.intb_expected) self._verify_mock_call(self.intb, self.intb_expected)
self._verify_mock_call(self.execute, self.execute_expected)
def test_construct(self): def test_construct(self):
ovs_neutron_agent.OVSNeutronAgent(self.INT_BRIDGE, ovs_neutron_agent.OVSNeutronAgent(self.INT_BRIDGE,