mirror of
https://github.com/isc-projects/bind9.git
synced 2026-06-08 17:52:10 -04:00
Move isctest.var initialization to conftest.py
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:
parent
2a09f632ab
commit
ac7c657d19
2 changed files with 6 additions and 4 deletions
|
|
@ -33,6 +33,7 @@ from isctest.vars.dirs import SYSTEM_TEST_DIR_GIT_PATH
|
|||
|
||||
isctest.log.init_conftest_logger()
|
||||
isctest.log.avoid_duplicated_logs()
|
||||
isctest.vars.init_vars()
|
||||
|
||||
# ----------------- Older pytest / xdist compatibility -------------------
|
||||
# As of 2023-01-11, the minimal supported pytest / xdist versions are
|
||||
|
|
|
|||
|
|
@ -16,8 +16,9 @@ from .openssl import parse_openssl_config
|
|||
from .. import log
|
||||
|
||||
|
||||
# env variable initialization
|
||||
parse_openssl_config(ALL["OPENSSL_CONF"])
|
||||
def init_vars():
|
||||
"""Initializes the environment variables."""
|
||||
parse_openssl_config(ALL["OPENSSL_CONF"])
|
||||
|
||||
os.environ.update(ALL)
|
||||
log.debug("setting following env vars: %s", ", ".join([str(key) for key in ALL]))
|
||||
os.environ.update(ALL)
|
||||
log.debug("setting following env vars: %s", ", ".join([str(key) for key in ALL]))
|
||||
|
|
|
|||
Loading…
Reference in a new issue