mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 22:45:39 +00:00
Code Issues Releases Wiki Activity

Move query outside of check_() functions

Browse Source 
This allows better check() code reuse.

(cherry picked from commit cc6544b417)
This commit is contained in:
Petr Špaček
2025-07-10 14:45:35 +02:00
parent f0b5967f10
commit 8926c20af7
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
bin/tests/system/nsec3-answer/tests_nsec3.py
View File

@@ -92,7 +92,8 @@ def test_nxdomain(server, qname: dns.name.Name, named_port: int) -> None:
wname = ZONE.source_of_synthesis(qname) wname = ZONE.source_of_synthesis(qname)
assume(wname not in ZONE.reachable_wildcards) assume(wname not in ZONE.reachable_wildcards)
check_nxdomain(server, named_port, qname) _, nsec3check = do_test_query(qname, dns.rdatatype.A, server, named_port)
check_nxdomain(qname, nsec3check)
@pytest.mark.parametrize( @pytest.mark.parametrize(
@@ -103,12 +104,14 @@ def test_ents(server, qname: dns.name.Name, named_port: int) -> None:
"""ENT can have a wildcard under it""" """ENT can have a wildcard under it"""
assume_nx_and_no_delegation(qname) assume_nx_and_no_delegation(qname)
_, nsec3check = do_test_query(qname, dns.rdatatype.A, server, named_port)
wname = ZONE.source_of_synthesis(qname) wname = ZONE.source_of_synthesis(qname)
# does qname match a wildcard under ENT? # does qname match a wildcard under ENT?
if wname in ZONE.reachable_wildcards: if wname in ZONE.reachable_wildcards:
check_wildcard_synthesis(server, named_port, qname) check_wildcard_synthesis(qname, nsec3check)
else: else:
check_nxdomain(server, named_port, qname) check_nxdomain(qname, nsec3check)
@pytest.mark.parametrize( @pytest.mark.parametrize(
@@ -121,7 +124,8 @@ def test_wildcard_synthesis(server, qname: dns.name.Name, named_port: int) -> No
wname = ZONE.source_of_synthesis(qname) wname = ZONE.source_of_synthesis(qname)
assume(wname in ZONE.reachable_wildcards) assume(wname in ZONE.reachable_wildcards)
check_wildcard_synthesis(server, named_port, qname) _, nsec3check = do_test_query(qname, dns.rdatatype.A, server, named_port)
check_wildcard_synthesis(qname, nsec3check)
@pytest.mark.parametrize( @pytest.mark.parametrize(
@@ -134,12 +138,12 @@ def test_wildcard_nodata(server, qname: dns.name.Name, named_port: int) -> None:
wname = ZONE.source_of_synthesis(qname) wname = ZONE.source_of_synthesis(qname)
assume(wname in ZONE.reachable_wildcards) assume(wname in ZONE.reachable_wildcards)
check_wildcard_nodata(server, named_port, qname) _, nsec3check = do_test_query(qname, dns.rdatatype.AAAA, server, named_port)
check_wildcard_nodata(qname, nsec3check)
def check_wildcard_nodata(server, named_port: int, qname: dns.name.Name) -> None: def check_wildcard_nodata(qname: dns.name.Name, nsec3check: "NSEC3Checker") -> None:
response, nsec3check = do_test_query(qname, dns.rdatatype.AAAA, server, named_port) assert nsec3check.response.rcode() is dns.rcode.NOERROR
assert response.rcode() is dns.rcode.NOERROR
ce, nce = ZONE.closest_encloser(qname) ce, nce = ZONE.closest_encloser(qname)
nsec3check.prove_name_exists(ce) nsec3check.prove_name_exists(ce)
@@ -151,9 +155,8 @@ def check_wildcard_nodata(server, named_port: int, qname: dns.name.Name) -> None
nsec3check.check_extraneous_rrs() nsec3check.check_extraneous_rrs()
def check_nxdomain(server, named_port: int, qname: dns.name.Name) -> None: def check_nxdomain(qname: dns.name.Name, nsec3check: "NSEC3Checker") -> None:
response, nsec3check = do_test_query(qname, dns.rdatatype.A, server, named_port) assert nsec3check.response.rcode() is dns.rcode.NXDOMAIN
assert response.rcode() is dns.rcode.NXDOMAIN
ce, nce = ZONE.closest_encloser(qname) ce, nce = ZONE.closest_encloser(qname)
nsec3check.prove_name_exists(ce) nsec3check.prove_name_exists(ce)
@@ -164,12 +167,11 @@ def check_nxdomain(server, named_port: int, qname: dns.name.Name) -> None:
nsec3check.check_extraneous_rrs() nsec3check.check_extraneous_rrs()
def check_wildcard_synthesis(server, named_port: int, qname: dns.name.Name) -> None: def check_wildcard_synthesis(qname: dns.name.Name, nsec3check: "NSEC3Checker") -> None:
"""Expect wildcard response with a signed A RRset""" """Expect wildcard response with a signed A RRset"""
response, nsec3check = do_test_query(qname, dns.rdatatype.A, server, named_port) assert nsec3check.response.rcode() is dns.rcode.NOERROR
assert response.rcode() is dns.rcode.NOERROR
answer_sig = response.get_rrset( answer_sig = nsec3check.response.get_rrset(
section="ANSWER", section="ANSWER",
name=qname, name=qname,
rdclass=dns.rdataclass.IN, rdclass=dns.rdataclass.IN,