From: Hong Hui Xiao Date: Tue, 24 Nov 2015 14:01:48 +0000 (-0500) Subject: Wait for the watch process in test case X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=dcd0498c17ae860c55a92f9f31b3e3fa0460b78e;p=openstack-build%2Fneutron-build.git Wait for the watch process in test case Because the _watch_process and the failing_process are asynchronous, there might be a chance that failing_process exit and _watch_process is not executed. If the _watch_process is blocked, the method that will be asserted will not be called. This will fail the UT, but it is intermittent. Change-Id: Ic951c1b91c5a10462f548544a5e8d482c52ad665 Closes-Bug: #1519160 --- diff --git a/neutron/tests/unit/agent/linux/test_async_process.py b/neutron/tests/unit/agent/linux/test_async_process.py index 6e7206172..43ae302a2 100644 --- a/neutron/tests/unit/agent/linux/test_async_process.py +++ b/neutron/tests/unit/agent/linux/test_async_process.py @@ -291,4 +291,7 @@ class TestFailingAsyncProcess(base.BaseTestCase): as handle_error_mock: self.process.start() self.process._process.wait() + # Wait for the monitor process to complete + for thread in self.process._watchers: + thread.wait() self.assertEqual(1, handle_error_mock.call_count)