Skip to content

test: cap helper get_service_info timeout in suppression test (~3.0s → ~1.85s) #1708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bdraco merged 1 commit into from
May 18, 2026
Merged

test: cap helper get_service_info timeout in suppression test (~3.0s → ~1.85s) #1708

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions tests/services/test_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,9 +430,9 @@ def mock_incoming_msg(records: Iterable[r.DNSRecord]) -> r.DNSIncoming:

return r.DNSIncoming(generated.packets()[0])

def get_service_info_helper(zc, type, name):
def get_service_info_helper(zc, type, name, timeout):
nonlocal service_info
service_info = zc.get_service_info(type, name)
service_info = zc.get_service_info(type, name, timeout)
service_info_event.set()

try:
Expand All @@ -453,9 +453,14 @@ def get_service_info_helper(zc, type, name):
for question in seed_history_questions:
zc.question_history.add_question_at_time(question, far_future, set())

# No answers ever come back (all queries are suppressed),
# so cap the helper at the worst-case sum of the three
# phase waits below plus margin instead of the 3000ms
# default. Phase 3 waits ~1.6s (the 999ms QM gap plus
# jitter and 500ms buffer); 1500ms covers it.
helper_thread = threading.Thread(
target=get_service_info_helper,
args=(zc, service_type, service_name),
args=(zc, service_type, service_name, 1500),
)
helper_thread.start()
wait_time = (const._LISTENER_TIME + info._AVOID_SYNC_DELAY_RANDOM_INTERVAL[1] + 500) / 1000
Expand Down
Loading