From: Nicki Křížek <nicki@isc.org>
Date: Tue, 26 Nov 2024 13:29:42 +0000 (+0100)
Subject: Add all env vars to jinja2 templates
X-Git-Tag: v9.18.32~7^2~1
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=972a6722de02df0f1e723077e9bd3b350d3e41b6;p=thirdparty%2Fbind9.git

Add all env vars to jinja2 templates

Ensure that the jinja2 templates have all the environment variables
which are available to the tests present.

This omission during the original 9.18 backport caused an issue where
port numbers (determined by the pytest framework) wouldn't be available
in jinja2 templates.
---

diff --git a/bin/tests/system/conftest.py b/bin/tests/system/conftest.py
index bc17f000aed..37a26bb5496 100644
--- a/bin/tests/system/conftest.py
+++ b/bin/tests/system/conftest.py
@@ -521,8 +521,8 @@ def system_test_dir(request, env, system_test_name, expected_artifacts):
 
 
 @pytest.fixture(scope="module")
-def templates(system_test_dir: Path):
-    return isctest.template.TemplateEngine(system_test_dir)
+def templates(system_test_dir: Path, env):
+    return isctest.template.TemplateEngine(system_test_dir, env)
 
 
 def _run_script(