x/deb-python-tempest-lib
Code Issues Proposed changes

don't log cli output on success

Browse Source 
we only should log cli output on failure, not success. So just
leave it to the exception to log it. This helps reduce the needless
spam inside the tempest log.

Change-Id: I1623694d7321e679e8438eba3e6b1ad58fc6e855
This commit is contained in:
Sean Dague
2014-03-20 17:55:55 -04:00
parent 8b93bb40c2
commit e43e02860a
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tempest/cli/__init__.py
View File

@@ -115,25 +115,19 @@ class ClientTestBase(tempest.test.BaseTestCase):
cmd = ' '.join([os.path.join(CONF.cli.cli_dir, cmd),
flags, action, params])
LOG.info("running: '%s'" % cmd)
cmd_str = cmd
cmd = shlex.split(cmd)
result = ''
result_err = ''
try:
stdout = subprocess.PIPE
stderr = subprocess.STDOUT if merge_stderr else subprocess.PIPE
proc = subprocess.Popen(
cmd, stdout=stdout, stderr=stderr)
result, result_err = proc.communicate()
if not fail_ok and proc.returncode != 0:
raise CommandFailed(proc.returncode,
cmd,
result,
stderr=result_err)
finally:
LOG.debug('output of %s:\n%s' % (cmd_str, result))
if not merge_stderr and result_err:
LOG.debug('error output of %s:\n%s' % (cmd_str, result_err))
stdout = subprocess.PIPE
stderr = subprocess.STDOUT if merge_stderr else subprocess.PIPE
proc = subprocess.Popen(
cmd, stdout=stdout, stderr=stderr)
result, result_err = proc.communicate()
if not fail_ok and proc.returncode != 0:
raise CommandFailed(proc.returncode,
cmd,
result,
stderr=result_err)
return result
def assertTableStruct(self, items, field_names):