From 4847f853672f0502c189ba6fd06c9e4d5621dcb2 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Wed, 8 Jul 2020 11:42:36 +0200
Subject: [PATCH] make port server python3 compatible

---
 tools/run_tests/python_utils/port_server.py     |  8 ++++----
 .../run_tests/python_utils/start_port_server.py | 17 ++++++++++-------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/tools/run_tests/python_utils/port_server.py b/tools/run_tests/python_utils/port_server.py
index 228ca93dd4c..35613fc1096 100755
--- a/tools/run_tests/python_utils/port_server.py
+++ b/tools/run_tests/python_utils/port_server.py
@@ -31,7 +31,7 @@ import platform
 # increment this number whenever making a change to ensure that
 # the changes are picked up by running CI servers
 # note that all changes must be backwards compatible
-_MY_VERSION = 20
+_MY_VERSION = 21
 
 if len(sys.argv) == 2 and sys.argv[1] == 'dump_version':
     print(_MY_VERSION)
@@ -157,7 +157,7 @@ class Handler(BaseHTTPRequestHandler):
             self.end_headers()
             p = allocate_port(self)
             self.log_message('allocated port %d' % p)
-            self.wfile.write('%d' % p)
+            self.wfile.write(bytes('%d' % p, 'utf-8'))
         elif self.path[0:6] == '/drop/':
             self.send_response(200)
             self.send_header('Content-Type', 'text/plain')
@@ -177,7 +177,7 @@ class Handler(BaseHTTPRequestHandler):
             self.send_response(200)
             self.send_header('Content-Type', 'text/plain')
             self.end_headers()
-            self.wfile.write(_MY_VERSION)
+            self.wfile.write(bytes('%d' % _MY_VERSION, 'utf-8'))
         elif self.path == '/dump':
             # yaml module is not installed on Macs and Windows machines by default
             # so we import it lazily (/dump action is only used for debugging)
@@ -192,7 +192,7 @@ class Handler(BaseHTTPRequestHandler):
                 'in_use': dict((k, now - v) for k, v in in_use.items())
             })
             mu.release()
-            self.wfile.write(out)
+            self.wfile.write(bytes(out, 'utf-8'))
         elif self.path == '/quitquitquit':
             self.send_response(200)
             self.end_headers()
diff --git a/tools/run_tests/python_utils/start_port_server.py b/tools/run_tests/python_utils/start_port_server.py
index f390d1d6f5c..e9ce863f466 100644
--- a/tools/run_tests/python_utils/start_port_server.py
+++ b/tools/run_tests/python_utils/start_port_server.py
@@ -46,7 +46,7 @@ def start_port_server():
     if running:
         current_version = int(
             subprocess.check_output([
-                sys.executable,
+                sys.executable,  # use the same python binary as this process
                 os.path.abspath('tools/run_tests/python_utils/port_server.py'),
                 'dump_version'
             ]))
@@ -73,12 +73,15 @@ def start_port_server():
             # Working directory of port server needs to be outside of Jenkins
             # workspace to prevent file lock issues.
             tempdir = tempfile.mkdtemp()
-            port_server = subprocess.Popen(
-                args,
-                env=env,
-                cwd=tempdir,
-                creationflags=0x00000008,  # detached process
-                close_fds=True)
+            if sys.version_info.major == 2:
+                creationflags = 0x00000008  # detached process
+            else:
+                creationflags = 0  # DETACHED_PROCESS doesn't seem to work with python3
+            port_server = subprocess.Popen(args,
+                                           env=env,
+                                           cwd=tempdir,
+                                           creationflags=creationflags,
+                                           close_fds=True)
         else:
             port_server = subprocess.Popen(args,
                                            env=env,