Merge pull request #3861 from jtattermusch/ruby_use_tls

Accept --use_tls=true and --use_test_ca=true in ruby interop tests

src/ruby/pb/test/client.rb

@@ -424,12 +424,13 @@ def parse_args
     test_case_list = test_cases.join(',')
     opts.on('--test_case CODE', test_cases, {}, 'select a test_case',
             "  (#{test_case_list})") { |v| args['test_case'] = v }
-    opts.on('-s', '--use_tls', 'require a secure connection?') do |v|
-      args['secure'] = v
+    opts.on('--use_tls USE_TLS', ['false', 'true'],
+            'require a secure connection?') do |v|
+      args['secure'] = v == 'true'
     end
-    opts.on('-t', '--use_test_ca',
+    opts.on('--use_test_ca USE_TEST_CA', ['false', 'true'],
             'if secure, use the test certificate?') do |v|
-      args['use_test_ca'] = v
+      args['use_test_ca'] = v == 'true'
     end
   end.parse!
   _check_args(args)

src/ruby/pb/test/server.rb

@@ -168,8 +168,9 @@ def parse_options
     opts.on('--port PORT', 'server port') do |v|
       options['port'] = v
     end
-    opts.on('-s', '--use_tls', 'require a secure connection?') do |v|
-      options['secure'] = v
+    opts.on('--use_tls USE_TLS', ['false', 'true'],
+            'require a secure connection?') do |v|
+      options['secure'] = v == 'true'
     end
   end.parse!
 

tools/run_tests/run_interop_tests.py

@@ -246,17 +246,17 @@ class RubyLanguage:
 
   def cloud_to_prod_args(self):
     return (self.client_cmdline_base + _CLOUD_TO_PROD_BASE_ARGS +
-            ['--use_tls'])
+            ['--use_tls=true'])
 
   def cloud_to_cloud_args(self):
     return (self.client_cmdline_base + _CLOUD_TO_CLOUD_BASE_ARGS +
-            ['--use_tls', '--use_test_ca'])
+            ['--use_tls=true', '--use_test_ca=true'])
 
   def cloud_to_prod_env(self):
     return _SSL_CERT_ENV
 
   def server_args(self):
-    return ['ruby', 'src/ruby/bin/interop/interop_server.rb', '--use_tls']
+    return ['ruby', 'src/ruby/bin/interop/interop_server.rb', '--use_tls=true']
 
   def global_env(self):
     return {}