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

Merge branch '2763-increase-timeout-in-the-rndc-deadlock-test' into 'main'

Browse Source 
Increase timeout in the rndc deadlock test

Closes #2763

See merge request isc-projects/bind9!5163
This commit is contained in:
Michał Kępień
2021-06-17 10:40:31 +00:00
parent 023fcf3365 ac4c58e8ce
commit 64acd7c8c8
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bin/tests/system/addzone/tests_rndc_deadlock.py
View File

@@ -17,7 +17,7 @@ import time
def run_rndc(server, rndc_command):
'''
Send the specified 'rndc_command' to 'server' with a timeout of 2 seconds
Send the specified 'rndc_command' to 'server' with a timeout of 10 seconds
'''
rndc = os.getenv('RNDC')
port = os.getenv('CONTROLPORT')
@@ -25,7 +25,7 @@ def run_rndc(server, rndc_command):
cmdline = [rndc, '-c', '../common/rndc.conf', '-p', port, '-s', server]
cmdline.extend(rndc_command)
subprocess.check_output(cmdline, stderr=subprocess.STDOUT, timeout=2)
subprocess.check_output(cmdline, stderr=subprocess.STDOUT, timeout=10)
def rndc_loop(test_state, domain):
@@ -73,8 +73,9 @@ def test_rndc_deadlock():
domain = 'example%d' % i
executor.submit(rndc_loop, test_state, domain)
# Run "rndc status" in 1-second intervals for a maximum of 10 seconds.
# If any "rndc status" command fails, the loop will be interrupted.
# Run "rndc status" 10 times, with 1-second pauses between attempts.
# Each "rndc status" invocation has a timeout of 10 seconds. If any of
# them fails, the loop will be interrupted.
server_is_responsive = True
attempts = 10
while server_is_responsive and attempts > 0: