]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Mock the udevadm in the TunnelTestWithMTU test
authordekehn <dekehn@gmail.com>
Thu, 21 Nov 2013 05:03:51 +0000 (22:03 -0700)
committerdekehn <dekehn@gmail.com>
Fri, 22 Nov 2013 23:05:57 +0000 (16:05 -0700)
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

neutron/tests/unit/openvswitch/test_ovs_tunnel.py

index 5c571322ffde512651ffd0bd05fbb66670c9fba5..76bf083661bd152a1211716f8f67690807b7e0db 100644 (file)
@@ -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,