From b336b7c438f3f5d4ee8d23d6bb2d2cf8fe1657f4 Mon Sep 17 00:00:00 2001 From: Jakub Libosvar Date: Fri, 19 Jun 2015 15:52:35 +0200 Subject: [PATCH] Disable keepalived process in keepalived func test Previously, keepalived process itself was disabled that lead to respawning of keepalived by KeepalivedManager. This patch disables KeepalivedManager in cleanup thus no respawn happens. Closes-Bug: #1466873 Change-Id: If5524116e5d4fc41600920d31481282c5b797f7b --- neutron/tests/functional/agent/linux/test_keepalived.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neutron/tests/functional/agent/linux/test_keepalived.py b/neutron/tests/functional/agent/linux/test_keepalived.py index 3df8ec792..9c9da7098 100644 --- a/neutron/tests/functional/agent/linux/test_keepalived.py +++ b/neutron/tests/functional/agent/linux/test_keepalived.py @@ -35,7 +35,7 @@ class KeepalivedManagerTestCase(base.BaseTestCase, self.manager = keepalived.KeepalivedManager( 'router1', self.expected_config, self.process_monitor, conf_path=cfg.CONF.state_path) - self.addCleanup(self.manager.get_process().disable) + self.addCleanup(self.manager.disable) def test_keepalived_spawn(self): self.manager.spawn() -- 2.45.2