mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 16:15:27 +00:00
Code Issues Releases Wiki Activity

Move isctest.var initialization to conftest.py

Browse Source 
The environment variable initialization requires logging to be set up
first. Ensure the initialization is delayed until loggers have been set
up.
This commit is contained in:
Nicki Křížek
2024-05-06 16:55:42 +02:00
parent 2a09f632ab
commit ac7c657d19
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bin/tests/system/conftest.py
View File

@@ -33,6 +33,7 @@ from isctest.vars.dirs import SYSTEM_TEST_DIR_GIT_PATH
isctest.log.init_conftest_logger() isctest.log.init_conftest_logger()
isctest.log.avoid_duplicated_logs() isctest.log.avoid_duplicated_logs()
isctest.vars.init_vars()
# ----------------- Older pytest / xdist compatibility ------------------- # ----------------- Older pytest / xdist compatibility -------------------
# As of 2023-01-11, the minimal supported pytest / xdist versions are # As of 2023-01-11, the minimal supported pytest / xdist versions are

9
bin/tests/system/isctest/vars/__init__.py
View File

@@ -16,8 +16,9 @@ from .openssl import parse_openssl_config
from .. import log from .. import log
# env variable initialization def init_vars():
parse_openssl_config(ALL["OPENSSL_CONF"]) """Initializes the environment variables."""
parse_openssl_config(ALL["OPENSSL_CONF"])
os.environ.update(ALL) os.environ.update(ALL)
log.debug("setting following env vars: %s", ", ".join([str(key) for key in ALL])) log.debug("setting following env vars: %s", ", ".join([str(key) for key in ALL]))