Changeset b0695c6 in mod_gnutls

Timestamp:

Apr 7, 2020, 2:44:48 PM (6 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

master, proxy-ticket

Children:

0484b31

Parents:

1a85a3d

Message:

Pass parsed YAML config to mgstest.tests.run_test_conf

Parsing the config in runtest.py has the advantage that the parsed
config is available there, too, e.g. to be read by hooks.

Location:

test

Files:

• https-test-client.py (modified) (2 diffs)
• mgstest/tests.py (modified) (1 diff)
• runtest.py (modified) (3 diffs)

test/https-test-client.py

@@ -18 +18 @@
 import contextlib
 import os
+import yaml
 
 from mgstest.tests import run_test_conf
@@ -52 +53 @@
 
     with contextlib.closing(args.test_config):
-        run_test_conf(args.test_config, args.timeout)
+        test_conf = yaml.load(args.test_config, Loader=yaml.Loader)
+        run_test_conf(test_conf, args.timeout)

test/mgstest/tests.py

@@ -545 +545 @@
     """Load and run a test configuration.
 
-    The test_conf parameter must be a YAML file, defining one or more
-    TestConnections, to be run in order. The other three parameters
-    are forwarded to TestConnection.run().
+    The test_conf parameter must either a single TestConnection
+    object, or a list of such objects to be run in order. The other
+    three parameters are forwarded to TestConnection.run().
 
     """
     conns = None
 
-    config = yaml.load(test_config, Loader=yaml.Loader)
-    if type(config) is TestConnection:
-        conns = [config]
-    elif type(config) is list:
+    if type(test_config) is TestConnection:
+        conns = [test_config]
+    elif type(test_config) is list:
         # assume list elements are connections
-        conns = config
+        conns = test_config
     else:
-        raise TypeError(f'Unsupported configuration: {config!r}')
+        raise TypeError(f'Unsupported configuration: {test_config!r}')
     sys.stdout.flush()
 

test/runtest.py

@@ -22 +22 @@
 import sys
 import tempfile
+import yaml
 from unittest import SkipTest
 
@@ -100 +101 @@
     os.environ['TEST_NAME'] = testname
 
+    # Load test config
+    try:
+        with open(os.path.join(testdir, 'test.yml'), 'r') as conf_file:
+            test_conf = yaml.load(conf_file, Loader=yaml.Loader)
+    except FileNotFoundError:
+        test_conf = None
+
     # Load test case hooks (if any)
     plugin_path = os.path.join(testdir, 'hooks.py')
@@ -194 +202 @@
                                   response_log=args.log_responses)
         else:
-            with open(os.path.join(testdir, 'test.yml'), 'r') as test_conf:
-                run_test_conf(test_conf,
-                              float(os.environ.get('TEST_QUERY_TIMEOUT', 5.0)),
-                              conn_log=args.log_connection,
-                              response_log=args.log_responses)
+            run_test_conf(test_conf,
+                          float(os.environ.get('TEST_QUERY_TIMEOUT', 5.0)),
+                          conn_log=args.log_connection,
+                          response_log=args.log_responses)
 
     # run extra checks the test's hooks.py might define