make wrapped languages scenarios secure by default

zen-li · Apr 21, 2016 · 299f97f · 299f97f
1 parent 1a31168
commit 299f97f
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/tools/run_tests/performance/scenario_config.py b/tools/run_tests/performance/scenario_config.py
@@ -34,6 +34,9 @@
 JAVA_WARMUP_SECONDS=15  # Java needs more warmup time for JIT to kick in.
 BENCHMARK_SECONDS=30
 
+SECURE_SECARGS = {'use_test_ca': True,
+                  'server_host_override': 'foo.test.google.fr'}
+
 HISTOGRAM_PARAMS = {
   'resolution': 0.01,
   'max_possible': 60e9,
@@ -82,8 +85,7 @@ def scenarios(self):
     for secure in [True, False]:
       if secure:
         secstr = 'secure'
-        secargs = {'use_test_ca': True,
-                   'server_host_override': 'foo.test.google.fr'}
+        secargs = SECURE_SECARGS
       else:
         secstr = 'insecure'
         secargs = None
@@ -325,8 +327,7 @@ def worker_port_offset(self):
     return 100
 
   def scenarios(self):
-    # TODO(jtattermusch): add more scenarios
-    secargs = None
+    secargs = SECURE_SECARGS
     yield {
         'name': 'csharp_protobuf_async_streaming_qps_unconstrained',
         'num_servers': 1,
@@ -478,7 +479,7 @@ def worker_port_offset(self):
 
   def scenarios(self):
     # TODO(jtattermusch): add more scenarios
-    secargs = None
+    secargs = SECURE_SECARGS
     yield {
         'name': 'node_protobuf_unary_ping_pong',
         'num_servers': 1,
@@ -524,7 +525,7 @@ def worker_port_offset(self):
 
   def scenarios(self):
     # TODO(jtattermusch): add more scenarios
-    secargs = None
+    secargs = SECURE_SECARGS
     yield {
         'name': 'ruby_protobuf_unary_ping_pong',
         'num_servers': 1,
@@ -572,7 +573,7 @@ def scenarios(self):
     # TODO(jtattermusch): add more scenarios
     secargs = None
     yield {
-        'name': 'java_protobuf_unary_ping_pong',
+        'name': 'java_protobuf_unary_ping_pong_insecure',
         'num_servers': 1,
         'num_clients': 1,
         'client_config': {