openstack/aodh
Code Issues Proposed changes

Merge "service: fix service alive checking"

Browse Source
This commit is contained in:
Jenkins 2013-12-13 03:09:59 +00:00 committed by Gerrit Code Review
commit 6cb9b88f09
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ceilometer/tests/test_service.py
View File

@ -109,13 +109,10 @@ class ServiceRestartTest(base.BaseTestCase):
@staticmethod
def _check_process_alive(pid):
try:
with open("/proc/%d/status" % pid) as fd_proc:
for line in fd_proc.readlines():
if line.startswith("State:"):
state = line.split(":", 1)[1].strip().split(' ')[0]
return state not in ['Z', 'T', 'Z+']
except IOError:
os.kill(pid, 0)
except OSError:
return False
return True
def check_process_alive(self):
cond = lambda: self._check_process_alive(self.sub.pid)