Reduce whitespace in jinja2 templates

Omit extra newlines when combining and including templates.

Adjust the xfer/ns8/small.db.j2 so it doesn't trim the endline twice
(as that would join the two subsequent records on the same line).

(cherry picked from commit 4f8e3774bba0f63d98e651ef044d6703792921a2)

diff --git a/bin/tests/system/isctest/template.py b/bin/tests/system/isctest/template.py
index 130d36306938ba692c33c929436d694124339bbc..845a372da4612795ba1f3771cdcd62001a5fa46f 100644 (file)
--- a/bin/tests/system/isctest/template.py
+++ b/bin/tests/system/isctest/template.py
@@ -61,6 +61,8 @@ class TemplateEngine:
                 undefined=jinja2.StrictUndefined,
                 variable_start_string="@",
                 variable_end_string="@",
+                trim_blocks=True,
+                keep_trailing_newline=True,
             )
             # allow instantiating the template dataclasses in jinja2 templates when
             # using {% set %}