From 73b3eea149c9ad96985e056fe4cd692298734084 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Thu, 15 Oct 2015 17:52:06 -0700
Subject: [PATCH] accept --use_tls=true and --use_test_ca=true in ruby
---
src/ruby/pb/test/client.rb | 9 +++++----
src/ruby/pb/test/server.rb | 5 +++--
tools/run_tests/run_interop_tests.py | 6 +++---
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/ruby/pb/test/client.rb b/src/ruby/pb/test/client.rb
index 164e304b4d..e6d5223272 100755
--- a/src/ruby/pb/test/client.rb
+++ b/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)
diff --git a/src/ruby/pb/test/server.rb b/src/ruby/pb/test/server.rb
index 32934f70ad..25c1b1e9e6 100755
--- a/src/ruby/pb/test/server.rb
+++ b/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!
diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py
index a4b6a747ed..11f6e1c76d 100755
--- a/tools/run_tests/run_interop_tests.py
+++ b/tools/run_tests/run_interop_tests.py
@@ -249,17 +249,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 {}
--
GitLab