mirror of
https://github.com/isc-projects/bind9.git
synced 2026-06-11 07:40:00 -04:00
Move conftest log initialization to conftest.py
Initializing the conftest logging upon importing the isctest package
isn't practical when there are standalone pieces which can be used
outside of the testing framework, such as the asyncdnsserver module.
(cherry picked from commit 673387c4d5)
This commit is contained in:
parent
c874e39a23
commit
7a3f632b49
3 changed files with 5 additions and 4 deletions
|
|
@ -33,6 +33,9 @@ import isctest
|
|||
if sys.version_info[1] < 10:
|
||||
raise RuntimeError("Python 3.10 or newer is required to run system tests.")
|
||||
|
||||
isctest.log.init_conftest_logger()
|
||||
isctest.log.avoid_duplicated_logs()
|
||||
|
||||
# ----------------------- Globals definition -----------------------------
|
||||
|
||||
XDIST_WORKER = os.environ.get("PYTEST_XDIST_WORKER", "")
|
||||
|
|
|
|||
|
|
@ -10,8 +10,10 @@
|
|||
# information regarding copyright ownership.
|
||||
|
||||
from .basic import (
|
||||
avoid_duplicated_logs,
|
||||
deinit_module_logger,
|
||||
deinit_test_logger,
|
||||
init_conftest_logger,
|
||||
init_module_logger,
|
||||
init_test_logger,
|
||||
debug,
|
||||
|
|
|
|||
|
|
@ -54,10 +54,6 @@ def avoid_duplicated_logs():
|
|||
logging.root.handlers.remove(handler)
|
||||
|
||||
|
||||
init_conftest_logger()
|
||||
avoid_duplicated_logs()
|
||||
|
||||
|
||||
def init_module_logger(system_test_name: str, testdir: Path):
|
||||
logger = logging.getLogger(system_test_name)
|
||||
logger.handlers.clear()
|
||||
|
|
|
|||
Loading…
Reference in a new issue