Merge pull request #8431 from francoisfreitag/never-leak-env

tests: Always cleanup when exiting modify_env context manager
2025-02-25 18:55:22 -06:00 · 2020-11-15 20:42:24 +09:00 · 2020-11-15 20:42:24 +09:00 · ba496f4d92
commit ba496f4d92
parent f9512f49fa 5eb74d5c8e
1 changed files with 8 additions and 6 deletions
--- a/tests/utils.py
+++ b/tests/utils.py
@ -54,9 +54,11 @@ def modify_env(**env):
    original_env = os.environ.copy()
    for k, v in env.items():
        os.environ[k] = v
-    yield
-    for k in env:
-        try:
-            os.environ[k] = original_env[k]
-        except KeyError:
-            os.unsetenv(k)
+    try:
+        yield
+    finally:
+        for k in env:
+            try:
+                os.environ[k] = original_env[k]
+            except KeyError:
+                os.unsetenv(k)