commit a4039ffb21dbc94d8c021ca5ec9c100832867c27
author Jan Tattermusch <jtattermusch@users.noreply.github.com> Thu Jun 30 13:36:48 2016 -0700
committer GitHub <noreply@github.com> Thu Jun 30 13:36:48 2016 -0700
tree a4b94a54ab14e36150a77d0a744abcaafb1a3a60
parent bcd825da0d341bea6f42e9f60999782e0a5ebcaa
parent 014675652ca53d57a13c3ade10c3f47c15fda69e

Merge pull request #7093 from murgatroid99/run_interop_override_server_fix

Fix bug with override_server flag in run_interop_tests.py

tools/run_tests/run_interop_tests.py

diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py
index d76dd4b..adf9ada 100755
--- a/tools/run_tests/run_interop_tests.py
+++ b/tools/run_tests/run_interop_tests.py
@@ -470,7 +470,8 @@
           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 @@
           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