Changeset db82911 in mod_gnutls for test/https-test-client.py

Timestamp:

Dec 2, 2019, 2:44:54 PM (23 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, master, proxy-ticket

Children:

0a16644

Parents:

4dfbedd

Message:

https-test-client.py: Make the filter function an optional argument

With this HTTPSubprocessConnection is generic again, supporting any
subprocess that communicates via stdin/stdout.

File:

• test/https-test-client.py (modified) (5 diffs)

test/https-test-client.py

@@ -26 +26 @@
 class HTTPSubprocessConnection(HTTPConnection):
     def __init__(self, command, host, port=None,
+                 output_filter=None,
                  timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
                  blocksize=8192):
@@ -41 +42 @@
         # (see exception doc)
         self.set_tunnel = None
+        # This method will be run in a separate process and filter the
+        # stdout of self._sproc. Its arguments are self._sproc.stdout
+        # and the socket back to the HTTP connection (write-only).
+        self._output_filter = output_filter
+        # output filter process
         self._fproc = None
 
@@ -49 +55 @@
 
         # TODO: Maybe capture stderr?
-        self._sproc = subprocess.Popen(self.command, stdout=subprocess.PIPE,
-                                       stdin=s_remote, close_fds=True,
-                                       bufsize=0)
-        self._fproc = Process(target=filter_cert_log,
-                              args=(self._sproc.stdout, s_remote))
-        self._fproc.start()
+        if self._output_filter:
+            self._sproc = subprocess.Popen(self.command, stdout=subprocess.PIPE,
+                                           stdin=s_remote, close_fds=True,
+                                           bufsize=0)
+            self._fproc = Process(target=self._output_filter,
+                                  args=(self._sproc.stdout, s_remote))
+            self._fproc.start()
+        else:
+            self._sproc = subprocess.Popen(self.command, stdout=s_remote,
+                                           stdin=s_remote, close_fds=True,
+                                           bufsize=0)
         s_remote.close()
         self.sock = s_local
@@ -77 +88 @@
         # filter process receives HUP on pipe when the subprocess
         # terminates
-        self._fproc.join()
+        if self._fproc:
+            self._fproc.join()
 
         # close the connection in the super class, which also calls
@@ -292 +304 @@
 
     conn = HTTPSubprocessConnection(command, args.host, port=args.port,
+                                    output_filter=filter_cert_log,
                                     timeout=6.0)