framework: small refactor of test_result page generation

Previously each value of a dictionary was pulled out and passed one by
one to mako, that results in a lot of values being passed. With this
patch the dictionary is passed and the keys are pulled out in the mako.
This is much cleaner and easier to read.

v2: - fix dmesg is list problem by altering the dictionary

Signed-off-by: Dylan Baker <baker.dylan.c@gmail.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>

2 files changed, 18 insertions, 30 deletions

diff --git a/framework/summary.py b/framework/summary.py
index 41e07744e..6bcf42bc0 100644
--- a/framework/summary.py
+++ b/framework/summary.py
@@ -400,28 +400,14 @@ class Summary:
                     if not path.exists(temp_path):
                         os.makedirs(temp_path)
 
-                    dmesg = value.get('dmesg', 'None')
-                    if isinstance(dmesg, list):
-                        dmesg = "\n".join(dmesg)
+                    if isinstance(value.get('dmesg'), list):
+                        value['dmesg'] = "\n".join(value['dmesg'])
 
                     with open(path.join(destination, each.name, key + ".html"),
                               'w') as out:
                         out.write(testfile.render(
                             testname=key,
-                            status=value.get('result', 'None'),
-                            # Returning a NoneType (instaed of 'None') prevents
-                            # this field from being generated.setting the
-                            # environment to run tests is ugly, and should
-                            # disapear at somepoint
-                            env=value.get('environment', None),
-                            returncode=value.get('returncode', 'None'),
-                            time=value.get('time', 'None'),
-                            info=value.get('info', None), # deprecated
-                            out=value.get('out', 'None'),
-                            err=value.get('err', 'None'),
-                            traceback=value.get('traceback', 'None'),
-                            command=value.get('command', 'None'),
-                            dmesg=dmesg,
+                            value=value,
                             css=path.relpath(result_css, temp_path),
                             index=path.relpath(index, temp_path)))
 
diff --git a/templates/test_result.mako b/templates/test_result.mako
index 49e6fd2e7..70b9f914f 100644
--- a/templates/test_result.mako
+++ b/templates/test_result.mako
@@ -11,7 +11,7 @@
     <h1>Results for ${testname}</h1>
     <h2>Overview</h2>
     <div>
-      <p><b>Result:</b> ${status}</p>
+      <p><b>Result:</b> ${value.get('status', 'None')}</p>
     </div>
     <p><a href="${index}">Back to summary</a></p>
     <h2>Details</h2>
@@ -22,57 +22,59 @@
       </tr>
       <tr>
         <td>Returncode</td>
-        <td>${returncode}</td>
+        <td>${value.get('returncode', 'None')}</td>
       </tr>
       <tr>
         <td>Time</td>
-        <td>${time}</b>
+        <td>${value.get('time', 'None')}</b>
       </tr>
     ## Info is deprecated and may disapear someday
-    % if info is not None:
+    % if value.get('info') is not None:
       <tr>
         <td>Info</td>
         <td>
-          <pre>${info | h}</pre>
+          <pre>${value.get('info') | h}</pre>
         </td>
       </tr>
     % endif
       <tr>
         <td>Stdout</td>
         <td>
-          <pre>${out | h}</pre>
+          <pre>${value.get('out', 'None') | h}</pre>
         </td>
       </tr>
       <tr>
         <td>Stderr</td>
         <td>
-          <pre>${err | h}</pre>
+          <pre>${value.get('err', 'None') | h}</pre>
         </td>
       </tr>
-      % if env:
+    % if value.get('env') is not None:
       <tr>
         <td>Environment</td>
         <td>
-          <pre>${env | h}</pre>
+          <pre>${value.get('env') | h}</pre>
         </td>
       </tr>
-      % endif
+    % endif
       <tr>
         <td>Command</td>
         <td>
-          </pre>${command}</pre>
+          </pre>${value.get('command', 'None')}</pre>
         </td>
       </tr>
+    % if value.get('traceback') is not None:
       <tr>
         <td>Traceback</td>
         <td>
-          <pre>${traceback | h}</pre>
+          <pre>${value.get('traceback') | h}</pre>
         </td>
       </tr>
+    % endif
       <tr>
         <td>dmesg</td>
         <td>
-          <pre>${dmesg | h}</pre>
+          <pre>${value.get('dmesg', 'None') | h}</pre>
         </td>
       </tr>
     </table>