Changeset 60ed7d1 in mod_gnutls

Timestamp:

Jan 9, 2020, 11:43:02 AM (10 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

master, proxy-ticket

Children:

ff039b1

Parents:

7e10018

Message:

Allow the prepare_env hook to return a cleanup callback

Location:

test

Files:

• mgstest/hooks.py (modified) (1 diff)
• runtest.py (modified) (2 diffs)

test/mgstest/hooks.py

@@ -30 +30 @@
         2. Set any additional environment variables the test might
         need.
+
+        If the hook creates any resources that need to be cleaned up
+        after the test (e.g. delete a temporary file), it should
+        return a callable which performs the cleanup. That callable
+        will be called without arguments when the test services are
+        stopped.
 
     run_connection:

test/runtest.py

@@ -136 +136 @@
 
     # This hook may modify the environment as needed for the test.
+    cleanup_callback = None
     try:
         if plugin.prepare_env:
-            plugin.prepare_env()
+            cleanup_callback = plugin.prepare_env()
     except SkipTest as skip:
         print(f'Skipping: {skip!s}')
@@ -148 +149 @@
 
     with contextlib.ExitStack() as service_stack:
+        if cleanup_callback:
+            service_stack.callback(cleanup_callback)
         service_stack.enter_context(lockfile('test.lock', nolock='MGS_NETNS_ACTIVE' in os.environ))
         service_stack.enter_context(ocsp.run())