stop using login shell for invoking interop tests

pull/8792/head
Jan Tattermusch 8 years ago
parent 34e8b91726
commit 03b7612a22
  1. 13
      tools/run_tests/run_interop_tests.py

@ -452,12 +452,11 @@ def docker_run_cmdline(cmdline, image, docker_args=[], cwd=None, environ=None):
return docker_cmdline return docker_cmdline
def bash_login_cmdline(cmdline): def bash_cmdline(cmdline):
"""Creates bash -l -c cmdline from args list.""" """Creates bash -c cmdline from args list."""
# Use login shell: # Use login shell:
# * rvm and nvm require it
# * makes error messages clearer if executables are missing # * makes error messages clearer if executables are missing
return ['bash', '-l', '-c', ' '.join(cmdline)] return ['bash', '-c', ' '.join(cmdline)]
def auth_options(language, test_case): def auth_options(language, test_case):
@ -517,7 +516,7 @@ def cloud_to_prod_jobspec(language, test_case, server_host_name,
auth_cmdargs, auth_env = auth_options(language, test_case) auth_cmdargs, auth_env = auth_options(language, test_case)
cmdargs += auth_cmdargs cmdargs += auth_cmdargs
environ.update(auth_env) environ.update(auth_env)
cmdline = bash_login_cmdline(language.client_cmd(cmdargs)) cmdline = bash_cmdline(language.client_cmd(cmdargs))
cwd = language.client_cwd cwd = language.client_cwd
if docker_image: if docker_image:
@ -551,7 +550,7 @@ def cloud_to_prod_jobspec(language, test_case, server_host_name,
def cloud_to_cloud_jobspec(language, test_case, server_name, server_host, def cloud_to_cloud_jobspec(language, test_case, server_name, server_host,
server_port, docker_image=None): server_port, docker_image=None):
"""Creates jobspec for cloud-to-cloud interop test""" """Creates jobspec for cloud-to-cloud interop test"""
cmdline = bash_login_cmdline(language.client_cmd([ cmdline = bash_cmdline(language.client_cmd([
'--server_host_override=foo.test.google.fr', '--server_host_override=foo.test.google.fr',
'--use_tls=true', '--use_tls=true',
'--use_test_ca=true', '--use_test_ca=true',
@ -588,7 +587,7 @@ def cloud_to_cloud_jobspec(language, test_case, server_name, server_host,
def server_jobspec(language, docker_image): def server_jobspec(language, docker_image):
"""Create jobspec for running a server""" """Create jobspec for running a server"""
container_name = dockerjob.random_name('interop_server_%s' % language.safename) container_name = dockerjob.random_name('interop_server_%s' % language.safename)
cmdline = bash_login_cmdline( cmdline = bash_cmdline(
language.server_cmd(['--port=%s' % _DEFAULT_SERVER_PORT])) language.server_cmd(['--port=%s' % _DEFAULT_SERVER_PORT]))
environ = language.global_env() environ = language.global_env()
docker_cmdline = docker_run_cmdline(cmdline, docker_cmdline = docker_run_cmdline(cmdline,

Loading…
Cancel
Save