openstack
/
neutron
Code Issues Proposed changes

Fix keepalived functional tests 

Running the tests locally I'm seeing:
http://paste.openstack.org/show/493222/

The issue in all three tests is that the keepalived manager
process spawns asynchronously (sudo -> root_helper -> keepalived).

For the 'spawns' test, it was asserting that process.alive was
True when it should have used wait_until_true.

For the respawns* tests, the test grabs process.pid before the process
has necessarily spawned. Moving process.pid to after the wait_until_true(
process.active) loop guarantees that pid will return keepalived's
process. Otherwise the 'pid' variable will be None, then when we
use utils.execute we try to kill the 'None' pid, and that doesn't seem
to work.

Change-Id: Ie77d406eaaf7f77edd4f598947999be4adf3d249
Closes-Bug: #1567023
This commit is contained in:
Assaf Muller 2016-04-06 14:31:24 -04:00
parent 87bddf4ff8
commit 1e334e8fe1
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()