openstack/glance
Code Issues Proposed changes

Merge "Give helpful error in tests if strace is missing"

Browse Source
This commit is contained in:
Jenkins 2016-05-13 18:43:49 +00:00 committed by Gerrit Code Review
commit 9ec54a3f27
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glance/tests/functional/__init__.py
View File

@ -23,6 +23,7 @@ and spinning down the servers.
import atexit import atexit
import datetime import datetime
import errno
import logging import logging
import os import os
import platform import platform
@ -857,7 +858,14 @@ class FunctionalTest(test_utils.BaseTestCase):
trace = f.pid_file.replace('.pid', '.trace') trace = f.pid_file.replace('.pid', '.trace')
if self.tracecmd: if self.tracecmd:
cmd = '%s -p %d -o %s' % (self.tracecmd, pid, trace) cmd = '%s -p %d -o %s' % (self.tracecmd, pid, trace)
execute(cmd, raise_error=False, expect_exit=False) try:
execute(cmd, raise_error=False, expect_exit=False)
except OSError as e:
if e.errno == errno.ENOENT:
raise RuntimeError('No executable found for "%s" '
'command.' % self.tracecmd)
else:
raise
time.sleep(0.5) time.sleep(0.5)
if os.path.exists(trace): if os.path.exists(trace):
msg += ('\n%s:\n%s\n' % (self.tracecmd, msg += ('\n%s:\n%s\n' % (self.tracecmd,