summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2016-09-19 17:35:17 +0300
committerLars Wirzenius <liw@liw.fi>2016-09-19 17:35:17 +0300
commit20951385300fe19ccc16e24c816779cceb4a70c9 (patch)
treeb1838100b1c64c673d657d560670dc5dd6d4c5fd
parent859bb5ba9631df883dd7b074ff649ea2ca76e1ad (diff)
downloadcmdtest-20951385300fe19ccc16e24c816779cceb4a70c9.tar.gz
Make error report not crash if non-ascii
-rwxr-xr-xyarn14
1 files changed, 7 insertions, 7 deletions
diff --git a/yarn b/yarn
index 046c45d..b585864 100755
--- a/yarn
+++ b/yarn
@@ -496,13 +496,13 @@ class YarnRunner(cliapp.Application):
logging.debug('Standard error: empty')
if exit != 0 and report_error:
- self.error(
- 'ERROR: In scenario "%s"\nstep "%s %s" failed,\n'
- 'with exit code %d:\n'
- 'Standard output from shell command:\n%s'
- 'Standard error from shell command:\n%s' %
- (scenario.name, step.what, step.text, exit,
- self.indent(stdout), self.indent(stderr)))
+ self.error('ERROR: In scenario "%s"\n' % step.what)
+ self.error('step "%s %s" failed,\n' % (step.what, step.text))
+ self.error('with exit code %d:\n' % exit)
+ self.error('Standard output from shell command:\n%s' %
+ self.indent(stdout))
+ self.error('Standard error from shell command:\n%s' %
+ self.indent(stderr))
self.remember_step_timing(
'%s %s' % (step.what, step.text), time.time() - started)