From 94984be4dfe40ecafe67c0a7502c2edf8b90ebfd Mon Sep 17 00:00:00 2001 From: Alex Stokes Date: Tue, 5 Nov 2019 17:08:18 -0800 Subject: [PATCH] Avoid hard-coding ports where it is not relevant for Kademlia tests --- tests/host/test_routed_host.py | 4 ++-- tests/kademlia/test_basic.py | 6 +++--- tests/kademlia/test_providers.py | 6 +++--- tests/utils.py | 7 +++++-- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/tests/host/test_routed_host.py b/tests/host/test_routed_host.py index 7791d62..25fa4f9 100644 --- a/tests/host/test_routed_host.py +++ b/tests/host/test_routed_host.py @@ -14,7 +14,7 @@ from tests.utils import ( @pytest.mark.asyncio async def test_host_routing_success(): - routers = await set_up_routers([5678, 5679]) + routers = await set_up_routers() transports = [["/ip4/127.0.0.1/tcp/0"], ["/ip4/127.0.0.1/tcp/0"]] transport_disc_opt_list = zip(transports, routers) (host_a, host_b) = await set_up_nodes_by_transport_and_disc_opt( @@ -43,7 +43,7 @@ async def test_host_routing_success(): @pytest.mark.asyncio async def test_host_routing_fail(): - routers = await set_up_routers([5678, 5679]) + routers = await set_up_routers() transports = [["/ip4/127.0.0.1/tcp/0"], ["/ip4/127.0.0.1/tcp/0"]] transport_disc_opt_list = zip(transports, routers) (host_a, host_b) = await set_up_nodes_by_transport_and_disc_opt( diff --git a/tests/kademlia/test_basic.py b/tests/kademlia/test_basic.py index 9c30808..655d471 100644 --- a/tests/kademlia/test_basic.py +++ b/tests/kademlia/test_basic.py @@ -6,15 +6,15 @@ from libp2p.kademlia.network import KademliaServer @pytest.mark.asyncio async def test_example(): node_a = KademliaServer() - await node_a.listen(5678) + await node_a.listen() node_b = KademliaServer() - await node_b.listen(5679) + await node_b.listen() # Bootstrap the node by connecting to other known nodes, in this case # replace 123.123.123.123 with the IP of another node and optionally # give as many ip/port combos as you can for other nodes. - await node_b.bootstrap([("127.0.0.1", 5678)]) + await node_b.bootstrap([node_a.address]) # set a value for the key "my-key" on the network value = "my-value" diff --git a/tests/kademlia/test_providers.py b/tests/kademlia/test_providers.py index f58e945..45993d9 100644 --- a/tests/kademlia/test_providers.py +++ b/tests/kademlia/test_providers.py @@ -6,11 +6,11 @@ from libp2p.kademlia.network import KademliaServer @pytest.mark.asyncio async def test_example(): node_a = KademliaServer() - await node_a.listen(5801) + await node_a.listen() node_b = KademliaServer() - await node_b.listen(5802) - await node_b.bootstrap([("127.0.0.1", 5801)]) + await node_b.listen() + await node_b.bootstrap([node_a.address]) key = "hello" value = "world" diff --git a/tests/utils.py b/tests/utils.py index 67e9668..eb5e9d8 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -45,7 +45,10 @@ async def set_up_nodes_by_transport_and_disc_opt(transport_disc_opt_list): return tuple(nodes_list) -async def set_up_routers(router_confs): +async def set_up_routers(router_confs=[0, 0]): + """ + The default ``router_confs`` selects two free ports local to this machine. + """ bootstrap_node = KademliaServer() await bootstrap_node.listen(router_confs[0]) @@ -54,7 +57,7 @@ async def set_up_routers(router_confs): node = KademliaServer() await node.listen(port) - await node.bootstrap_node(("127.0.0.1", router_confs[0])) + await node.bootstrap_node(bootstrap_node.address) routers.append(KadmeliaPeerRouter(node)) return routers