Skip to content

Commit 55a0fca

Browse files
committed
fix not running tests which require aiohttp
1 parent 9409cd9 commit 55a0fca

File tree

2 files changed

+26
-13
lines changed

2 files changed

+26
-13
lines changed

tests/conftest.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,16 @@ async def lazy_pipe(request, aiohttp_raw_server, unused_tcp_port, generate_test_
8989
yield functools.partial(pipe_factory, unused_tcp_port)
9090

9191

92+
@pytest.fixture(params=tested_transports)
93+
async def lazy_pipe_with_id(request, aiohttp_raw_server, unused_tcp_port, generate_test_certificates): # noqa: F811
94+
transport_id = request.param
95+
96+
logging.info('Testing transport %s on port %s (lazy)', transport_id, unused_tcp_port)
97+
98+
pipe_factory = get_pipe_factory_by_id(aiohttp_raw_server, transport_id, generate_test_certificates)
99+
yield transport_id, functools.partial(pipe_factory, unused_tcp_port)
100+
101+
92102
@pytest.fixture(params=tested_transports)
93103
async def pipe(request, aiohttp_raw_server, unused_tcp_port, generate_test_certificates): # noqa: F811
94104
transport_id = request.param

tests/rsocket/test_concurrency.py

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,24 +49,27 @@ async def generator():
4949

5050

5151
@pytest.mark.timeout(30)
52-
@pytest.mark.parametrize('transport_id, expected_delta, expected_runtime', (
53-
('tcp', 0.3, 3),
54-
('aiohttp', 0.6, 7),
55-
('quart', 1, 7),
56-
('quic', 4, 13),
57-
('http3', 5, 20),
58-
))
59-
async def test_concurrent_fragmented_responses(pipe_factory_by_id, unused_tcp_port, transport_id, expected_delta,
60-
expected_runtime):
52+
async def test_concurrent_fragmented_responses(lazy_pipe_with_id):
53+
transport_id, lazy_pipe = lazy_pipe_with_id
54+
55+
transport_parameter_map = {
56+
'tcp': (0.3, 3),
57+
'aiohttp': (0.6, 7),
58+
'quart': (1, 7),
59+
'quic': (4, 13),
60+
'http3': (5, 20),
61+
}
62+
63+
expected_delta, expected_runtime = transport_parameter_map[transport_id]
64+
6165
class Handler(BaseRequestHandler):
6266
async def request_response(self, request: Payload):
6367
data = 'a' * 100 * int(utf8_decode(request.data))
6468
return create_response(ensure_bytes(data))
6569

66-
async with pipe_factory_by_id(transport_id)(unused_tcp_port,
67-
server_arguments={'handler_factory': Handler,
68-
'fragment_size_bytes': 100},
69-
client_arguments={'fragment_size_bytes': 100}) as (server, client):
70+
async with lazy_pipe(
71+
server_arguments={'handler_factory': Handler, 'fragment_size_bytes': 100},
72+
client_arguments={'fragment_size_bytes': 100}) as (server, client):
7073
async def run():
7174
request_1 = asyncio.create_task(measure_time(client.request_response(Payload(b'10000'))))
7275

0 commit comments

Comments
 (0)