Skip to content
Snippets Groups Projects
Commit 299f97f8 authored by Jan Tattermusch's avatar Jan Tattermusch
Browse files

make wrapped languages scenarios secure by default

parent 1a311684
No related branches found
No related tags found
No related merge requests found
...@@ -34,6 +34,9 @@ WARMUP_SECONDS=5 ...@@ -34,6 +34,9 @@ WARMUP_SECONDS=5
JAVA_WARMUP_SECONDS=15 # Java needs more warmup time for JIT to kick in. JAVA_WARMUP_SECONDS=15 # Java needs more warmup time for JIT to kick in.
BENCHMARK_SECONDS=30 BENCHMARK_SECONDS=30
SECURE_SECARGS = {'use_test_ca': True,
'server_host_override': 'foo.test.google.fr'}
HISTOGRAM_PARAMS = { HISTOGRAM_PARAMS = {
'resolution': 0.01, 'resolution': 0.01,
'max_possible': 60e9, 'max_possible': 60e9,
...@@ -82,8 +85,7 @@ class CXXLanguage: ...@@ -82,8 +85,7 @@ class CXXLanguage:
for secure in [True, False]: for secure in [True, False]:
if secure: if secure:
secstr = 'secure' secstr = 'secure'
secargs = {'use_test_ca': True, secargs = SECURE_SECARGS
'server_host_override': 'foo.test.google.fr'}
else: else:
secstr = 'insecure' secstr = 'insecure'
secargs = None secargs = None
...@@ -325,8 +327,7 @@ class CSharpLanguage: ...@@ -325,8 +327,7 @@ class CSharpLanguage:
return 100 return 100
def scenarios(self): def scenarios(self):
# TODO(jtattermusch): add more scenarios secargs = SECURE_SECARGS
secargs = None
yield { yield {
'name': 'csharp_protobuf_async_streaming_qps_unconstrained', 'name': 'csharp_protobuf_async_streaming_qps_unconstrained',
'num_servers': 1, 'num_servers': 1,
...@@ -478,7 +479,7 @@ class NodeLanguage: ...@@ -478,7 +479,7 @@ class NodeLanguage:
def scenarios(self): def scenarios(self):
# TODO(jtattermusch): add more scenarios # TODO(jtattermusch): add more scenarios
secargs = None secargs = SECURE_SECARGS
yield { yield {
'name': 'node_protobuf_unary_ping_pong', 'name': 'node_protobuf_unary_ping_pong',
'num_servers': 1, 'num_servers': 1,
...@@ -524,7 +525,7 @@ class RubyLanguage: ...@@ -524,7 +525,7 @@ class RubyLanguage:
def scenarios(self): def scenarios(self):
# TODO(jtattermusch): add more scenarios # TODO(jtattermusch): add more scenarios
secargs = None secargs = SECURE_SECARGS
yield { yield {
'name': 'ruby_protobuf_unary_ping_pong', 'name': 'ruby_protobuf_unary_ping_pong',
'num_servers': 1, 'num_servers': 1,
...@@ -572,7 +573,7 @@ class JavaLanguage: ...@@ -572,7 +573,7 @@ class JavaLanguage:
# TODO(jtattermusch): add more scenarios # TODO(jtattermusch): add more scenarios
secargs = None secargs = None
yield { yield {
'name': 'java_protobuf_unary_ping_pong', 'name': 'java_protobuf_unary_ping_pong_insecure',
'num_servers': 1, 'num_servers': 1,
'num_clients': 1, 'num_clients': 1,
'client_config': { 'client_config': {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment