|
|
|
@ -53,8 +53,7 @@ _CLOUD_TO_CLOUD_BASE_ARGS = [ |
|
|
|
|
# supported by C core SslCredentials instead. |
|
|
|
|
_SSL_CERT_ENV = { 'SSL_CERT_FILE':'/usr/local/share/grpc/roots.pem' } |
|
|
|
|
|
|
|
|
|
# TODO(jtatttermusch) unify usage of --enable_ssl, --use_tls and --use_tls=true |
|
|
|
|
|
|
|
|
|
# TODO(jtatttermusch) unify usage of --use_tls and --use_tls=true |
|
|
|
|
|
|
|
|
|
class CXXLanguage: |
|
|
|
|
|
|
|
|
@ -64,11 +63,11 @@ class CXXLanguage: |
|
|
|
|
|
|
|
|
|
def cloud_to_prod_args(self): |
|
|
|
|
return (self.client_cmdline_base + _CLOUD_TO_PROD_BASE_ARGS + |
|
|
|
|
['--enable_ssl','--use_prod_roots']) |
|
|
|
|
['--use_tls=true','--use_prod_roots']) |
|
|
|
|
|
|
|
|
|
def cloud_to_cloud_args(self): |
|
|
|
|
return (self.client_cmdline_base + _CLOUD_TO_CLOUD_BASE_ARGS + |
|
|
|
|
['--enable_ssl']) |
|
|
|
|
['--use_tls=true']) |
|
|
|
|
|
|
|
|
|
def cloud_to_prod_env(self): |
|
|
|
|
return None |
|
|
|
@ -327,4 +326,4 @@ else: |
|
|
|
|
jobset.message('FAILED', 'Some tests failed', do_newline=True) |
|
|
|
|
|
|
|
|
|
tree = ET.ElementTree(root) |
|
|
|
|
tree.write('report.xml', encoding='UTF-8') |
|
|
|
|
tree.write('report.xml', encoding='UTF-8') |
|
|
|
|