diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-11-27 18:20:31 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-11-28 09:51:47 +0100 |
| commit | c23625dbddedc7fdf1b8f6ec34da5d042b91998d (patch) | |
| tree | ea2c76a3afe11f894ce25d94edd9225941b3f814 | |
| parent | 7196b0fe4feef178755b4cbf1d91e879e8e01cac (diff) | |
framework: unoicode() wrap format string
Otherwise python2 blows up when the program output contains a non-ascii
character. The resulting exception caused a bunch of spurious fails in
the igt testscases.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
| -rw-r--r-- | framework/exectest.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/exectest.py b/framework/exectest.py index 244d7d99..aa89c661 100644 --- a/framework/exectest.py +++ b/framework/exectest.py @@ -148,7 +148,7 @@ class ExecTest(Test): if env: results['environment'] = env - results['info'] = "Returncode: {0}\n\nErrors:\n{1}\n\nOutput:\n{2}".format(returncode, err, out) + results['info'] = unicode("Returncode: {0}\n\nErrors:\n{1}\n\nOutput:\n{2}").format(returncode, err, out) results['returncode'] = returncode results['command'] = ' '.join(self.command) |