aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/run_tests/run_interop_tests.py
diff options
context:
space:
mode:
authorGravatar Juanli Shen <juanlishen@google.com>2018-08-30 17:08:54 -0700
committerGravatar Juanli Shen <juanlishen@google.com>2018-08-30 17:08:54 -0700
commitcf576cd146e980b20c986e9e434872bc1676326b (patch)
treec0b13d0990865d0d4af72ebe73dfb1e5fef13a9e /tools/run_tests/run_interop_tests.py
parentd766b9a2a40fd3002d9b93c97525a868c9d92dc4 (diff)
parent6b1accb7f2b71d575638b853b608342b13ee6de2 (diff)
Upmerge v1.15.x to master
Diffstat (limited to 'tools/run_tests/run_interop_tests.py')
-rwxr-xr-xtools/run_tests/run_interop_tests.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py
index 2936bdfa80..9bbc2e3e0e 100755
--- a/tools/run_tests/run_interop_tests.py
+++ b/tools/run_tests/run_interop_tests.py
@@ -776,9 +776,9 @@ def cloud_to_prod_jobspec(language,
'--test_case=%s' % test_case
]
if transport_security == 'tls':
- transport_security_options += ['--use_tls=true']
+ transport_security_options = ['--use_tls=true']
elif transport_security == 'google_default_credentials' and language == 'c++':
- transport_security_options += [
+ transport_security_options = [
'--custom_credentials_type=google_default_credentials'
]
else:
@@ -1519,9 +1519,6 @@ try:
sys.exit(1)
else:
sys.exit(0)
-except Exception as e:
- print('exception occurred:')
- traceback.print_exc(file=sys.stdout)
finally:
# Check if servers are still running.
for server, job in server_jobs.items():