Changeset 09774e2 in mod_gnutls

Timestamp:

Dec 19, 2019, 7:11:17 AM (3 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, main, master, proxy-ticket

Children:

006f91a

Parents:

45b0a24

Message:

Optionally log HTTP responses to another stream/file

File:

• test/mgstest/tests.py (modified) (9 diffs)

test/mgstest/tests.py

@@ -77 +77 @@
                 f'description={self.description!r})')
 
-    def run(self, timeout=5.0, conn_log=None):
+    def run(self, timeout=5.0, conn_log=None, response_log=None):
         # note: "--logfile" option requires GnuTLS version >= 3.6.7
         command = ['gnutls-cli', '--logfile=/dev/stderr']
@@ -96 +96 @@
             for act in self.actions:
                 if type(act) is TestRequest:
-                    act.run(conn)
+                    act.run(conn, response_log)
                 elif type(act) is TestRaw10:
-                    act.run(command, timeout)
+                    act.run(command, timeout, conn_log, response_log)
                 else:
                     raise TypeError(f'Unsupported action requested: {act!r}')
@@ -139 +139 @@
                 f'expect={self.expect!r})')
 
-    def run(self, conn):
+    def run(self, conn, response_log=None):
         try:
             conn.request(self.method, self.path, headers=self.headers)
@@ -153 +153 @@
                 raise err
         body = resp.read().decode()
-        print(format_response(resp, body))
+        log_str = format_response(resp, body)
+        print(log_str)
+        if response_log:
+            print(log_str, file=response_log)
         self.check_response(resp, body)
 
@@ -258 +261 @@
                 f'headers={self.headers!r}, expect={self.expect!r})')
 
-    def run(self, command, timeout=None):
+    def run(self, command, timeout=None, conn_log=None, response_log=None):
         req = f'{self.method} {self.path} HTTP/1.0\r\n'
         for name, value in self.headers.items():
             req = req + f'{name}: {value}\r\n'
         req = req + f'\r\n'
-        proc = subprocess.Popen(command, stdout=subprocess.PIPE,
-                                stdin=subprocess.PIPE, close_fds=True,
+        proc = subprocess.Popen(command,
+                                stdout=subprocess.PIPE,
+                                stderr=subprocess.PIPE,
+                                stdin=subprocess.PIPE,
+                                close_fds=True,
                                 bufsize=0)
         try:
-            # Note: errs will be empty because stderr is not captured
             outs, errs = proc.communicate(input=req.encode(),
                                           timeout=timeout)
@@ -273 +278 @@
             proc.kill()
             outs, errs = proc.communicate()
+
+        if conn_log:
+            print(errs.decode(), file=conn_log)
 
         # first line of the received data must be the status
@@ -280 +288 @@
         # log response for debugging
         print(f'{status}\n{headers}\n\n{body}')
+        if response_log:
+            print(f'{status}\n{headers}\n\n{body}', file=response_log)
 
         m = self.status_re.match(status)
@@ -374 +384 @@
 
 
-def run_test_conf(test_config, timeout=5.0, conn_log=None):
+def run_test_conf(test_config, timeout=5.0, conn_log=None, response_log=None):
     conns = None
 
@@ -394 +404 @@
             print(f'Running test connection {i}.')
         sys.stdout.flush()
-        test_conn.run(timeout=timeout, conn_log=conn_log)
+        test_conn.run(timeout=timeout, conn_log=conn_log,
+                      response_log=response_log)