LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

dht test environment fixes

Browse source
This commit is contained in:
Jack Robison 2018-05-29 16:16:19 -04:00
parent 51b42da1c5
commit 545930cea4
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lbrynet/tests/functional/dht/dht_test_environment.py
View file

@ -1,6 +1,7 @@
import logging import logging
from twisted.trial import unittest from twisted.trial import unittest
from twisted.internet import defer, task from twisted.internet import defer, task
from lbrynet.dht import constants
from lbrynet.dht.node import Node from lbrynet.dht.node import Node
from mock_transport import resolve, listenUDP, MOCK_DHT_SEED_DNS, mock_node_generator from mock_transport import resolve, listenUDP, MOCK_DHT_SEED_DNS, mock_node_generator
@ -45,8 +46,8 @@ class TestKademliaBase(unittest.TestCase):
""" """
for _ in range(int(n * (1.0 / float(step)))): for _ in range(int(n * (1.0 / float(step)))):
self.clock.advance(step) self.clock.advance(step)
if tick_callback and callable(tick_callback): if tick_callback and callable(tick_callback):
tick_callback(self.clock.seconds()) tick_callback(self.clock.seconds())
def run_reactor(self, seconds, deferreds, tick_callback=None): def run_reactor(self, seconds, deferreds, tick_callback=None):
d = defer.DeferredList(deferreds) d = defer.DeferredList(deferreds)
@ -110,14 +111,14 @@ class TestKademliaBase(unittest.TestCase):
seed_dl.append( seed_dl.append(
seed.start(known_addresses) seed.start(known_addresses)
) )
yield self.run_reactor(901, seed_dl) yield self.run_reactor(constants.checkRefreshInterval+1, seed_dl)
while len(self.nodes + self._seeds) < self.network_size: while len(self.nodes + self._seeds) < self.network_size:
network_dl = [] network_dl = []
for i in range(min(10, self.network_size - len(self._seeds) - len(self.nodes))): for i in range(min(10, self.network_size - len(self._seeds) - len(self.nodes))):
network_dl.append(self.add_node()) network_dl.append(self.add_node())
yield self.run_reactor(31, network_dl) yield self.run_reactor(constants.checkRefreshInterval*2+1, network_dl)
self.assertEqual(len(self.nodes + self._seeds), self.network_size) self.assertEqual(len(self.nodes + self._seeds), self.network_size)
self.pump_clock(1800) self.pump_clock(3600)
self.verify_all_nodes_are_routable() self.verify_all_nodes_are_routable()
self.verify_all_nodes_are_pingable() self.verify_all_nodes_are_pingable()

6
lbrynet/tests/functional/dht/mock_transport.py
View file

@ -1,7 +1,7 @@
import struct import struct
import hashlib
import logging import logging
from twisted.internet import defer, error from twisted.internet import defer, error
from lbrynet.core.utils import generate_id
from lbrynet.dht.encoding import Bencode from lbrynet.dht.encoding import Bencode
from lbrynet.dht.error import DecodeError from lbrynet.dht.error import DecodeError
from lbrynet.dht.msgformat import DefaultFormat from lbrynet.dht.msgformat import DefaultFormat
@ -121,7 +121,9 @@ def mock_node_generator(count=None, mock_node_ids=MOCK_DHT_NODES):
if count and num >= count: if count and num >= count:
break break
if num >= len(mock_node_ids): if num >= len(mock_node_ids):
node_id = generate_id().encode('hex') h = hashlib.sha384()
h.update("node %i" % num)
node_id = h.hexdigest()
else: else:
node_id = mock_node_ids[num] node_id = mock_node_ids[num]
yield (node_id, node_ip) yield (node_id, node_ip)