upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-03-28 21:34:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use more concise syntax to check responses in rpzextra tests

Browse source 
All the answers are expected to have exactly one resource record. Check
it directly instead of iterating over all (possible) records.
This commit is contained in:
Tom Krizek 2023-03-23 14:41:05 +01:00 committed by Ondřej Surý
parent 1649c768e9
commit 2ed26609b8
No known key found for this signature in database
GPG key ID: 2820F37E873DEA41
2 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
bin/tests/system/rpzextra/tests_rpz_multiple_views.py
View file

@ -15,7 +15,7 @@ import time
import pytest
pytest.importorskip("dns")
pytest.importorskip("dns", minversion="2.0.0")
import dns.resolver
@ -53,8 +53,7 @@ def test_rpz_multiple_views(named_port):
resolver.resolve("baddomain.", "A", source="10.53.0.1")
ans = resolver.resolve("gooddomain.", "A", source="10.53.0.1")
for rd in ans:
assert rd.address == "10.53.0.2"
assert ans[0].address == "10.53.0.2"
ans = resolver.resolve("allowed.", "A", source="10.53.0.1")
assert ans[0].address == "10.53.0.2"
@ -64,12 +63,10 @@ def test_rpz_multiple_views(named_port):
# - baddomain.com is allowed
# - gooddomain.com is allowed
ans = resolver.resolve("baddomain.", "A", source="10.53.0.2")
for rd in ans:
assert rd.address == "10.53.0.2"
assert ans[0].address == "10.53.0.2"
ans = resolver.resolve("gooddomain.", "A", source="10.53.0.2")
for rd in ans:
assert rd.address == "10.53.0.2"
assert ans[0].address == "10.53.0.2"
with pytest.raises(dns.resolver.NXDOMAIN):
resolver.resolve("allowed.", "A", source="10.53.0.2")
@ -79,12 +76,10 @@ def test_rpz_multiple_views(named_port):
# - baddomain.com is allowed
# - allowed. is allowed
ans = resolver.resolve("baddomain.", "A", source="10.53.0.3")
for rd in ans:
assert rd.address == "10.53.0.2"
assert ans[0].address == "10.53.0.2"
ans = resolver.resolve("gooddomain.", "A", source="10.53.0.3")
for rd in ans:
assert rd.address == "10.53.0.2"
assert ans[0].address == "10.53.0.2"
ans = resolver.resolve("allowed.", "A", source="10.53.0.3")
assert ans[0].address == "10.53.0.2"
@ -107,8 +102,7 @@ def test_rpz_multiple_views(named_port):
# - gooddomain.com isn't allowed (CNAME .), should return NXDOMAIN
# - allowed.com isn't allowed (CNAME .), should return NXDOMAIN
ans = resolver.resolve("baddomain.", "A", source="10.53.0.5")
for rd in ans:
assert rd.address == "10.53.0.2"
assert ans[0].address == "10.53.0.2"
with pytest.raises(dns.resolver.NXDOMAIN):
resolver.resolve("gooddomain.", "A", source="10.53.0.5")

5
bin/tests/system/rpzextra/tests_rpz_passthru_logging.py
View file

@ -15,7 +15,7 @@ import os
import pytest
pytest.importorskip("dns")
pytest.importorskip("dns", minversion="2.0.0")
import dns.resolver
@ -26,8 +26,7 @@ def test_rpz_passthru_logging(named_port):
# Should generate a log entry into rpz_passthru.txt
ans = resolver.resolve("allowed.", "A", source="10.53.0.1")
for rd in ans:
assert rd.address == "10.53.0.2"
assert ans[0].address == "10.53.0.2"
# baddomain.com isn't allowed (CNAME .), should return NXDOMAIN
# Should generate a log entry into rpz.txt