From: Tony Mack Date: Fri, 18 Apr 2008 00:38:08 +0000 (+0000) Subject: minor updates X-Git-Tag: tests-4.2-4~41 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ed8cac91f96f96b3a0e12eaebbf0183f4fecd1c2;p=tests.git minor updates --- diff --git a/qaapi/qa/utils.py b/qaapi/qa/utils.py index 40eb086..00dbb7e 100644 --- a/qaapi/qa/utils.py +++ b/qaapi/qa/utils.py @@ -17,11 +17,12 @@ def popen(command, fatal=True, verbose = False): header(command, False) (stdin, stdout, stderr) = os.popen3(command) output = stdout.readlines() + errors = stderr.readlines() print >> logfile, "+ "+command print >> logfile, "".join(output).strip() # filter output generated by set x remove_set_x = lambda line: not line.startswith("+") - errors = filter(remove_set_x, stderr.readlines()) + errors = filter(remove_set_x, errors) if fatal and errors: raise Exception, "".join(errors)