Commit 9d4588ce authored by Dylan Baker's avatar Dylan Baker

summary/html: generalize info output

So that random keys show up somewhat nicely.
parent 840e6e98
...@@ -100,10 +100,7 @@ def _make_testrun_info(results, destination, exclude=None): ...@@ -100,10 +100,7 @@ def _make_testrun_info(results, destination, exclude=None):
totals=each.totals['root'], totals=each.totals['root'],
time=each.time_elapsed.delta, time=each.time_elapsed.delta,
options=each.options, options=each.options,
uname=each.info['system'].get('uname'), info=each.info))
glxinfo=each.info['system'].get('glxinfo'),
clinfo=each.info['system'].get('clinfo'),
lspci=each.info['system'].get('lspci')))
# Then build the individual test results # Then build the individual test results
for key, value in six.iteritems(each.tests): for key, value in six.iteritems(each.tests):
......
...@@ -44,27 +44,19 @@ ...@@ -44,27 +44,19 @@
<td>${options}</td> <td>${options}</td>
</tr> </tr>
<tr> <tr>
<td>uname -a</td> <td>info</td>
<td> <td>
<pre>${uname}</pre> <table>
</td> % for key, sub in sorted(six.iteritems(info)):
</tr> % if isinstance(sub, str):
<tr> <tr><td>${str}</td></tr>
<td>lspci</td> % else:
<td> % for subkey, value in sorted(six.iteritems(sub)):
<pre>${lspci}</pre> <tr><td>${subkey}</td><td><pre>${value}</pre></td></tr>
</td> % endfor
</tr> % endif
<tr> % endfor
<td>glxinfo</td> </table>
<td>
<pre>${glxinfo}</pre>
</td>
</tr>
<tr>
<td>clinfo</td>
<td>
<pre>${clinfo}</pre>
</td> </td>
</tr> </tr>
</table> </table>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment