From: Ihar Hrachyshka <ihrachys@redhat.com>
Date: Tue, 8 Sep 2015 09:20:10 +0000 (+0200)
Subject: tests: disable process monitor before managers
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1b67012794932a06ce90976f9759fc588da269b5;p=openstack-build%2Fneutron-build.git

tests: disable process monitor before managers

Otherwise the monitor may respawn managers later, leaving them running.

Issue spotted in:
http://logs.openstack.org/02/216902/4/check/gate-neutron-dsvm-functional/a97df90

Change-Id: I0e68b06c87b5770756fdf7b9201e1986cc67e07b
Related-Bug: #1490051
---

diff --git a/neutron/tests/functional/agent/linux/test_process_monitor.py b/neutron/tests/functional/agent/linux/test_process_monitor.py
index 0802c3a45..ba64d46c9 100644
--- a/neutron/tests/functional/agent/linux/test_process_monitor.py
+++ b/neutron/tests/functional/agent/linux/test_process_monitor.py
@@ -96,6 +96,7 @@ class BaseTestProcessMonitor(base.BaseTestCase):
             exception=RuntimeError('Not all children respawned.'))
 
     def cleanup_spawned_children(self):
+        self._process_monitor.stop()
         for pm in self._child_processes:
             pm.disable()