Changeset 0909c92 in mod_gnutls for test/runtest.py

Timestamp:

Dec 27, 2019, 12:40:51 PM (2 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, master, proxy-ticket

Children:

3039495

Parents:

05984a0

Message:

Add hooks system to the test runner

With this all tests can use runtest.py to set up their
environment. Note that at the moment only the run_connection hook is
implemented.

File:

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

test/runtest.py

@@ -22 +22 @@
 import sys
 
+import mgstest.hooks
 from mgstest import lockfile, TestExpectationFailed
 from mgstest.services import ApacheService, TestService
@@ -110 +111 @@
     os.environ['TEST_NAME'] = testname
 
+    # Load test case hooks (if any)
+    plugin_path = os.path.join(testdir, 'hooks.py')
+    plugin = mgstest.hooks.load_hooks_plugin(plugin_path)
+
     # PID file name varies depending on whether we're using
     # namespaces.
@@ -187 +192 @@
         # Run the test connections
         with contextlib.ExitStack() as stack:
-            test_conf = stack.enter_context(
-                open(os.path.join(testdir, 'test.yml'), 'r'))
             log_file = None
             output_file = None
@@ -196 +199 @@
                 output_file = stack.enter_context(open(args.log_responses, 'w'))
 
-            run_test_conf(test_conf,
-                          float(os.environ.get('TEST_QUERY_TIMEOUT', 5.0)),
-                          conn_log=log_file, response_log=output_file)
+            if plugin.run_connection:
+                plugin.run_connection(testname,
+                                      conn_log=log_file,
+                                      response_log=output_file)
+            else:
+                test_conf = stack.enter_context(
+                    open(os.path.join(testdir, 'test.yml'), 'r'))
+                run_test_conf(test_conf,
+                              float(os.environ.get('TEST_QUERY_TIMEOUT', 5.0)),
+                              conn_log=log_file, response_log=output_file)
 
         # TODO: add hook to replace the test request, e.g. for curl