update test for identify and ping using new test fixture via PR feedback

This commit is contained in:
Alex Stokes 2019-11-07 21:01:08 -08:00
parent 30dee28ef2
commit 29873584dc
No known key found for this signature in database
GPG Key ID: 51CE1721B245C086
2 changed files with 28 additions and 48 deletions

View File

@ -4,25 +4,18 @@ import secrets
import pytest import pytest
from libp2p.host.ping import ID, PING_LENGTH from libp2p.host.ping import ID, PING_LENGTH
from libp2p.peer.peerinfo import info_from_p2p_addr from tests.factories import pair_of_connected_hosts
from tests.utils import set_up_nodes_by_transport_opt
@pytest.mark.asyncio @pytest.mark.asyncio
async def test_ping_once(): async def test_ping_once():
transport_opt_list = [["/ip4/127.0.0.1/tcp/0"], ["/ip4/127.0.0.1/tcp/0"]] async with pair_of_connected_hosts() as (host_a, host_b):
(host_a, host_b) = await set_up_nodes_by_transport_opt(transport_opt_list) stream = await host_b.new_stream(host_a.get_id(), (ID,))
some_ping = secrets.token_bytes(PING_LENGTH)
addr = host_a.get_addrs()[0] await stream.write(some_ping)
info = info_from_p2p_addr(addr) some_pong = await stream.read(PING_LENGTH)
await host_b.connect(info) assert some_ping == some_pong
await stream.close()
stream = await host_b.new_stream(host_a.get_id(), (ID,))
some_ping = secrets.token_bytes(PING_LENGTH)
await stream.write(some_ping)
some_pong = await stream.read(PING_LENGTH)
assert some_ping == some_pong
await stream.close()
SOME_PING_COUNT = 3 SOME_PING_COUNT = 3
@ -30,21 +23,15 @@ SOME_PING_COUNT = 3
@pytest.mark.asyncio @pytest.mark.asyncio
async def test_ping_several(): async def test_ping_several():
transport_opt_list = [["/ip4/127.0.0.1/tcp/0"], ["/ip4/127.0.0.1/tcp/0"]] async with pair_of_connected_hosts() as (host_a, host_b):
(host_a, host_b) = await set_up_nodes_by_transport_opt(transport_opt_list) stream = await host_b.new_stream(host_a.get_id(), (ID,))
for _ in range(SOME_PING_COUNT):
addr = host_a.get_addrs()[0] some_ping = secrets.token_bytes(PING_LENGTH)
info = info_from_p2p_addr(addr) await stream.write(some_ping)
await host_b.connect(info) some_pong = await stream.read(PING_LENGTH)
assert some_ping == some_pong
stream = await host_b.new_stream(host_a.get_id(), (ID,)) # NOTE: simulate some time to sleep to mirror a real
for _ in range(SOME_PING_COUNT): # world usage where a peer sends pings on some periodic interval
some_ping = secrets.token_bytes(PING_LENGTH) # NOTE: this interval can be `0` for this test.
await stream.write(some_ping) await asyncio.sleep(0)
some_pong = await stream.read(PING_LENGTH) await stream.close()
assert some_ping == some_pong
# NOTE: simulate some time to sleep to mirror a real
# world usage where a peer sends pings on some periodic interval
# NOTE: this interval can be `0` for this test.
await asyncio.sleep(0)
await stream.close()

View File

@ -2,23 +2,16 @@ import pytest
from libp2p.identity.identify.pb.identify_pb2 import Identify from libp2p.identity.identify.pb.identify_pb2 import Identify
from libp2p.identity.identify.protocol import ID, _mk_identify_protobuf from libp2p.identity.identify.protocol import ID, _mk_identify_protobuf
from libp2p.peer.peerinfo import info_from_p2p_addr from tests.factories import pair_of_connected_hosts
from tests.utils import set_up_nodes_by_transport_opt
@pytest.mark.asyncio @pytest.mark.asyncio
async def test_identify_protocol(): async def test_identify_protocol():
transport_opt_list = [["/ip4/127.0.0.1/tcp/0"], ["/ip4/127.0.0.1/tcp/0"]] async with pair_of_connected_hosts() as (host_a, host_b):
(host_a, host_b) = await set_up_nodes_by_transport_opt(transport_opt_list) stream = await host_b.new_stream(host_a.get_id(), (ID,))
response = await stream.read()
await stream.close()
addr = host_a.get_addrs()[0] identify_response = Identify()
info = info_from_p2p_addr(addr) identify_response.ParseFromString(response)
await host_b.connect(info) assert identify_response == _mk_identify_protobuf(host_a)
stream = await host_b.new_stream(host_a.get_id(), (ID,))
response = await stream.read()
await stream.close()
identify_response = Identify()
identify_response.ParseFromString(response)
assert identify_response == _mk_identify_protobuf(host_a)