From fa575fe6b8fa2c00954ba4ab656a1e27d463249c Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Tue, 22 Jan 2019 18:26:12 +0100
Subject: [PATCH] run_interop_matrix_tests.py fixes

---
 .../run_interop_matrix_tests.py               | 44 ++++++++++++-------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/tools/interop_matrix/run_interop_matrix_tests.py b/tools/interop_matrix/run_interop_matrix_tests.py
index d1d68ebed37..de054e5d878 100755
--- a/tools/interop_matrix/run_interop_matrix_tests.py
+++ b/tools/interop_matrix/run_interop_matrix_tests.py
@@ -131,15 +131,15 @@ def _read_test_cases_file(lang, runtime, release):
     # Check to see if we need to use a particular version of test cases.
     release_info = client_matrix.LANG_RELEASE_MATRIX[lang].get(release)
     if release_info:
-        testcases_file = release_info.testcases_files
-    else:
+        testcases_file = release_info.testcases_file
+    if not testcases_file:
         # TODO(jtattermusch): remove the double-underscore, it is pointless
         testcases_file = '%s__master' % lang
 
     # For csharp, the testcases file used depends on the runtime
     # TODO(jtattermusch): remove this odd specialcase
     if lang == 'csharp' and runtime == 'csharpcoreclr':
-        testcases_file.replace('csharp_', 'csharpcoreclr_')
+        testcases_file = testcases_file.replace('csharp_', 'csharpcoreclr_')
 
     testcases_filepath = os.path.join(
         os.path.dirname(__file__), 'testcases', testcases_file)
@@ -171,25 +171,35 @@ def _generate_test_case_jobspecs(lang, runtime, release, suite_name):
     for line in testcase_lines:
         # TODO(jtattermusch): revisit the logic for updating test case commands
         # what it currently being done seems fragile.
-        m = re.search('--test_case=(.*)"', line)
-        shortname = m.group(1) if m else 'unknown_test'
-        m = re.search('--server_host_override=(.*).sandbox.googleapis.com',
-                      line)
+
+        # Extract test case name from the command line
+        m = re.search(r'--test_case=(\w+)', line)
+        testcase_name = m.group(1) if m else 'unknown_test'
+
+        # Extract the server name from the command line
+        if '--server_host_override=' in line:
+            m = re.search(
+                r'--server_host_override=((.*).sandbox.googleapis.com)', line)
+        else:
+            m = re.search(r'--server_host=((.*).sandbox.googleapis.com)', line)
         server = m.group(1) if m else 'unknown_server'
+        server_short = m.group(2) if m else 'unknown_server'
+
+        # replace original server_host argument
+        assert '--server_host=' in line
+        line = re.sub(r'--server_host=[^ ]*',
+                      r'--server_host=%s' % args.server_host, line)
 
-        # If server_host arg is not None, replace the original
-        # server_host with the one provided or append to the end of
-        # the command if server_host does not appear originally.
-        if args.server_host:
-            if line.find('--server_host=') > -1:
-                line = re.sub('--server_host=[^ ]*',
-                              '--server_host=%s' % args.server_host, line)
-            else:
-                line = '%s --server_host=%s"' % (line[:-1], args.server_host)
+        # some interop tests don't set server_host_override (see #17407),
+        # but we need to use it if different host is set via cmdline args.
+        if args.server_host != server and not '--server_host_override=' in line:
+            line = re.sub(r'(--server_host=[^ ]*)',
+                          r'\1 --server_host_override=%s' % server, line)
 
         spec = jobset.JobSpec(
             cmdline=line,
-            shortname='%s:%s:%s:%s' % (suite_name, lang, server, shortname),
+            shortname='%s:%s:%s:%s' % (suite_name, lang, server_short,
+                                       testcase_name),
             timeout_seconds=_TEST_TIMEOUT_SECONDS,
             shell=True,
             flake_retries=5 if args.allow_flakes else 0)