From c23625dbddedc7fdf1b8f6ec34da5d042b91998d Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Tue, 27 Nov 2012 18:20:31 +0100 Subject: 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 Reviewed-by: Kenneth Graunke --- framework/exectest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- cgit v1.2.3