Create a macro for rendering test results

2 files changed, 7 insertions, 3 deletions

diff --git a/src/ci/citool/templates/test_group.askama b/src/ci/citool/templates/test_group.askama
index 535d98e0c24..ba19d9258d8 100644
--- a/src/ci/citool/templates/test_group.askama
+++ b/src/ci/citool/templates/test_group.askama
@@ -1,3 +1,7 @@
+{% macro test_result(r) -%}
+passed: {{ r.passed.len() }}, ignored: {{ r.ignored.len() }}
+{%- endmacro %}
+
 <li>
 <details>
 <summary>{{ name }} ({{ test_count() }} test{{ test_count() | pluralize }})</summary>
@@ -15,12 +19,12 @@
     {% for test in root_tests %}
         <li>
         {% if let Some(result) = test.single_test() %}
-            <b>{{ test.name }}</b> ({{ result.passed.len() }} passed, {{ result.ignored.len() }} ignored)
+            <b>{{ test.name }}</b> ({% call test_result(result) %})
         {% else %}
             <b>{{ test.name }}</b> ({{ test.revisions.len() }} revision{{ test.revisions.len() | pluralize }})
             <ul>
             {% for (revision, result) in test.revisions %}
-                <li>#<i>{{ revision }}</i> ({{ result.passed.len() }} passed, {{ result.ignored.len() }} ignored)</li>
+                <li>#<i>{{ revision }}</i> ({% call test_result(result) %})</li>
             {% endfor %}
             </ul>
         {% endif %}
diff --git a/src/ci/citool/templates/test_suites.askama b/src/ci/citool/templates/test_suites.askama
index bb3d9e36391..d36e85228e2 100644
--- a/src/ci/citool/templates/test_suites.askama
+++ b/src/ci/citool/templates/test_suites.askama
@@ -7,7 +7,7 @@
         <div>
             <div class="test-count">Total tests: {{ test_count }}</div>
             <div>
-                To find tests that haven't been executed anywhere, click on "Open all" and search for "(0 passed".
+                To find tests that haven't been executed anywhere, click on "Open all" and search for "passed: 0".
             </div>
         </div>
         <div>