tests: Always cleanup when exiting modify_env context manager

Previously, an exception would leave the environment changed.
2025-02-25 18:55:22 -06:00 · 2020-11-15 10:25:36 +01:00 · 2020-11-15 10:25:36 +01:00 · 5eb74d5c8e
commit 5eb74d5c8e
parent 5a42348fd7
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)