Fix a couple issues with producing test outputs.

jmchilton · jmchilton · commit 572e7545e17c · 2015-10-12T11:50:25.000+01:00
diff --git a/planemo/galaxy_test/actions.py b/planemo/galaxy_test/actions.py
@@ -83,12 +83,18 @@ def run_in_config(ctx, config, **kwds):
         test_data = test_results.structured_data
 
         if 'test_output' in kwds:
-            with open(kwds['test_output'], 'w') as handle:
-                handle.write(build_report.build_report(test_data))
+            output_path = kwds['test_output']
+            if output_path is not None:
+                with open(output_path, 'w') as handle:
+                    handle.write(build_report.build_report(test_data))
 
         for kw_name in ('markdown', 'text'):
             if 'test_output_%s' % kw_name in kwds:
-                with open(kwds['test_output_%s' % kw_name], 'w') as handle:
+                output_path = kwds['test_output_%s' % kw_name]
+                if output_path is None:
+                    continue
+
+                with open(output_path, 'w') as handle:
                     handle.write(build_report.build_report(test_data, report_type=kw_name))
 
     except Exception:
diff --git a/planemo/reports/build_report.py b/planemo/reports/build_report.py
@@ -1,3 +1,4 @@
+import json
 from pkg_resources import resource_string
 from jinja2 import Environment, PackageLoader
 env = Environment(loader=PackageLoader('planemo', 'reports'))
@@ -20,6 +21,7 @@ def build_report(structured_data, report_type="html", **kwds):
             'bootstrap_style': __style("bootstrap.min.css"),
             'jquery_script': __script("jquery.min"),
             'bootstrap_script': __script("bootstrap.min"),
+            'json': json,
         })
 
     return template_data(environment, 'report_%s.tpl' % report_type)
diff --git a/planemo/reports/report_html.tpl b/planemo/reports/report_html.tpl
@@ -78,7 +78,7 @@
         .success(function(content) { renderTestResults( $.parseJSON(content) ); })
         .failure(function() { alert("Failed to load test data.")} );
       } else {
-        var test_data = {{ raw_data | to_json }};
+        var test_data = {{ json.dumps(raw_data) }};
         renderTestResults(test_data);
       }
     </script>

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@`
`78`	`78`	`.success(function(content) { renderTestResults( $.parseJSON(content) ); })`
`79`	`79`	`.failure(function() { alert("Failed to load test data.")} );`
`80`	`80`	`} else {`
`81`		`- var test_data = {{ raw_data \| to_json }};`
	`81`	`+ var test_data = {{ json.dumps(raw_data) }};`
`82`	`82`	`renderTestResults(test_data);`
`83`	`83`	`}`
`84`	`84`	`</script>`