From 014675652ca53d57a13c3ade10c3f47c15fda69e Mon Sep 17 00:00:00 2001
From: murgatroid99 <mlumish@google.com>
Date: Mon, 27 Jun 2016 15:48:08 -0700
Subject: [PATCH] Fix bug with override_server flag in run_interop_tests.py
---
tools/run_tests/run_interop_tests.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py
index d76dd4b7d2..adf9adaf13 100755
--- a/tools/run_tests/run_interop_tests.py
+++ b/tools/run_tests/run_interop_tests.py
@@ -470,7 +470,8 @@ def cloud_to_prod_jobspec(language, test_case, server_host_name,
flake_retries=5 if args.allow_flakes else 0,
timeout_retries=2 if args.allow_flakes else 0,
kill_handler=_job_kill_handler)
- test_job.container_name = container_name
+ if docker_image:
+ test_job.container_name = container_name
return test_job
@@ -506,7 +507,8 @@ def cloud_to_cloud_jobspec(language, test_case, server_name, server_host,
flake_retries=5 if args.allow_flakes else 0,
timeout_retries=2 if args.allow_flakes else 0,
kill_handler=_job_kill_handler)
- test_job.container_name = container_name
+ if docker_image:
+ test_job.container_name = container_name
return test_job
--
GitLab