[Piglit] [PATCH 1/2] framework: Fix html generation to work with recent changes to json

[Ilia Mirkin]

On Fri, Apr 18, 2014 at 9:54 AM, Dylan Baker <baker.dylan.c at gmail.com> wrote:
> Recent changes to the JSON file spilt stderr, stdout, and returncode
> values out of a single 'info' string into three distinct values, but
> didn't update the summary to accept those values.
>
> Signed-off-by: Dylan Baker <baker.dylan.c at gmail.com>

Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>

Thanks for the quick fix!

> ---
>  framework/summary.py       |  4 +++-
>  templates/test_result.mako | 15 +++++++++++++++
>  2 files changed, 18 insertions(+), 1 deletion(-)
>
> diff --git a/framework/summary.py b/framework/summary.py
> index a4aa136..41e0774 100644
> --- a/framework/summary.py
> +++ b/framework/summary.py
> @@ -416,7 +416,9 @@ class Summary:
>                              env=value.get('environment', None),
>                              returncode=value.get('returncode', 'None'),
>                              time=value.get('time', 'None'),
> -                            info=value.get('info', '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,
> diff --git a/templates/test_result.mako b/templates/test_result.mako
> index 490c009..49e6fd2 100644
> --- a/templates/test_result.mako
> +++ b/templates/test_result.mako
> @@ -28,12 +28,27 @@
>          <td>Time</td>
>          <td>${time}</b>
>        </tr>
> +    ## Info is deprecated and may disapear someday
> +    % if info is not None:
>        <tr>
>          <td>Info</td>
>          <td>
>            <pre>${info | h}</pre>
>          </td>
>        </tr>
> +    % endif
> +      <tr>
> +        <td>Stdout</td>
> +        <td>
> +          <pre>${out | h}</pre>
> +        </td>
> +      </tr>
> +      <tr>
> +        <td>Stderr</td>
> +        <td>
> +          <pre>${err | h}</pre>
> +        </td>
> +      </tr>
>        % if env:
>        <tr>
>          <td>Environment</td>
> --
> 1.9.2
>