diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2016-04-20 18:55:24 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2016-04-21 08:27:53 -0700 |
| commit | e222c002ae693c95b0862032d53a1f3cc81373a3 (patch) | |
| tree | a69b79a693971b97f2b6a8b5e91f271430104718 | |
| parent | 299f97f821b3cb2c19423d0de1edb66d3a19b2fe (diff) | |
run both secure and insecure scenarios for java
| -rw-r--r-- | tools/run_tests/performance/scenario_config.py | 59 |
1 files changed, 33 insertions, 26 deletions
diff --git a/tools/run_tests/performance/scenario_config.py b/tools/run_tests/performance/scenario_config.py index 224c74756f..86613f2f96 100644 --- a/tools/run_tests/performance/scenario_config.py +++ b/tools/run_tests/performance/scenario_config.py @@ -571,33 +571,40 @@ class JavaLanguage: def scenarios(self): # TODO(jtattermusch): add more scenarios - secargs = None - yield { - 'name': 'java_protobuf_unary_ping_pong_insecure', - 'num_servers': 1, - 'num_clients': 1, - 'client_config': { - 'client_type': 'SYNC_CLIENT', - 'security_params': secargs, - 'outstanding_rpcs_per_channel': 1, - 'client_channels': 1, - 'async_client_threads': 1, - 'rpc_type': 'UNARY', - 'load_params': { - 'closed_loop': {} + for secure in [True, False]: + if secure: + secstr = 'secure' + secargs = SECURE_SECARGS + else: + secstr = 'insecure' + secargs = None + + yield { + 'name': 'java_protobuf_unary_ping_pong_%s' % secstr, + 'num_servers': 1, + 'num_clients': 1, + 'client_config': { + 'client_type': 'SYNC_CLIENT', + 'security_params': secargs, + 'outstanding_rpcs_per_channel': 1, + 'client_channels': 1, + 'async_client_threads': 1, + 'rpc_type': 'UNARY', + 'load_params': { + 'closed_loop': {} + }, + 'payload_config': EMPTY_PROTO_PAYLOAD, + 'histogram_params': HISTOGRAM_PARAMS, }, - 'payload_config': EMPTY_PROTO_PAYLOAD, - 'histogram_params': HISTOGRAM_PARAMS, - }, - 'server_config': { - 'server_type': 'SYNC_SERVER', - 'security_params': secargs, - 'core_limit': 0, - 'async_server_threads': 1, - }, - 'warmup_seconds': JAVA_WARMUP_SECONDS, - 'benchmark_seconds': BENCHMARK_SECONDS - } + 'server_config': { + 'server_type': 'SYNC_SERVER', + 'security_params': secargs, + 'core_limit': 0, + 'async_server_threads': 1, + }, + 'warmup_seconds': JAVA_WARMUP_SECONDS, + 'benchmark_seconds': BENCHMARK_SECONDS + } def __str__(self): return 'java' |