diff --git a/src/ruby/pb/test/client.rb b/src/ruby/pb/test/client.rb index 164e304b4d799ca4946db9fd840937a9495be466..e6d52232727a2c05a9a4c872e7421bf54d59a3f4 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 32934f70ad84b0e5ec5d2de085cafbae03a85b1d..25c1b1e9e64e7f06a5a2f60e8f6c93f61cfbe2d6 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 f6efd6845f68d9d34ffab491a698df3de79971f1..dbffb04103177a898cb31b8c84812c02ac3a9ea8 100755 --- a/tools/run_tests/run_interop_tests.py +++ b/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 {}