openstack
/
neutron
Code Issues Proposed changes

Merge "Fix keepalived functional tests"

changes/42/303042/1
Jenkins 2016-04-07 15:48:34 +00:00 committed by Gerrit Code Review
parent 444b3a5d9a 1e334e8fe1
commit 3e26a7851e
1 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
neutron/tests/functional/agent/linux/test_keepalived.py
View File

@ -39,28 +39,25 @@ class KeepalivedManagerTestCase(base.BaseTestCase,
conf_path=cfg.CONF.state_path)
self.addCleanup(self.manager.disable)
def test_keepalived_spawn(self):
self.manager.spawn()
process = external_process.ProcessManager(
cfg.CONF,
'router1',
namespace=None,
pids_path=cfg.CONF.state_path)
self.assertTrue(process.active)
self.assertEqual(self.expected_config.get_config_str(),
self.manager.get_conf_on_disk())
def _test_keepalived_respawns(self, normal_exit=True):
self.manager.spawn()
process = self.manager.get_process()
pid = process.pid
def _spawn_keepalived(self, keepalived_manager):
keepalived_manager.spawn()
process = keepalived_manager.get_process()
utils.wait_until_true(
lambda: process.active,
timeout=5,
sleep=0.01,
exception=RuntimeError(_("Keepalived didn't spawn")))
return process
def test_keepalived_spawn(self):
self._spawn_keepalived(self.manager)
self.assertEqual(self.expected_config.get_config_str(),
self.manager.get_conf_on_disk())
def _test_keepalived_respawns(self, normal_exit=True):
process = self._spawn_keepalived(self.manager)
pid = process.pid
exit_code = '-15' if normal_exit else '-9'
# Exit the process, and see that when it comes back
@ -89,12 +86,7 @@ class KeepalivedManagerTestCase(base.BaseTestCase,
with open(pid_file, "w") as f_pid_file:
f_pid_file.write("%s" % spawn_process.pid)
self.manager.spawn()
utils.wait_until_true(
lambda: process.active,
timeout=5,
sleep=0.1,
exception=RuntimeError(_("Keepalived didn't spawn")))
self._spawn_keepalived(self.manager)
def test_keepalived_spawns_conflicting_pid_base_process(self):
process = self.manager.get_process()