Merge pull request #2381 from devitocodes/hotfix-conftest

tests: Fixup conftest's set_run_reset()
devitocodes · Jun 4, 2024 · 32c2a2d · 32c2a2d
2 parents a00b66f + 6a2ac49
commit 32c2a2d
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/conftest.py b/conftest.py
@@ -142,7 +142,11 @@ def set_run_reset(env_vars, call):
         return False
     finally:
         os.environ['DEVITO_PYTEST_FLAG'] = '0'
-        os.environ.update({k: v for k, v in old_env_vars.items() if v is not None})
+        for k, v in old_env_vars.items():
+            if v is None:
+                os.environ.pop(k, None)
+            else:
+                os.environ[k] = v
 
 
 def parallel(item, m):