diff options
author | 2015-12-10 16:41:11 -0800 | |
---|---|---|
committer | 2015-12-10 17:09:06 -0800 | |
commit | a6b2c4ce468f06094810252cfa7f136d398ddd9e (patch) | |
tree | 4f6d9caf605e3e103185992da362965c8c489ce8 /tools/run_tests/run_interop_tests.py | |
parent | d574049b8b1b0c7f19abb549612968cf89372c42 (diff) |
Get rid of SSL_CERT_FILE env entirely
Diffstat (limited to 'tools/run_tests/run_interop_tests.py')
-rwxr-xr-x | tools/run_tests/run_interop_tests.py | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py index 7a09feb70d..e69e9877c5 100755 --- a/tools/run_tests/run_interop_tests.py +++ b/tools/run_tests/run_interop_tests.py @@ -54,11 +54,6 @@ os.chdir(ROOT) _DEFAULT_SERVER_PORT=8080 -# TOOD(jtattermusch) wrapped languages use this variable for location -# of roots.pem. We might want to use GRPC_DEFAULT_SSL_ROOTS_FILE_PATH -# supported by C core SslCredentials instead. -_SSL_CERT_ENV = { 'SSL_CERT_FILE':'/usr/local/share/grpc/roots.pem' } - _SKIP_COMPRESSION = ['large_compressed_unary', 'server_compressed_streaming'] @@ -105,7 +100,7 @@ class CSharpLanguage: return ['mono', 'Grpc.IntegrationTesting.Client.exe'] + args def cloud_to_prod_env(self): - return _SSL_CERT_ENV + return {} def server_cmd(self, args): return ['mono', 'Grpc.IntegrationTesting.Server.exe', '--use_tls=true'] + args @@ -222,7 +217,7 @@ class NodeLanguage: return ['node', 'src/node/interop/interop_client.js'] + args def cloud_to_prod_env(self): - return _SSL_CERT_ENV + return {} def server_cmd(self, args): return ['node', 'src/node/interop/interop_server.js', '--use_tls=true'] + args @@ -250,7 +245,7 @@ class PHPLanguage: return ['src/php/bin/interop_client.sh'] + args def cloud_to_prod_env(self): - return _SSL_CERT_ENV + return {} def global_env(self): return {} @@ -276,7 +271,7 @@ class RubyLanguage: return ['ruby', 'src/ruby/bin/interop/interop_client.rb'] + args def cloud_to_prod_env(self): - return _SSL_CERT_ENV + return {} def server_cmd(self, args): return ['ruby', 'src/ruby/bin/interop/interop_server.rb', '--use_tls=true'] + args @@ -311,7 +306,7 @@ class PythonLanguage: ] def cloud_to_prod_env(self): - return _SSL_CERT_ENV + return {} def server_cmd(self, args): return [ |