From c61e17931243d014fda59321e972076d16a263a0 Mon Sep 17 00:00:00 2001 From: Tristan Van Berkom Date: Wed, 26 Dec 2018 18:01:16 -0500 Subject: tests/testutils/runcli.py: Fixed broken environment handling Treat None values in the passed dictionary as keys to be removed from the environment, this was already happening at restoration time. --- tests/testutils/runcli.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/testutils/runcli.py b/tests/testutils/runcli.py index f94cec8ae..1f6951abe 100644 --- a/tests/testutils/runcli.py +++ b/tests/testutils/runcli.py @@ -529,13 +529,16 @@ def environment(env): old_env = {} for key, value in env.items(): old_env[key] = os.environ.get(key) - os.environ[key] = value + if value is None: + os.environ.pop(key, None) + else: + os.environ[key] = value yield for key, value in old_env.items(): if value is None: - del os.environ[key] + os.environ.pop(key, None) else: os.environ[key] = value -- cgit v1.2.1