Changeset 4459cdd in mod_gnutls for test

Timestamp:

Dec 12, 2019, 12:43:45 PM (3 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, master, proxy-ticket

Children:

b1261cb

Parents:

c7f83a3

Message:

HTTPSubprocessConnection: Handle subprocess stderr via a thread

This is a workaround to prevent output from gnutls-cli and the Python
interpreter overwriting each other in the test logs. Forcing
gnutls-cli stderr through Python ensures synchronization (via global
interpreter lock).

File:

• test/mgstest/http.py (modified) (5 diffs)

test/mgstest/http.py

@@ -19 +19 @@
 import socket
 import subprocess
+import sys
 
 from http.client import HTTPConnection
@@ -52 +53 @@
         # output filter thread
         self._fthread = None
+        # Error stream handler thread. This is needed to synchronize
+        # output between Python and the subprocess.
+        self._ethread = None
 
     def connect(self):
@@ -61 +65 @@
         if self._output_filter:
             self._sproc = subprocess.Popen(self.command, stdout=subprocess.PIPE,
+                                           stderr=subprocess.PIPE,
                                            stdin=s_remote, close_fds=True,
                                            bufsize=0)
@@ -68 +73 @@
         else:
             self._sproc = subprocess.Popen(self.command, stdout=s_remote,
+                                           stderr=subprocess.PIPE,
                                            stdin=s_remote, close_fds=True,
                                            bufsize=0)
+        self._ethread = Thread(target=_stderr_writer,
+                               args=(self._sproc.stderr,))
+        self._ethread.start()
         self.sock = s_local
 
@@ -94 +103 @@
         if self._fthread:
             self._fthread.join()
+        if self._ethread:
+            self._ethread.join()
 
         # close the connection in the super class, which also calls
         # self.sock.close()
         super().close()
+
+
+
+def _stderr_writer(stream):
+    """Flush incoming data to sys.stderr.
+
+    This is a workaround to prevent output from gnutls-cli and the
+    Python interpreter overwriting each other in the test
+    logs. Forcing gnutls-cli stderr through Python ensures
+    synchronization (via global interpreter lock).
+    """
+    for line in stream:
+        print(line.decode(), file=sys.stderr, end='', flush=True)