upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 08:09:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Unify RR counting in isctest.check helper

Browse source 
Use a common function to count the number of RRs in any section of the
DNS message. For the ADDITIONAL section, stick with the dnspython
convention of not including OPT and TSIG.

(cherry picked from commit efd60348b9)
This commit is contained in:
Nicki Křížek 2025-07-25 11:09:30 +02:00 committed by Evan Hunt
parent eeace11202
commit c92a6b85fe
1 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
bin/tests/system/isctest/check.py
View file

@ -156,28 +156,10 @@ def empty_answer(message: dns.message.Message) -> None:
assert not message.answer, str(message)
def answer_count_eq(m: dns.message.Message, expected: int):
count = sum(max(1, len(rrs)) for rrs in m.answer)
assert count == expected, str(m)
def authority_count_eq(m: dns.message.Message, expected: int):
count = sum(max(1, len(rrs)) for rrs in m.authority)
assert count == expected, str(m)
def additional_count_eq(m: dns.message.Message, expected: int):
count = sum(max(1, len(rrs)) for rrs in m.additional)
# add one for the OPT?
opt = bool(m.opt) if hasattr(m, "opt") else bool(m.edns >= 0)
count += 1 if opt else 0
# add one for the TSIG?
tsig = bool(m.tsig) if hasattr(m, "tsig") else m.had_tsig
count += 1 if tsig else 0
assert count == expected, str(m)
def rr_count_eq(section: list, expected: int):
# NOTE: OPT and TSIG records aren't included in the count for ADDITIONAL section
count = sum(len(rrset) for rrset in section)
assert count == expected, str(section)
def is_response_to(response: dns.message.Message, query: dns.message.Message) -> None: