Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3903 from jtattermusch/unify_interop_args

Browse Source 
Consistent interop cmdline args
pull/3871/head
Jan Tattermusch 9 years ago
parent 63544f7808 25ec13e903
commit 849b2c7b3a
2 changed files with 11 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      tools/jenkins/grpc_interop_go/build_interop.sh
  2. 28
      tools/run_tests/run_interop_tests.py

2
tools/jenkins/grpc_interop_go/build_interop.sh
Unescape View File

@ -34,7 +34,7 @@ set -e
# Clone just the grpc-go source code without any dependencies. # Clone just the grpc-go source code without any dependencies.
# We are cloning from a local git repo that contains the right revision # We are cloning from a local git repo that contains the right revision
# to test instead of using "go get" to download from Github directly. # to test instead of using "go get" to download from Github directly.
git clone --recursive /var/local/jenkins/grpc-go src/gooogle.golang.org/grpc git clone --recursive /var/local/jenkins/grpc-go src/google.golang.org/grpc
# copy service account keys if available # copy service account keys if available
cp -r /var/local/jenkins/service_account $HOME || true cp -r /var/local/jenkins/service_account $HOME || true

28
tools/run_tests/run_interop_tests.py
Unescape View File

@ -56,7 +56,8 @@ _CLOUD_TO_PROD_BASE_ARGS = [
_CLOUD_TO_CLOUD_BASE_ARGS = [ _CLOUD_TO_CLOUD_BASE_ARGS = [
'--server_host_override=foo.test.google.fr', '--server_host_override=foo.test.google.fr',
'--use_tls=true'] '--use_tls=true',
'--use_test_ca=true']
# TOOD(jtattermusch) wrapped languages use this variable for location # TOOD(jtattermusch) wrapped languages use this variable for location
# of roots.pem. We might want to use GRPC_DEFAULT_SSL_ROOTS_FILE_PATH # of roots.pem. We might want to use GRPC_DEFAULT_SSL_ROOTS_FILE_PATH
@ -76,8 +77,7 @@ class CXXLanguage:
return self.client_cmdline_base + _CLOUD_TO_PROD_BASE_ARGS return self.client_cmdline_base + _CLOUD_TO_PROD_BASE_ARGS
def cloud_to_cloud_args(self): def cloud_to_cloud_args(self):
return (self.client_cmdline_base + _CLOUD_TO_CLOUD_BASE_ARGS + return self.client_cmdline_base + _CLOUD_TO_CLOUD_BASE_ARGS
['--use_test_ca=true'])
def cloud_to_prod_env(self): def cloud_to_prod_env(self):
return {} return {}
@ -104,8 +104,7 @@ class CSharpLanguage:
return self.client_cmdline_base + _CLOUD_TO_PROD_BASE_ARGS return self.client_cmdline_base + _CLOUD_TO_PROD_BASE_ARGS
def cloud_to_cloud_args(self): def cloud_to_cloud_args(self):
return (self.client_cmdline_base + _CLOUD_TO_CLOUD_BASE_ARGS + return self.client_cmdline_base + _CLOUD_TO_CLOUD_BASE_ARGS
['--use_test_ca=true'])
def cloud_to_prod_env(self): def cloud_to_prod_env(self):
return _SSL_CERT_ENV return _SSL_CERT_ENV
@ -132,8 +131,7 @@ class JavaLanguage:
return self.client_cmdline_base + _CLOUD_TO_PROD_BASE_ARGS return self.client_cmdline_base + _CLOUD_TO_PROD_BASE_ARGS
def cloud_to_cloud_args(self): def cloud_to_cloud_args(self):
return (self.client_cmdline_base + _CLOUD_TO_CLOUD_BASE_ARGS + return self.client_cmdline_base + _CLOUD_TO_CLOUD_BASE_ARGS
['--use_test_ca=true'])
def cloud_to_prod_env(self): def cloud_to_prod_env(self):
return {} return {}
@ -158,9 +156,7 @@ class GoLanguage:
self.safename = str(self) self.safename = str(self)
def cloud_to_prod_args(self): def cloud_to_prod_args(self):
# TODO(jtattermusch) go uses --tls_ca_file instead of --use_test_ca return self.client_cmdline_base + _CLOUD_TO_PROD_BASE_ARGS
return (self.client_cmdline_base + _CLOUD_TO_PROD_BASE_ARGS +
['--tls_ca_file=""'])
def cloud_to_cloud_args(self): def cloud_to_cloud_args(self):
return self.client_cmdline_base + _CLOUD_TO_CLOUD_BASE_ARGS return self.client_cmdline_base + _CLOUD_TO_CLOUD_BASE_ARGS
@ -190,8 +186,7 @@ class NodeLanguage:
return self.client_cmdline_base + _CLOUD_TO_PROD_BASE_ARGS return self.client_cmdline_base + _CLOUD_TO_PROD_BASE_ARGS
def cloud_to_cloud_args(self): def cloud_to_cloud_args(self):
return (self.client_cmdline_base + _CLOUD_TO_CLOUD_BASE_ARGS + return self.client_cmdline_base + _CLOUD_TO_CLOUD_BASE_ARGS
['--use_test_ca=true'])
def cloud_to_prod_env(self): def cloud_to_prod_env(self):
return _SSL_CERT_ENV return _SSL_CERT_ENV
@ -217,8 +212,7 @@ class PHPLanguage:
return self.client_cmdline_base + _CLOUD_TO_PROD_BASE_ARGS return self.client_cmdline_base + _CLOUD_TO_PROD_BASE_ARGS
def cloud_to_cloud_args(self): def cloud_to_cloud_args(self):
return (self.client_cmdline_base + _CLOUD_TO_CLOUD_BASE_ARGS + return self.client_cmdline_base + _CLOUD_TO_CLOUD_BASE_ARGS
['--use_test_ca=true'])
def cloud_to_prod_env(self): def cloud_to_prod_env(self):
return _SSL_CERT_ENV return _SSL_CERT_ENV
@ -242,8 +236,7 @@ class RubyLanguage:
return self.client_cmdline_base + _CLOUD_TO_PROD_BASE_ARGS return self.client_cmdline_base + _CLOUD_TO_PROD_BASE_ARGS
def cloud_to_cloud_args(self): def cloud_to_cloud_args(self):
return (self.client_cmdline_base + _CLOUD_TO_CLOUD_BASE_ARGS + return self.client_cmdline_base + _CLOUD_TO_CLOUD_BASE_ARGS
['--use_test_ca=true'])
def cloud_to_prod_env(self): def cloud_to_prod_env(self):
return _SSL_CERT_ENV return _SSL_CERT_ENV
@ -270,8 +263,7 @@ class PythonLanguage:
return self.client_cmdline_base + _CLOUD_TO_PROD_BASE_ARGS return self.client_cmdline_base + _CLOUD_TO_PROD_BASE_ARGS
def cloud_to_cloud_args(self): def cloud_to_cloud_args(self):
return (self.client_cmdline_base + _CLOUD_TO_CLOUD_BASE_ARGS + return self.client_cmdline_base + _CLOUD_TO_CLOUD_BASE_ARGS
['--use_test_ca=true'])
def cloud_to_prod_env(self): def cloud_to_prod_env(self):
return _SSL_CERT_ENV return _SSL_CERT_ENV

Write Preview
Loading…
Cancel
Save