Changeset 3be92d3 in mod_gnutls for test

Timestamp:

Dec 18, 2019, 5:42:58 PM (20 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, master, proxy-ticket

Children:

d5c572b

Parents:

779406c

Message:

Optionally log gnutls-cli stderr output to another stream/file

Location:

test/mgstest

Files:

• http.py (modified) (5 diffs)
• tests.py (modified) (4 diffs)

test/mgstest/http.py

@@ -32 +32 @@
     def __init__(self, command, host, port=None,
                  output_filter=None,
+                 stderr_log=None,
                  timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
                  blocksize=8192):
@@ -51 +52 @@
         # and the socket back to the HTTP connection (write-only).
         self._output_filter = output_filter
+        # If not None, write a copy of the subprocess' stderr to here.
+        self._stderr_log = stderr_log
         # output filter thread
         self._fthread = None
@@ -77 +80 @@
                                            bufsize=0)
         self._ethread = Thread(target=_stderr_writer,
-                               args=(self._sproc.stderr,))
+                               args=(self._sproc.stderr, self._stderr_log))
         self._ethread.start()
         self.sock = s_local
@@ -112 +115 @@
 
 
-def _stderr_writer(stream):
-    """Flush incoming data to sys.stderr.
+def _stderr_writer(stream, copy=None):
+    """Flush incoming data to sys.stderr, and optionally to "copy".
 
     This is a workaround to prevent output from gnutls-cli and the
@@ -119 +122 @@
     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)
+        if copy:
+            print(line.decode(), file=copy, end='')

test/mgstest/tests.py

@@ -77 +77 @@
                 f'description={self.description!r})')
 
-    def run(self, timeout=5.0):
+    def run(self, timeout=5.0, conn_log=None):
         # note: "--logfile" option requires GnuTLS version >= 3.6.7
         command = ['gnutls-cli', '--logfile=/dev/stderr']
@@ -87 +87 @@
             conn = HTTPSubprocessConnection(command, self.host, self.port,
                                             output_filter=filter_cert_log,
+                                            stderr_log=conn_log,
                                             timeout=timeout)
         elif self.transport == Transports.PLAIN:
@@ -370 +371 @@
 
 
-def run_test_conf(test_config, timeout=5.0):
+def run_test_conf(test_config, timeout=5.0, conn_log=None):
     conns = None
 
@@ -390 +391 @@
             print(f'Running test connection {i}.')
         sys.stdout.flush()
-        test_conn.run(timeout=timeout)
+        test_conn.run(timeout=timeout, conn_log=conn_log)