upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-10 23:00:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
bind9/bin/tests/system/configloading/tests_configloading.py

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

42 lines
1.4 KiB
Python
Raw Normal View History

Refactor configloading test - Use WatchLog.wait_for_sequence() for the configloading test. - Omit artifacts check, as it seems quite useless for this test case. - Join all the tests together. The test case is fairly simple here and this is the easiest way to ensure the log will be in a predictable state for all tests. Previously, there was no way to ensure test_configloading_loading() won't be executed after the other tests, which would render the check moot. It could also be separated into its own module, but that seems excessive for a simple test case like this. - Use jinja2 template for named.conf and remove setup.sh. - Remove README and put the relevent comment directly next to the test. - Remove _sh_ from the test filename to uphold the naming convention.
2025-06-26 11:28:11 -04:00
# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
#
# SPDX-License-Identifier: MPL-2.0
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, you can obtain one at https://mozilla.org/MPL/2.0/.
#
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
Add nsX fixtures to system tests Many of our test cases only use a single NamedInstance from the `servers` fixture. Introduce `nsX` helper fixtures to simplify these tests and reduce boilterplate code further. Specifically, the test no longer has to either define its own variable to extract a single server from the list, or use the longer servers["nsX"] syntax. While this may seem minor, the amount of times it is repeated across the tests justifies the change. It also promotes using more explicit server identification, i.e. `nsX`, rather than generic `server`. This also improves the clarity of the tests and may be helpful in traceback during debugging as well.
2025-07-08 09:26:09 -04:00
def test_configloading_log(ns1):
Refactor configloading test - Use WatchLog.wait_for_sequence() for the configloading test. - Omit artifacts check, as it seems quite useless for this test case. - Join all the tests together. The test case is fairly simple here and this is the easiest way to ensure the log will be in a predictable state for all tests. Previously, there was no way to ensure test_configloading_loading() won't be executed after the other tests, which would render the check moot. It could also be separated into its own module, but that seems excessive for a simple test case like this. - Use jinja2 template for named.conf and remove setup.sh. - Remove README and put the relevent comment directly next to the test. - Remove _sh_ from the test filename to uphold the naming convention.
2025-06-26 11:28:11 -04:00
"""
This test is a "guard/warning" to make sure the named.conf loading
apply_configuration: log subroutines for tests In order to have a (minimal) test ensuring we don't move back `apply_configuration` subroutines which can be done before the exclusive lock is taken, `APPLY_CONFIGURATION_SUBROUTINE_LOG` macro is added and used for the few subroutines already extracted from the exclusive mode. Those expected logs are added in `configloading` system test checks.
2025-09-10 09:17:11 -04:00
(parsing), keystore building, kasplist building and view creation is done
outside of the exclusive mode (so, named is still able to answer queries
and operating normally in case of configuration reload). It
Refactor configloading test - Use WatchLog.wait_for_sequence() for the configloading test. - Omit artifacts check, as it seems quite useless for this test case. - Join all the tests together. The test case is fairly simple here and this is the easiest way to ensure the log will be in a predictable state for all tests. Previously, there was no way to ensure test_configloading_loading() won't be executed after the other tests, which would render the check moot. It could also be separated into its own module, but that seems excessive for a simple test case like this. - Use jinja2 template for named.conf and remove setup.sh. - Remove README and put the relevent comment directly next to the test. - Remove _sh_ from the test filename to uphold the naming convention.
2025-06-26 11:28:11 -04:00
is currently based on logging, so it's quite brittle.
"""
log_sequence = [
"load_configuration",
"parsing user configuration from ",
"apply_configuration",
apply_configuration: log subroutines for tests In order to have a (minimal) test ensuring we don't move back `apply_configuration` subroutines which can be done before the exclusive lock is taken, `APPLY_CONFIGURATION_SUBROUTINE_LOG` macro is added and used for the few subroutines already extracted from the exclusive mode. Those expected logs are added in `configloading` system test checks.
2025-09-10 09:17:11 -04:00
"apply_configuration: configure_keystores",
"apply_configuration: configure_kasplist",
"apply_configuration: create_views",
Refactor configloading test - Use WatchLog.wait_for_sequence() for the configloading test. - Omit artifacts check, as it seems quite useless for this test case. - Join all the tests together. The test case is fairly simple here and this is the easiest way to ensure the log will be in a predictable state for all tests. Previously, there was no way to ensure test_configloading_loading() won't be executed after the other tests, which would render the check moot. It could also be separated into its own module, but that seems excessive for a simple test case like this. - Use jinja2 template for named.conf and remove setup.sh. - Remove README and put the relevent comment directly next to the test. - Remove _sh_ from the test filename to uphold the naming convention.
2025-06-26 11:28:11 -04:00
"loop exclusive mode: starting",
]
Add nsX fixtures to system tests Many of our test cases only use a single NamedInstance from the `servers` fixture. Introduce `nsX` helper fixtures to simplify these tests and reduce boilterplate code further. Specifically, the test no longer has to either define its own variable to extract a single server from the list, or use the longer servers["nsX"] syntax. While this may seem minor, the amount of times it is repeated across the tests justifies the change. It also promotes using more explicit server identification, i.e. `nsX`, rather than generic `server`. This also improves the clarity of the tests and may be helpful in traceback during debugging as well.
2025-07-08 09:26:09 -04:00
with ns1.watch_log_from_start() as watcher:
Refactor configloading test - Use WatchLog.wait_for_sequence() for the configloading test. - Omit artifacts check, as it seems quite useless for this test case. - Join all the tests together. The test case is fairly simple here and this is the easiest way to ensure the log will be in a predictable state for all tests. Previously, there was no way to ensure test_configloading_loading() won't be executed after the other tests, which would render the check moot. It could also be separated into its own module, but that seems excessive for a simple test case like this. - Use jinja2 template for named.conf and remove setup.sh. - Remove README and put the relevent comment directly next to the test. - Remove _sh_ from the test filename to uphold the naming convention.
2025-06-26 11:28:11 -04:00
watcher.wait_for_sequence(log_sequence)
Add nsX fixtures to system tests Many of our test cases only use a single NamedInstance from the `servers` fixture. Introduce `nsX` helper fixtures to simplify these tests and reduce boilterplate code further. Specifically, the test no longer has to either define its own variable to extract a single server from the list, or use the longer servers["nsX"] syntax. While this may seem minor, the amount of times it is repeated across the tests justifies the change. It also promotes using more explicit server identification, i.e. `nsX`, rather than generic `server`. This also improves the clarity of the tests and may be helpful in traceback during debugging as well.
2025-07-08 09:26:09 -04:00
with ns1.watch_log_from_here() as watcher:
ns1.rndc("reconfig")
Refactor configloading test - Use WatchLog.wait_for_sequence() for the configloading test. - Omit artifacts check, as it seems quite useless for this test case. - Join all the tests together. The test case is fairly simple here and this is the easiest way to ensure the log will be in a predictable state for all tests. Previously, there was no way to ensure test_configloading_loading() won't be executed after the other tests, which would render the check moot. It could also be separated into its own module, but that seems excessive for a simple test case like this. - Use jinja2 template for named.conf and remove setup.sh. - Remove README and put the relevent comment directly next to the test. - Remove _sh_ from the test filename to uphold the naming convention.
2025-06-26 11:28:11 -04:00
watcher.wait_for_sequence(log_sequence)
Add nsX fixtures to system tests Many of our test cases only use a single NamedInstance from the `servers` fixture. Introduce `nsX` helper fixtures to simplify these tests and reduce boilterplate code further. Specifically, the test no longer has to either define its own variable to extract a single server from the list, or use the longer servers["nsX"] syntax. While this may seem minor, the amount of times it is repeated across the tests justifies the change. It also promotes using more explicit server identification, i.e. `nsX`, rather than generic `server`. This also improves the clarity of the tests and may be helpful in traceback during debugging as well.
2025-07-08 09:26:09 -04:00
with ns1.watch_log_from_here() as watcher:
ns1.rndc("reload")
Refactor configloading test - Use WatchLog.wait_for_sequence() for the configloading test. - Omit artifacts check, as it seems quite useless for this test case. - Join all the tests together. The test case is fairly simple here and this is the easiest way to ensure the log will be in a predictable state for all tests. Previously, there was no way to ensure test_configloading_loading() won't be executed after the other tests, which would render the check moot. It could also be separated into its own module, but that seems excessive for a simple test case like this. - Use jinja2 template for named.conf and remove setup.sh. - Remove README and put the relevent comment directly next to the test. - Remove _sh_ from the test filename to uphold the naming convention.
2025-06-26 11:28:11 -04:00
watcher.wait_for_sequence(log_sequence)
Reference in a new issue Copy permalink