diff options
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/exectest.py | 2 | ||||
| -rw-r--r-- | framework/summary.py | 19 |
2 files changed, 20 insertions, 1 deletions
diff --git a/framework/exectest.py b/framework/exectest.py index c7b9c2cef..8271c4db3 100644 --- a/framework/exectest.py +++ b/framework/exectest.py @@ -198,7 +198,7 @@ class ExecTest(Test): results['info'] = unicode("Returncode: {0}\n\nErrors:\n{1}\n\n" "Output:\n{2}").format(returncode, - err, out) + err, out) + results['info'] results['returncode'] = returncode results['command'] = ' '.join(self.command) results['dmesg'] = dmesg_diff diff --git a/framework/summary.py b/framework/summary.py index 6ee12268d..6a76d885a 100644 --- a/framework/summary.py +++ b/framework/summary.py @@ -382,6 +382,24 @@ class Summary: for key, value in each.tests.iteritems(): temp_path = path.join(destination, each.name, path.dirname(key)) + images = value.get('images') + + images_table = '' + if images: + images_table += '<table>' + images_table += ' <tr>' + images_table += ' <td></td>' + images_table += ' <td>reference</td>' + images_table += ' <td>rendered</td>' + images_table += ' </tr>' + for image in images: + images_table += ' <tr>' + images_table += ' <td>{0}</td>'.format(image['image_desc']) + images_table += ' <td><img src="file://{0}"></td>'.format(image['image_ref']) + images_table += ' <td><img src="file://{0}"></td>'.format(image['image_render']) + images_table += ' </tr>' + images_table += '</table>' + if value['result'] not in exclude: # os.makedirs is very annoying, it throws an OSError if # the path requested already exists, so do this check to @@ -404,6 +422,7 @@ class Summary: info=value.get('info', 'None'), traceback=value.get('traceback', 'None'), command=value.get('command', 'None'), + images_table=images_table, dmesg=value.get('dmesg', 'None'), css=path.relpath(result_css, temp_path), index=path.relpath(index, temp_path))) |