Merge ~sylvain-pineau/checkbox-ng:disable-autoescape-html-comments into checkbox-ng:master

Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: b8943a08cc823ecc7ede9882d7e347c4fcc3a6cf
Merged at revision: 2d26c2d800019ec9e4f8b5267caf2e823d1529d8
Proposed branch: ~sylvain-pineau/checkbox-ng:disable-autoescape-html-comments
Merge into: checkbox-ng:master
Diff against target: 39 lines (+3/-3)
3 files modified
plainbox/impl/exporter/jinja2.py (+1/-1)
plainbox/impl/providers/exporters/data/checkbox.html (+1/-1)
plainbox/impl/providers/exporters/data/multi-page.html (+1/-1)
Reviewer Review Type Date Requested Status
Devices Certification Bot Needs Fixing
Sylvain Pineau (community) Approve
Review via email: mp+358036@code.launchpad.net

Description of the change

Disable autoescape in comments to let tester write text with html tags and preserve the rendering in the final report.

It will allow bug links in comments.

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

self-approved

review: Approve
Revision history for this message
Devices Certification Bot (ce-certification-qa) wrote :
Download full text (6.1 KiB)

The merge was fine but running tests failed.

[trusty] starting container
[trusty] (timing) 0.00user 0.00system 0:00.21elapsed 5%CPU (0avgtext+0avgdata 4968maxresident)k
[trusty] (timing) 0inputs+72outputs (0major+1090minor)pagefaults 0swaps
[trusty] provisioning container
[trusty] (timing) 84.91user 124.29system 8:25.48elapsed 41%CPU (0avgtext+0avgdata 69112maxresident)k
[trusty] (timing) 0inputs+1681704outputs (15major+1536516minor)pagefaults 0swaps
[trusty-testing] Starting tests...
Found a test script: ./requirements/001-container-tests-plainbox-egg-info
[trusty-testing] 001-container-tests-plainbox-egg-info: PASS
[trusty-testing] (timing) 0.19user 0.02system 0:00.24elapsed 88%CPU (0avgtext+0avgdata 24372maxresident)k
[trusty-testing] (timing) 0inputs+88outputs (0major+9409minor)pagefaults 0swaps
Found a test script: ./requirements/container-tests-checkbox-documentation
[trusty-testing] container-tests-checkbox-documentation: PASS
[trusty-testing] (timing) 0.02user 0.01system 0:00.05elapsed 61%CPU (0avgtext+0avgdata 10516maxresident)k
[trusty-testing] (timing) 0inputs+0outputs (0major+2635minor)pagefaults 0swaps
Found a test script: ./requirements/container-tests-checkbox-ng-unit
[trusty-testing] container-tests-checkbox-ng-unit: FAIL
[trusty-testing] stdout: https://paste.ubuntu.com/p/vgxZnS5wK4/
[trusty-testing] stderr: https://paste.ubuntu.com/p/Gry7fPSvBW/
[trusty-testing] (timing) Command exited with non-zero status 1
[trusty-testing] (timing) 12.45user 0.70system 0:15.36elapsed 85%CPU (0avgtext+0avgdata 70052maxresident)k
[trusty-testing] (timing) 0inputs+53896outputs (0major+464327minor)pagefaults 0swaps
Found a test script: ./requirements/container-tests-providers-internal
[trusty-testing] container-tests-providers-internal: PASS
[trusty-testing] (timing) 11.04user 0.70system 0:13.61elapsed 86%CPU (0avgtext+0avgdata 60676maxresident)k
[trusty-testing] (timing) 0inputs+48032outputs (0major+461264minor)pagefaults 0swaps
[trusty-testing] Fixing file permissions in source directory
[trusty-testing] Destroying container
Name: trusty-testing
State: STOPPED
[xenial] starting container
[xenial] (timing) 0.00user 0.00system 0:00.30elapsed 2%CPU (0avgtext+0avgdata 5072maxresident)k
[xenial] (timing) 0inputs+72outputs (0major+1086minor)pagefaults 0swaps
[xenial] provisioning container
[xenial] (timing) 39.67user 16.03system 6:33.51elapsed 14%CPU (0avgtext+0avgdata 83764maxresident)k
[xenial] (timing) 64inputs+2000128outputs (0major+1984904minor)pagefaults 0swaps
[xenial-testing] Starting tests...
Found a test script: ./requirements/001-container-tests-plainbox-egg-info
[xenial-testing] 001-container-tests-plainbox-egg-info: PASS
[xenial-testing] (timing) 0.21user 0.02system 0:00.26elapsed 90%CPU (0avgtext+0avgdata 25336maxresident)k
[xenial-testing] (timing) 0inputs+88outputs (0major+9651minor)pagefaults 0swaps
Found a test script: ./requirements/container-tests-checkbox-documentation
[xenial-testing] container-tests-checkbox-documentation: PASS
[xenial-testing] (timing) 1.74user 0.05system 0:02.21elapsed 81%CPU (0avgtext+0avgdata 60452maxr...

Read more...

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/plainbox/impl/exporter/jinja2.py b/plainbox/impl/exporter/jinja2.py
2index 3f53908..b02af57 100644
3--- a/plainbox/impl/exporter/jinja2.py
4+++ b/plainbox/impl/exporter/jinja2.py
5@@ -97,7 +97,7 @@ class Jinja2SessionStateExporter(ISessionStateExporter):
6 paths.extend(self.data["extra_paths"])
7 self.option_list = exporter_unit.option_list
8 loader = FileSystemLoader(paths)
9- env = Environment(loader=loader)
10+ env = Environment(loader=loader, extensions=['jinja2.ext.autoescape'])
11 self.customize_environment(env)
12
13 def include_file(name):
14diff --git a/plainbox/impl/providers/exporters/data/checkbox.html b/plainbox/impl/providers/exporters/data/checkbox.html
15index 01e2b04..97318fd 100644
16--- a/plainbox/impl/providers/exporters/data/checkbox.html
17+++ b/plainbox/impl/providers/exporters/data/checkbox.html
18@@ -165,7 +165,7 @@
19 {%- else %}
20 <td style='width:10%'></td>
21 {%- endif %}
22- <td style='width:35%'>{{ job_state.result.comments if job_state.result.comments != None }}</td>
23+ <td style='width:35%'>{% autoescape false %}{{ job_state.result.comments if job_state.result.comments != None }}{% endautoescape %}</td>
24 </tr>
25 {%- endfor %}
26 </tbody>
27diff --git a/plainbox/impl/providers/exporters/data/multi-page.html b/plainbox/impl/providers/exporters/data/multi-page.html
28index c157730..de5c416 100644
29--- a/plainbox/impl/providers/exporters/data/multi-page.html
30+++ b/plainbox/impl/providers/exporters/data/multi-page.html
31@@ -215,7 +215,7 @@
32 {%- else %}
33 <td style='width:10%'></td>
34 {%- endif %}
35- <td style='width:35%'>{{ job_state.result.comments if job_state.result.comments != None }}</td>
36+ <td style='width:35%'>{% autoescape false %}{{ job_state.result.comments if job_state.result.comments != None }}{% endautoescape %}</td>
37 </tr>
38 {%- endfor %}
39 </tbody>

Subscribers

People subscribed via source and target branches