mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 13:38:26 +00:00
Code Issues Releases Wiki Activity

fix tests

Browse Source
This commit is contained in:
Bob Halley 1999-10-26 01:53:45 +00:00
parent ea6228c9ce
commit dd93d455c1
3 changed files with 44 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/tests/rbt/dns_rbtnodechain_first_1.data
View File

@ -1,4 +1,4 @@
vix.com b.com
a.vix.com a.vix.com
b.vix.com b.vix.com
c.vix.com c.vix.com

2
bin/tests/rbt/dns_rbtnodechain_first_data
View File

@ -3,5 +3,5 @@
# #
# format is: <dbfile> <findnode> <next> <nextorigin> <prev> <prevorigin> <first> <firstorigin> <last> <lastorigin> # format is: <dbfile> <findnode> <next> <nextorigin> <prev> <prevorigin> <first> <firstorigin> <last> <lastorigin>
# #
dns_rbtnodechain_first_1.data . . . . dns_rbtnodechain_first_1.data . . com .
dns_rbtnodechain_first_2.data . . vix.com . dns_rbtnodechain_first_2.data . . vix.com .

63
bin/tests/rbt/t_rbt.c
View File

@ -47,7 +47,8 @@ static char *fixedname_totext(dns_fixedname_t *name);
static int fixedname_cmp(dns_fixedname_t *dns_name, char *txtname); static int fixedname_cmp(dns_fixedname_t *dns_name, char *txtname);
static char *dnsname_totext(dns_name_t *name); static char *dnsname_totext(dns_name_t *name);
static int t_namechk(dns_result_t dns_result, dns_fixedname_t *dns_name, char *exp_name, static int t_namechk(dns_result_t dns_result, dns_fixedname_t *dns_name, char *exp_name,
dns_fixedname_t *dns_origin, char *exp_origin); dns_fixedname_t *dns_origin, char *exp_origin,
dns_result_t exp_result);
/* parts adapted from the original rbt_test.c */ /* parts adapted from the original rbt_test.c */
@ -680,8 +681,9 @@ t9_walkchain(dns_rbtnodechain_t *chain, dns_rbt_t *rbt) {
static int static int
t_namechk(dns_result_t dns_result, dns_fixedname_t *dns_name, char *exp_name, t_namechk(dns_result_t dns_result, dns_fixedname_t *dns_name, char *exp_name,
dns_fixedname_t *dns_origin, char *exp_origin) { dns_fixedname_t *dns_origin, char *exp_origin,
dns_result_t exp_result)
{
int nfails; int nfails;
nfails = 0; nfails = 0;
@ -693,15 +695,14 @@ t_namechk(dns_result_t dns_result, dns_fixedname_t *dns_name, char *exp_name,
} }
if (exp_origin != NULL) { if (exp_origin != NULL) {
t_info("checking for DNS_R_NEWORIGIN\n"); t_info("checking for DNS_R_NEWORIGIN\n");
if (dns_result == DNS_R_NEWORIGIN) { if (dns_result == exp_result) {
if (fixedname_cmp(dns_origin, exp_origin)) { if (fixedname_cmp(dns_origin, exp_origin)) {
t_info("\tnew origin %s, expected %s\n", t_info("\torigin %s, expected %s\n",
fixedname_totext(dns_origin), fixedname_totext(dns_origin),
exp_origin); exp_origin);
++nfails; ++nfails;
} }
} } else {
else {
t_info("\tgot %s\n", dns_result_totext(dns_result)); t_info("\tgot %s\n", dns_result_totext(dns_result));
++nfails; ++nfails;
} }
@ -776,6 +777,7 @@ t_dns_rbtnodechain_init(char *dbfile, char *findname,
} }
/* set the starting node */ /* set the starting node */
node = NULL;
dns_result = dns_rbt_findnode(rbt, dns_fixedname_name(&dns_findname), dns_result = dns_rbt_findnode(rbt, dns_fixedname_name(&dns_findname),
dns_fixedname_name(&dns_foundname), dns_fixedname_name(&dns_foundname),
&node, &chain, ISC_TRUE, NULL, NULL); &node, &chain, ISC_TRUE, NULL, NULL);
@ -797,7 +799,8 @@ t_dns_rbtnodechain_init(char *dbfile, char *findname,
dns_result_totext(dns_result)); dns_result_totext(dns_result));
} }
nfails += t_namechk(dns_result, &dns_nextname, nextname, &dns_origin, nextorigin); nfails += t_namechk(dns_result, &dns_nextname, nextname, &dns_origin, nextorigin,
DNS_R_NEWORIGIN);
/* set the starting node again */ /* set the starting node again */
node = NULL; node = NULL;
@ -823,7 +826,8 @@ t_dns_rbtnodechain_init(char *dbfile, char *findname,
t_info("dns_rbtnodechain_prev unexpectedly returned %s\n", t_info("dns_rbtnodechain_prev unexpectedly returned %s\n",
dns_result_totext(dns_result)); dns_result_totext(dns_result));
} }
nfails += t_namechk(dns_result, &dns_prevname, prevname, &dns_origin, prevorigin); nfails += t_namechk(dns_result, &dns_prevname, prevname, &dns_origin, prevorigin,
DNS_R_NEWORIGIN);
/* check first */ /* check first */
@ -837,7 +841,8 @@ t_dns_rbtnodechain_init(char *dbfile, char *findname,
t_info("dns_rbtnodechain_first unexpectedly returned %s\n", t_info("dns_rbtnodechain_first unexpectedly returned %s\n",
dns_result_totext(dns_result)); dns_result_totext(dns_result));
} }
nfails += t_namechk(dns_result, &dns_firstname, firstname, &dns_origin, firstorigin); nfails += t_namechk(dns_result, &dns_firstname, firstname, &dns_origin, firstorigin,
DNS_R_NEWORIGIN);
/* check last */ /* check last */
@ -850,7 +855,8 @@ t_dns_rbtnodechain_init(char *dbfile, char *findname,
t_info("dns_rbtnodechain_last unexpectedly returned %s\n", t_info("dns_rbtnodechain_last unexpectedly returned %s\n",
dns_result_totext(dns_result)); dns_result_totext(dns_result));
} }
nfails += t_namechk(dns_result, &dns_lastname, lastname, &dns_origin, lastorigin); nfails += t_namechk(dns_result, &dns_lastname, lastname, &dns_origin, lastorigin,
DNS_R_NEWORIGIN);
/* check node ordering */ /* check node ordering */
t_info("checking node ordering\n"); t_info("checking node ordering\n");
@ -960,6 +966,7 @@ t_dns_rbtnodechain_first(char *dbfile, char *expected_firstname,
dns_result_t dns_result; dns_result_t dns_result;
dns_fixedname_t dns_name; dns_fixedname_t dns_name;
dns_fixedname_t dns_origin; dns_fixedname_t dns_origin;
dns_result_t expected_result;
result = T_UNRESOLVED; result = T_UNRESOLVED;
@ -995,10 +1002,10 @@ t_dns_rbtnodechain_first(char *dbfile, char *expected_firstname,
t_info("dns_rbtnodechain_first unexpectedly returned %s\n", t_info("dns_rbtnodechain_first unexpectedly returned %s\n",
dns_result_totext(dns_result)); dns_result_totext(dns_result));
} }
nfails = t_namechk(dns_result, &dns_name, expected_firstname, &dns_origin, expected_firstorigin); nfails = t_namechk(dns_result, &dns_name, expected_firstname,
&dns_origin, expected_firstorigin, DNS_R_NEWORIGIN);
dns_fixedname_init(&dns_name); dns_fixedname_init(&dns_name);
dns_fixedname_init(&dns_origin);
dns_result = dns_rbtnodechain_next(&chain, dns_result = dns_rbtnodechain_next(&chain,
dns_fixedname_name(&dns_name), dns_fixedname_name(&dns_name),
dns_fixedname_name(&dns_origin)); dns_fixedname_name(&dns_origin));
@ -1010,7 +1017,12 @@ t_dns_rbtnodechain_first(char *dbfile, char *expected_firstname,
t_info("dns_rbtnodechain_next unexpectedly returned %s\n", t_info("dns_rbtnodechain_next unexpectedly returned %s\n",
dns_result_totext(dns_result)); dns_result_totext(dns_result));
} }
nfails += t_namechk(dns_result, &dns_name, expected_nextname, &dns_origin, expected_nextorigin); if (strcasecmp(expected_firstorigin, expected_nextorigin) == 0)
expected_result = DNS_R_SUCCESS;
else
expected_result = DNS_R_NEWORIGIN;
nfails += t_namechk(dns_result, &dns_name, expected_nextname,
&dns_origin, expected_nextorigin, expected_result);
if (nfails) if (nfails)
result = T_FAIL; result = T_FAIL;
@ -1116,6 +1128,7 @@ t_dns_rbtnodechain_last(char *dbfile, char *expected_lastname,
dns_result_t dns_result; dns_result_t dns_result;
dns_fixedname_t dns_name; dns_fixedname_t dns_name;
dns_fixedname_t dns_origin; dns_fixedname_t dns_origin;
dns_result_t expected_result;
result = T_UNRESOLVED; result = T_UNRESOLVED;
@ -1150,12 +1163,12 @@ t_dns_rbtnodechain_last(char *dbfile, char *expected_lastname,
t_info("dns_rbtnodechain_last unexpectedly returned %s\n", t_info("dns_rbtnodechain_last unexpectedly returned %s\n",
dns_result_totext(dns_result)); dns_result_totext(dns_result));
} }
nfails = t_namechk(dns_result, &dns_name, expected_lastname, &dns_origin, expected_lastorigin); nfails = t_namechk(dns_result, &dns_name, expected_lastname, &dns_origin, expected_lastorigin,
DNS_R_NEWORIGIN);
t_info("testing for previous name of %s, origin of %s\n", expected_prevname, expected_prevorigin); t_info("testing for previous name of %s, origin of %s\n", expected_prevname, expected_prevorigin);
dns_fixedname_init(&dns_name); dns_fixedname_init(&dns_name);
dns_fixedname_init(&dns_origin);
dns_result = dns_rbtnodechain_prev(&chain, dns_result = dns_rbtnodechain_prev(&chain,
dns_fixedname_name(&dns_name), dns_fixedname_name(&dns_name),
dns_fixedname_name(&dns_origin)); dns_fixedname_name(&dns_origin));
@ -1164,7 +1177,12 @@ t_dns_rbtnodechain_last(char *dbfile, char *expected_lastname,
t_info("dns_rbtnodechain_prev unexpectedly returned %s\n", t_info("dns_rbtnodechain_prev unexpectedly returned %s\n",
dns_result_totext(dns_result)); dns_result_totext(dns_result));
} }
nfails += t_namechk(dns_result, &dns_name, expected_prevname, &dns_origin, expected_prevorigin); if (strcasecmp(expected_lastorigin, expected_prevorigin) == 0)
expected_result = DNS_R_SUCCESS;
else
expected_result = DNS_R_NEWORIGIN;
nfails += t_namechk(dns_result, &dns_name, expected_prevname,
&dns_origin, expected_prevorigin, expected_result);
if (nfails) if (nfails)
result = T_FAIL; result = T_FAIL;
@ -1313,6 +1331,7 @@ t_dns_rbtnodechain_next(char *dbfile, char *findname,
} }
/* set the starting node */ /* set the starting node */
node = NULL;
dns_result = dns_rbt_findnode(rbt, dns_fixedname_name(&dns_findname), dns_result = dns_rbt_findnode(rbt, dns_fixedname_name(&dns_findname),
dns_fixedname_name(&dns_foundname), dns_fixedname_name(&dns_foundname),
&node, &chain, ISC_TRUE, NULL, NULL); &node, &chain, ISC_TRUE, NULL, NULL);
@ -1334,7 +1353,8 @@ t_dns_rbtnodechain_next(char *dbfile, char *findname,
dns_result_totext(dns_result)); dns_result_totext(dns_result));
} }
nfails += t_namechk(dns_result, &dns_nextname, nextname, &dns_origin, nextorigin); nfails += t_namechk(dns_result, &dns_nextname, nextname, &dns_origin, nextorigin,
DNS_R_NEWORIGIN);
if (nfails) if (nfails)
result = T_FAIL; result = T_FAIL;
@ -1504,7 +1524,8 @@ t_dns_rbtnodechain_prev(char *dbfile, char *findname,
dns_result_totext(dns_result)); dns_result_totext(dns_result));
} }
nfails += t_namechk(dns_result, &dns_prevname, prevname, &dns_origin, prevorigin); nfails += t_namechk(dns_result, &dns_prevname, prevname, &dns_origin, prevorigin,
DNS_R_NEWORIGIN);
if (nfails) if (nfails)
result = T_FAIL; result = T_FAIL;