From c894ade25e65db2d0969d80aebfcc8f60ad57838 Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Sun, 1 Dec 2019 17:21:42 -0500 Subject: [PATCH] fix integration tests --- lbry/lbry/dht/peer.py | 3 +++ lbry/tests/integration/test_dht.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/lbry/lbry/dht/peer.py b/lbry/lbry/dht/peer.py index c90ce41ce..0e302a6b9 100644 --- a/lbry/lbry/dht/peer.py +++ b/lbry/lbry/dht/peer.py @@ -24,8 +24,11 @@ def make_kademlia_peer(node_id: typing.Optional[bytes], address: typing.Optional carrier_grade_NAT_subnet = ipaddress.ip_network('100.64.0.0/10') ip4_to_6_relay_subnet = ipaddress.ip_network('192.88.99.0/24') +ALLOW_LOCALHOST = False + def is_valid_public_ipv4(address, allow_localhost: bool = False): + allow_localhost = bool(allow_localhost or ALLOW_LOCALHOST) try: parsed_ip = ipaddress.ip_address(address) if parsed_ip.is_loopback and allow_localhost: diff --git a/lbry/tests/integration/test_dht.py b/lbry/tests/integration/test_dht.py index d8d4c2bd8..25443ee6c 100644 --- a/lbry/tests/integration/test_dht.py +++ b/lbry/tests/integration/test_dht.py @@ -3,6 +3,7 @@ from binascii import hexlify from lbry.dht import constants from lbry.dht.node import Node +from lbry.dht import peer as dht_peer from lbry.dht.peer import PeerManager, make_kademlia_peer from torba.testcase import AsyncioTestCase @@ -10,6 +11,8 @@ from torba.testcase import AsyncioTestCase class DHTIntegrationTest(AsyncioTestCase): async def asyncSetUp(self): + dht_peer.ALLOW_LOCALHOST = True + self.addCleanup(setattr, dht_peer, 'ALLOW_LOCALHOST', False) import logging logging.getLogger('asyncio').setLevel(logging.ERROR) logging.getLogger('lbry.dht').setLevel(logging.WARN)