Skip to content

Fix flakey test: test_future_answers_are_removed_on_send #962

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 2 commits into from
Aug 15, 2021
Merged

Fix flakey test: test_future_answers_are_removed_on_send #962

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcc2f55
Fix flakey test: test_future_answers_are_removed_on_send
bdraco Aug 15, 2021
8640340
tweak test to handle overloaded mac github runners
bdraco Aug 15, 2021
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
20 changes: 14 additions & 6 deletions tests/test_handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1466,29 +1466,34 @@ async def test_response_aggregation_random_delay():
async def test_future_answers_are_removed_on_send():
"""Verify any future answers scheduled to be sent are removed when we send."""
type_ = "_mservice._tcp.local."
type_2 = "_mservice2._tcp.local."
name = "xxxyyy"
registration_name = f"{name}.{type_}"
registration_name2 = f"{name}.{type_2}"

desc = {'path': '/~paulsm/'}
info = ServiceInfo(
type_, registration_name, 80, 0, 0, desc, "ash-1.local.", addresses=[socket.inet_aton("10.0.1.2")]
)
info2 = ServiceInfo(
type_2, registration_name2, 80, 0, 0, desc, "ash-2.local.", addresses=[socket.inet_aton("10.0.1.3")]
)
mocked_zc = unittest.mock.MagicMock()
outgoing_queue = MulticastOutgoingQueue(mocked_zc, 0, 0)

now = current_time_millis()
with unittest.mock.patch.object(_handlers, "_MULTICAST_DELAY_RANDOM_INTERVAL", (10, 10)):
with unittest.mock.patch.object(_handlers, "_MULTICAST_DELAY_RANDOM_INTERVAL", (1, 1)):
outgoing_queue.async_add(now, {info.dns_pointer(): set()})

assert len(outgoing_queue.queue) == 1

with unittest.mock.patch.object(_handlers, "_MULTICAST_DELAY_RANDOM_INTERVAL", (20, 20)):
with unittest.mock.patch.object(_handlers, "_MULTICAST_DELAY_RANDOM_INTERVAL", (2, 2)):
outgoing_queue.async_add(now, {info.dns_pointer(): set()})

assert len(outgoing_queue.queue) == 2

with unittest.mock.patch.object(_handlers, "_MULTICAST_DELAY_RANDOM_INTERVAL", (200, 200)):
outgoing_queue.async_add(now, {info.dns_pointer(): set()})
with unittest.mock.patch.object(_handlers, "_MULTICAST_DELAY_RANDOM_INTERVAL", (1000, 1000)):
outgoing_queue.async_add(now, {info2.dns_pointer(): set()})
outgoing_queue.async_add(now, {info.dns_pointer(): set()})

assert len(outgoing_queue.queue) == 3
Expand All @@ -1497,5 +1502,8 @@ async def test_future_answers_are_removed_on_send():
outgoing_queue.async_ready()

assert len(outgoing_queue.queue) == 1
# The answers should all get removed because we just sent them
assert len(outgoing_queue.queue[0].answers) == 0
# The answer should get removed because we just sent it
assert info.dns_pointer() not in outgoing_queue.queue[0].answers

# But the one we have not sent yet shoudl still go out later
assert info2.dns_pointer() in outgoing_queue.queue[0].answers