Changeset c96a965 in mod_gnutls

Timestamp:

Dec 12, 2019, 6:48:09 AM (13 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, master, proxy-ticket

Children:

c7f83a3

Parents:

b57d2c2

Message:

Create function to run a test config YAML file

This is much more efficient when also managing the test environment
using Python.

Location:

test

Files:

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

test/https-test-client.py

@@ -17 +17 @@
 
 import os
-import sys
-import yaml
 
-from mgstest.tests import TestConnection
+from mgstest.tests import run_test_conf
 
 if __name__ == "__main__":
@@ -52 +50 @@
         os.environ['TEST_PORT'] = args.port
 
-    conns = None
-
-    config = yaml.load(args.test_config, Loader=yaml.Loader)
-    if type(config) is TestConnection:
-        conns = [config]
-    elif type(config) is list:
-        # assume list elements are connections
-        conns = config
-    else:
-        raise TypeError(f'Unsupported configuration: {config!r}')
-    print(conns)
-    sys.stdout.flush()
-
-    for i, test_conn in enumerate(conns):
-        if test_conn.description:
-            print(f'Running test connection {i}: {test_conn.description}')
-            sys.stdout.flush()
-        test_conn.run(timeout=args.timeout)
+    run_test_conf(args.test_config, args.timeout)
+    args.test_config.close()

test/mgstest/tests.py

@@ -367 +367 @@
     t = Template(text)
     return t.substitute(os.environ)
+
+
+
+def run_test_conf(test_config, timeout=5.0):
+    conns = None
+
+    config = yaml.load(test_config, Loader=yaml.Loader)
+    if type(config) is TestConnection:
+        conns = [config]
+    elif type(config) is list:
+        # assume list elements are connections
+        conns = config
+    else:
+        raise TypeError(f'Unsupported configuration: {config!r}')
+    print(conns)
+    sys.stdout.flush()
+
+    for i, test_conn in enumerate(conns):
+        if test_conn.description:
+            print(f'Running test connection {i}: {test_conn.description}')
+            sys.stdout.flush()
+        test_conn.run(timeout=timeout)