Re-enable all scenarios
diff --git a/src/python/grpcio_tests/tests_aio/benchmark/worker_servicer.py b/src/python/grpcio_tests/tests_aio/benchmark/worker_servicer.py
index 179d8f8..3513523 100644
--- a/src/python/grpcio_tests/tests_aio/benchmark/worker_servicer.py
+++ b/src/python/grpcio_tests/tests_aio/benchmark/worker_servicer.py
@@ -213,7 +213,7 @@
await self._run_single_client(config, request_iterator, context)
else:
sub_workers = []
- for i in range(config.async_client_threads):
+ for _ in range(config.async_client_threads):
sub_workers.append(await _create_sub_worker())
calls = [worker.stub.RunClient() for worker in sub_workers]
diff --git a/tools/run_tests/performance/scenario_config.py b/tools/run_tests/performance/scenario_config.py
index e935539..271592e 100644
--- a/tools/run_tests/performance/scenario_config.py
+++ b/tools/run_tests/performance/scenario_config.py
@@ -838,76 +838,78 @@
channels=1,
client_threads_per_cq=1,
server_threads_per_cq=1,
- async_client_threads=7,
- unconstrained_client=True,
+ async_client_threads=1,
+ unconstrained_client='async',
categories=[SMOKETEST, SCALABLE])
- # yield _ping_pong_scenario(
- # 'python_asyncio_generic_async_streaming_ping_pong',
- # rpc_type='STREAMING',
- # client_type='ASYNC_CLIENT',
- # server_type='ASYNC_GENERIC_SERVER',
- # use_generic_payload=True,
- # categories=[SMOKETEST, SCALABLE])
+ yield _ping_pong_scenario(
+ 'python_asyncio_generic_async_streaming_ping_pong',
+ rpc_type='STREAMING',
+ client_type='ASYNC_CLIENT',
+ server_type='ASYNC_GENERIC_SERVER',
+ use_generic_payload=True,
+ categories=[SMOKETEST, SCALABLE])
- # yield _ping_pong_scenario(
- # 'python_asyncio_protobuf_async_streaming_ping_pong',
- # rpc_type='STREAMING',
- # client_type='ASYNC_CLIENT',
- # server_type='ASYNC_SERVER')
+ yield _ping_pong_scenario(
+ 'python_asyncio_protobuf_async_streaming_ping_pong',
+ rpc_type='STREAMING',
+ client_type='ASYNC_CLIENT',
+ server_type='ASYNC_SERVER')
- # yield _ping_pong_scenario(
- # 'python_asyncio_protobuf_async_unary_ping_pong',
- # rpc_type='UNARY',
- # client_type='ASYNC_CLIENT',
- # server_type='ASYNC_SERVER')
+ yield _ping_pong_scenario(
+ 'python_asyncio_protobuf_async_unary_ping_pong',
+ rpc_type='UNARY',
+ client_type='ASYNC_CLIENT',
+ server_type='ASYNC_SERVER')
- # yield _ping_pong_scenario(
- # 'python_asyncio_protobuf_async_unary_ping_pong',
- # rpc_type='UNARY',
- # client_type='ASYNC_CLIENT',
- # server_type='ASYNC_SERVER',
- # categories=[SMOKETEST, SCALABLE])
+ yield _ping_pong_scenario(
+ 'python_asyncio_protobuf_async_unary_ping_pong',
+ rpc_type='UNARY',
+ client_type='ASYNC_CLIENT',
+ server_type='ASYNC_SERVER',
+ categories=[SMOKETEST, SCALABLE])
- # yield _ping_pong_scenario(
- # 'python_asyncio_protobuf_async_unary_qps_unconstrained',
- # rpc_type='UNARY',
- # client_type='ASYNC_CLIENT',
- # server_type='ASYNC_SERVER',
- # unconstrained_client='async')
+ yield _ping_pong_scenario(
+ 'python_asyncio_protobuf_async_unary_qps_unconstrained',
+ rpc_type='UNARY',
+ client_type='ASYNC_CLIENT',
+ server_type='ASYNC_SERVER',
+ async_client_threads=1,
+ unconstrained_client='async')
- # yield _ping_pong_scenario(
- # 'python_asyncio_protobuf_async_streaming_qps_unconstrained',
- # rpc_type='STREAMING',
- # client_type='ASYNC_CLIENT',
- # server_type='ASYNC_SERVER',
- # unconstrained_client='async')
+ yield _ping_pong_scenario(
+ 'python_asyncio_protobuf_async_streaming_qps_unconstrained',
+ rpc_type='STREAMING',
+ client_type='ASYNC_CLIENT',
+ server_type='ASYNC_SERVER',
+ async_client_threads=1,
+ unconstrained_client='async')
- # yield _ping_pong_scenario(
- # 'python_asyncio_to_cpp_protobuf_async_unary_ping_pong',
- # rpc_type='UNARY',
- # client_type='ASYNC_CLIENT',
- # server_type='ASYNC_SERVER',
- # server_language='python_asyncio',
- # async_server_threads=1,
- # categories=[SMOKETEST, SCALABLE])
+ yield _ping_pong_scenario(
+ 'python_asyncio_to_cpp_protobuf_async_unary_ping_pong',
+ rpc_type='UNARY',
+ client_type='ASYNC_CLIENT',
+ server_type='ASYNC_SERVER',
+ server_language='python_asyncio',
+ async_server_threads=1,
+ categories=[SMOKETEST, SCALABLE])
- # yield _ping_pong_scenario(
- # 'python_asyncio_to_cpp_protobuf_sync_streaming_ping_pong',
- # rpc_type='STREAMING',
- # client_type='SYNC_CLIENT',
- # server_type='ASYNC_SERVER',
- # server_language='python_asyncio',
- # async_server_threads=1)
+ yield _ping_pong_scenario(
+ 'python_asyncio_to_cpp_protobuf_sync_streaming_ping_pong',
+ rpc_type='STREAMING',
+ client_type='SYNC_CLIENT',
+ server_type='ASYNC_SERVER',
+ server_language='python_asyncio',
+ async_server_threads=1)
- # yield _ping_pong_scenario(
- # 'python_asyncio_protobuf_async_unary_ping_pong_1MB',
- # rpc_type='UNARY',
- # client_type='ASYNC_CLIENT',
- # server_type='ASYNC_SERVER',
- # req_size=1024 * 1024,
- # resp_size=1024 * 1024,
- # categories=[SMOKETEST, SCALABLE])
+ yield _ping_pong_scenario(
+ 'python_asyncio_protobuf_async_unary_ping_pong_1MB',
+ rpc_type='UNARY',
+ client_type='ASYNC_CLIENT',
+ server_type='ASYNC_SERVER',
+ req_size=1024 * 1024,
+ resp_size=1024 * 1024,
+ categories=[SMOKETEST, SCALABLE])
def __str__(self):
return 'python_asyncio'
