From cc20673d673113974c78a2b17a9ff4da47ad6665 Mon Sep 17 00:00:00 2001 From: Assaf Muller Date: Sat, 29 Aug 2015 11:32:19 -0400 Subject: [PATCH] Add info to debug test_keepalived_respawns gate failure Current theory is that there's a bug in external_process.active, it returns True when it shouldn't, then kill -15 on the process pid fails because the process isn't up. Added ps -p output to see if the process is up or not. Change-Id: Ic062be829d5f05a1294f6b2fa54820422871ffcb Related-Bug: #1490043 --- .../tests/functional/agent/linux/test_keepalived.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/neutron/tests/functional/agent/linux/test_keepalived.py b/neutron/tests/functional/agent/linux/test_keepalived.py index 9c9da7098..cfb49348b 100644 --- a/neutron/tests/functional/agent/linux/test_keepalived.py +++ b/neutron/tests/functional/agent/linux/test_keepalived.py @@ -14,6 +14,7 @@ # under the License. from oslo_config import cfg +from oslo_log import log as logging from neutron.agent.linux import external_process from neutron.agent.linux import keepalived @@ -22,6 +23,9 @@ from neutron.tests import base from neutron.tests.unit.agent.linux import test_keepalived +LOG = logging.getLogger(__name__) + + class KeepalivedManagerTestCase(base.BaseTestCase, test_keepalived.KeepalivedConfBaseMixin): @@ -49,11 +53,17 @@ class KeepalivedManagerTestCase(base.BaseTestCase, self.assertEqual(self.expected_config.get_config_str(), self.manager.get_conf_on_disk()) + def _log_pid(self, pid): + # TODO(amuller): Remove when bug 1490043 is solved. + LOG.info(utils.execute(['ps', '-F', pid])) + def test_keepalived_respawns(self): self.manager.spawn() process = self.manager.get_process() + pid = process.pid + self._log_pid(pid) self.assertTrue(process.active) - + self._log_pid(pid) process.disable(sig='15') utils.wait_until_true( -- 2.45.2