Skip to content

Fix test_lots_of_names overflowing the incoming buffer #763

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
Jun 20, 2021
Merged

Fix test_lots_of_names overflowing the incoming buffer #763

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
16 changes: 6 additions & 10 deletions tests/test_init.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
import zeroconf as r
from zeroconf import ServiceBrowser, ServiceInfo, Zeroconf, const

from . import _inject_response

log = logging.getLogger('zeroconf')
original_logging_level = logging.NOTSET

Expand Down Expand Up @@ -153,7 +155,7 @@ def on_service_state_change(zeroconf, service_type, state_change, name):
# force receive on oversized packet
zc.send(out, const._MDNS_ADDR, const._MDNS_PORT)
zc.send(out, const._MDNS_ADDR, const._MDNS_PORT)
time.sleep(2.0)
time.sleep(0.3)
zeroconf.log.debug(
'warn %d debug %d was %s',
mocked_log_warn.call_count,
Expand All @@ -162,8 +164,8 @@ def on_service_state_change(zeroconf, service_type, state_change, name):
)
assert mocked_log_debug.call_count > call_counts[0]

# close our zeroconf which will close the sockets
zc.close()
# close our zeroconf which will close the sockets
zc.close()

def verify_name_change(self, zc, type_, name, number_hosts):
desc = {'path': '/~paulsm/'}
Expand Down Expand Up @@ -201,17 +203,11 @@ def verify_name_change(self, zc, type_, name, number_hosts):
assert info_service2.name.split('.')[0] == '%s-%d' % (name, number_hosts + 1)

def generate_many_hosts(self, zc, type_, name, number_hosts):
records_per_server = 2
block_size = 25
number_hosts = int(((number_hosts - 1) / block_size + 1)) * block_size
for i in range(1, number_hosts + 1):
next_name = name if i == 1 else '%s-%d' % (name, i)
self.generate_host(zc, next_name, type_)
if i % block_size == 0:
sleep_count = 0
while sleep_count < 40 and i * records_per_server > len(zc.cache.entries_with_name(type_)):
sleep_count += 1
time.sleep(0.05)

@staticmethod
def generate_host(zc, host_name, type_):
Expand All @@ -233,4 +229,4 @@ def generate_host(zc, host_name, type_):
),
0,
)
zc.send(out)
_inject_response(zc, r.DNSIncoming(out.packets()[0]))