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

Remove unused sbytes, stime, n, response, and rtime variables

Browse Source 
(cherry picked from commit 4857da271d)
This commit is contained in:
Michal Nowak
2024-10-01 16:07:14 +02:00
parent e0ad4d5eb6
commit 03cf294d06
2 changed files with 52 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
bin/tests/system/timeouts/tests_tcp_timeouts.py
View File

@@ -56,8 +56,8 @@ def test_initial_timeout(named_port):
with pytest.raises(EOFError):
try:
(sbytes, stime) = dns.query.send_tcp(sock, msg, timeout())
(response, rtime) = dns.query.receive_tcp(sock, timeout())
dns.query.send_tcp(sock, msg, timeout())
dns.query.receive_tcp(sock, timeout())
except ConnectionError as e:
raise EOFError from e
@@ -72,20 +72,20 @@ def test_idle_timeout(named_port):
time.sleep(1)
(sbytes, stime) = dns.query.send_tcp(sock, msg, timeout())
(response, rtime) = dns.query.receive_tcp(sock, timeout())
dns.query.send_tcp(sock, msg, timeout())
dns.query.receive_tcp(sock, timeout())
time.sleep(2)
(sbytes, stime) = dns.query.send_tcp(sock, msg, timeout())
(response, rtime) = dns.query.receive_tcp(sock, timeout())
dns.query.send_tcp(sock, msg, timeout())
dns.query.receive_tcp(sock, timeout())
time.sleep(6)
with pytest.raises(EOFError):
try:
(sbytes, stime) = dns.query.send_tcp(sock, msg, timeout())
(response, rtime) = dns.query.receive_tcp(sock, timeout())
dns.query.send_tcp(sock, msg, timeout())
dns.query.receive_tcp(sock, timeout())
except ConnectionError as e:
raise EOFError from e
@@ -103,18 +103,18 @@ def test_keepalive_timeout(named_port):
time.sleep(1)
(sbytes, stime) = dns.query.send_tcp(sock, msg, timeout())
(response, rtime) = dns.query.receive_tcp(sock, timeout())
dns.query.send_tcp(sock, msg, timeout())
dns.query.receive_tcp(sock, timeout())
time.sleep(2)
(sbytes, stime) = dns.query.send_tcp(sock, msg, timeout())
(response, rtime) = dns.query.receive_tcp(sock, timeout())
dns.query.send_tcp(sock, msg, timeout())
dns.query.receive_tcp(sock, timeout())
time.sleep(6)
(sbytes, stime) = dns.query.send_tcp(sock, msg, timeout())
(response, rtime) = dns.query.receive_tcp(sock, timeout())
dns.query.send_tcp(sock, msg, timeout())
dns.query.receive_tcp(sock, timeout())
def test_pipelining_timeout(named_port):
@@ -128,25 +128,25 @@ def test_pipelining_timeout(named_port):
time.sleep(1)
# Send and receive 25 DNS queries
for n in range(25):
(sbytes, stime) = dns.query.send_tcp(sock, msg, timeout())
for n in range(25):
(response, rtime) = dns.query.receive_tcp(sock, timeout())
for _ in range(25):
dns.query.send_tcp(sock, msg, timeout())
for _ in range(25):
dns.query.receive_tcp(sock, timeout())
time.sleep(3)
# Send and receive 25 DNS queries
for n in range(25):
(sbytes, stime) = dns.query.send_tcp(sock, msg, timeout())
for n in range(25):
(response, rtime) = dns.query.receive_tcp(sock, timeout())
for _ in range(25):
dns.query.send_tcp(sock, msg, timeout())
for _ in range(25):
dns.query.receive_tcp(sock, timeout())
time.sleep(6)
with pytest.raises(EOFError):
try:
(sbytes, stime) = dns.query.send_tcp(sock, msg, timeout())
(response, rtime) = dns.query.receive_tcp(sock, timeout())
dns.query.send_tcp(sock, msg, timeout())
dns.query.receive_tcp(sock, timeout())
except ConnectionError as e:
raise EOFError from e
@@ -161,12 +161,10 @@ def test_long_axfr(named_port):
name = dns.name.from_text("example.")
msg = create_msg("example.", "AXFR")
(sbytes, stime) = dns.query.send_tcp(sock, msg, timeout())
dns.query.send_tcp(sock, msg, timeout())
# Receive the initial DNS message with SOA
(response, rtime) = dns.query.receive_tcp(
sock, timeout(), one_rr_per_rrset=True
)
(response, _) = dns.query.receive_tcp(sock, timeout(), one_rr_per_rrset=True)
soa = response.get_rrset(
dns.message.ANSWER, name, dns.rdataclass.IN, dns.rdatatype.SOA
)
@@ -174,7 +172,7 @@ def test_long_axfr(named_port):
# Pull DNS message from wire until the second SOA is received
while True:
(response, rtime) = dns.query.receive_tcp(
(response, _) = dns.query.receive_tcp(
sock, timeout(), one_rr_per_rrset=True
)
soa = response.get_rrset(
@@ -192,13 +190,13 @@ def test_send_timeout(named_port):
# Send and receive single large RDATA over TCP
msg = create_msg("large.example.", "TXT")
(sbytes, stime) = dns.query.send_tcp(sock, msg, timeout())
(response, rtime) = dns.query.receive_tcp(sock, timeout())
dns.query.send_tcp(sock, msg, timeout())
dns.query.receive_tcp(sock, timeout())
# Send and receive 28 large (~32k) DNS queries that should
# fill the default maximum 208k TCP send buffer
for n in range(28):
(sbytes, stime) = dns.query.send_tcp(sock, msg, timeout())
for _ in range(28):
dns.query.send_tcp(sock, msg, timeout())
# configure idle interval is 5 seconds, sleep 6 to make sure we are
# above the interval
@@ -206,8 +204,8 @@ def test_send_timeout(named_port):
with pytest.raises(EOFError):
try:
(sbytes, stime) = dns.query.send_tcp(sock, msg, timeout())
(response, rtime) = dns.query.receive_tcp(sock, timeout())
dns.query.send_tcp(sock, msg, timeout())
dns.query.receive_tcp(sock, timeout())
except ConnectionError as e:
raise EOFError from e
@@ -219,12 +217,10 @@ def test_max_transfer_idle_out(named_port):
name = dns.name.from_text("example.")
msg = create_msg("example.", "AXFR")
(sbytes, stime) = dns.query.send_tcp(sock, msg, timeout())
dns.query.send_tcp(sock, msg, timeout())
# Receive the initial DNS message with SOA
(response, rtime) = dns.query.receive_tcp(
sock, timeout(), one_rr_per_rrset=True
)
(response, _) = dns.query.receive_tcp(sock, timeout(), one_rr_per_rrset=True)
soa = response.get_rrset(
dns.message.ANSWER, name, dns.rdataclass.IN, dns.rdatatype.SOA
)
@@ -235,7 +231,7 @@ def test_max_transfer_idle_out(named_port):
with pytest.raises(ConnectionResetError):
# Process queued TCP messages
while True:
(response, rtime) = dns.query.receive_tcp(
(response, _) = dns.query.receive_tcp(
sock, timeout(), one_rr_per_rrset=True
)
soa = response.get_rrset(
@@ -253,12 +249,10 @@ def test_max_transfer_time_out(named_port):
name = dns.name.from_text("example.")
msg = create_msg("example.", "AXFR")
(sbytes, stime) = dns.query.send_tcp(sock, msg, timeout())
dns.query.send_tcp(sock, msg, timeout())
# Receive the initial DNS message with SOA
(response, rtime) = dns.query.receive_tcp(
sock, timeout(), one_rr_per_rrset=True
)
(response, _) = dns.query.receive_tcp(sock, timeout(), one_rr_per_rrset=True)
soa = response.get_rrset(
dns.message.ANSWER, name, dns.rdataclass.IN, dns.rdatatype.SOA
)
@@ -268,7 +262,7 @@ def test_max_transfer_time_out(named_port):
with pytest.raises(EOFError):
while True:
time.sleep(1)
(response, rtime) = dns.query.receive_tcp(
(response, _) = dns.query.receive_tcp(
sock, timeout(), one_rr_per_rrset=True
)
soa = response.get_rrset(