Changeset 92cf138 in mod_gnutls for test/runtest.py

Timestamp:

Dec 31, 2019, 11:37:18 AM (2 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, master, proxy-ticket

Children:

4de8cd3

Parents:

b457e67

Message:

runtest.py: Provide temporary log files by default

This means tests don't need to set log file parameters just for their
hooks, and also simplifies the code.

File:

• test/runtest.py (modified) (5 diffs)

test/runtest.py

@@ -21 +21 @@
 import subprocess
 import sys
+import tempfile
 
 import mgstest.hooks
@@ -55 +56 @@
             return (found.path, found.name)
 
+def temp_logfile():
+    return tempfile.SpooledTemporaryFile(max_size=4096, mode='w+',
+                                         prefix='mod_gnutls', suffix=".log")
+
+
 
 
@@ -187 +193 @@
     # run extra checks the test's hooks.py might define
     if plugin.post_check:
-        if args.log_connection:
-            args.log_connection.seek(0)
-        if args.log_responses:
-            args.log_responses.seek(0)
+        args.log_connection.seek(0)
+        args.log_responses.seek(0)
         plugin.post_check(conn_log=args.log_connection,
                           response_log=args.log_responses)
@@ -202 +206 @@
     parser.add_argument('--test-number', type=int,
                         required=True, help='load YAML test configuration')
-    # TODO: The log files should be created as temporary
-    # files if needed by the plugin but not configured.
     parser.add_argument('--log-connection', type=argparse.FileType('w+'),
-                        default=None,
+                        default=temp_logfile(),
                         help='write connection log to this file')
     parser.add_argument('--log-responses', type=argparse.FileType('w+'),
-                        default=None,
+                        default=temp_logfile(),
                         help='write HTTP responses to this file')
 
@@ -221 +223 @@
 
     with contextlib.ExitStack() as stack:
-        if args.log_connection:
-            stack.enter_context(contextlib.closing(args.log_connection))
-        if args.log_responses:
-            stack.enter_context(contextlib.closing(args.log_responses))
+        stack.enter_context(contextlib.closing(args.log_connection))
+        stack.enter_context(contextlib.closing(args.log_responses))
         main(args)