ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

[9.18] fix: test: tests/irs/resconf_test.c is missing check callbacks

Browse Source 
Closes #5088

Backport of MR !9884

Merge branch 'backport-5088-tests-irs-resconf_test-c-is-missing-check-callbacks-9.18' into 'bind-9.18'

See merge request isc-projects/bind9!9908
This commit is contained in:
Mark Andrews
2024-12-12 23:58:26 +00:00
parent 95a159561f 40c616f303
commit 7333218a2c
1 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/irs/resconf_test.c
+31 -4
View File
@@ -25,12 +25,39 @@
#include <cmocka.h>
#include <isc/mem.h>
#include <isc/sockaddr.h>
#include <isc/util.h>
#include <irs/resconf.h>
#include <tests/isc.h>
static isc_result_t
check_nameserver(irs_resconf_t *resconf, const char *expected) {
char buf[ISC_SOCKADDR_FORMATSIZE];
isc_sockaddrlist_t *servers = irs_resconf_getnameservers(resconf);
isc_sockaddr_t *entry = ISC_LIST_HEAD(*servers);
assert_true(entry != NULL);
isc_sockaddr_format(entry, buf, sizeof(buf));
assert_string_equal(buf, expected);
return ISC_R_SUCCESS;
}
static isc_result_t
check_ns4(irs_resconf_t *resconf) {
return check_nameserver(resconf, "10.0.0.1#53");
}
static isc_result_t
check_ns6(irs_resconf_t *resconf) {
return check_nameserver(resconf, "2001:db8::1#53");
}
static isc_result_t
check_scoped(irs_resconf_t *resconf) {
return check_nameserver(resconf, "fe80::1%1#53");
}
static isc_result_t
check_number(unsigned int n, unsigned int expected) {
return (n == expected) ? ISC_R_SUCCESS : ISC_R_BADNUMBER;
@@ -98,12 +125,12 @@ ISC_RUN_TEST_IMPL(irs_resconf_load) {
isc_result_t checkres;
} tests[] = {
{ "testdata/domain.conf", ISC_R_SUCCESS, NULL, ISC_R_SUCCESS },
{ "testdata/nameserver-v4.conf", ISC_R_SUCCESS, NULL,
{ "testdata/nameserver-v4.conf", ISC_R_SUCCESS, check_ns4,
ISC_R_SUCCESS },
{ "testdata/nameserver-v6.conf", ISC_R_SUCCESS, NULL,
ISC_R_SUCCESS },
{ "testdata/nameserver-v6-scoped.conf", ISC_R_SUCCESS, NULL,
{ "testdata/nameserver-v6.conf", ISC_R_SUCCESS, check_ns6,
ISC_R_SUCCESS },
{ "testdata/nameserver-v6-scoped.conf", ISC_R_SUCCESS,
check_scoped, ISC_R_SUCCESS },
{ "testdata/options-attempts.conf", ISC_R_SUCCESS,
check_attempts, ISC_R_SUCCESS },
{ "testdata/options-debug.conf", ISC_R_SUCCESS, NULL,