From a98f479da3d3c63b5affbe82a236b7b79f631175 Mon Sep 17 00:00:00 2001 From: dekehn Date: Wed, 20 Nov 2013 22:03:51 -0700 Subject: [PATCH] Mock the udevadm in the TunnelTestWithMTU test 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 Change-Id: I0e16295be66513c2257831bf62fd6a0c19f3b8a4 Closes-Bug: #1253506 --- neutron/tests/unit/openvswitch/test_ovs_tunnel.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neutron/tests/unit/openvswitch/test_ovs_tunnel.py b/neutron/tests/unit/openvswitch/test_ovs_tunnel.py index 5c571322f..76bf08366 100644 --- a/neutron/tests/unit/openvswitch/test_ovs_tunnel.py +++ b/neutron/tests/unit/openvswitch/test_ovs_tunnel.py @@ -214,6 +214,9 @@ class TunnelTest(base.BaseTestCase): self.get_bridges_expected = [ 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): 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.inta, self.inta_expected) self._verify_mock_call(self.intb, self.intb_expected) + self._verify_mock_call(self.execute, self.execute_expected) def test_construct(self): ovs_neutron_agent.OVSNeutronAgent(self.INT_BRIDGE, -- 2.45.2