diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-03 10:42:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-03 10:42:39 +0000 |
| commit | 3ce9473bab1c054aa027ca9f84e8a2586e297958 (patch) | |
| tree | f28efce6d1a11f4f6904f7749b7b043aff1d0bfd | |
| parent | 4cbcb2eba4502b7fd65abb7c9af38cf02a38cc96 (diff) | |
| parent | cc20673d673113974c78a2b17a9ff4da47ad6665 (diff) | |
| download | neutron-7.0.0.0b3.tar.gz | |
Merge "Add info to debug test_keepalived_respawns gate failure"7.0.0.0b3
| -rw-r--r-- | neutron/tests/functional/agent/linux/test_keepalived.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/neutron/tests/functional/agent/linux/test_keepalived.py b/neutron/tests/functional/agent/linux/test_keepalived.py index 9c9da7098d..cfb49348be 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( |