summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2010-03-13 22:19:58 -0500
committerNed Batchelder <ned@nedbatchelder.com>2010-03-13 22:19:58 -0500
commit8cf50448f5f9141d7be78eba5b8a956da75f8c9c (patch)
treeeb32dbd33465b240a8de93bd8907b1d569fbef15 /test
parent9f6fa1c7806e7802572b28e8ecbd57a9afe5ec21 (diff)
downloadpython-coveragepy-8cf50448f5f9141d7be78eba5b8a956da75f8c9c.tar.gz
Who would have thought getting missing environment vars right would require so many tries
Diffstat (limited to 'test')
-rw-r--r--test/coveragetest.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/coveragetest.py b/test/coveragetest.py
index 6366970..8e15e49 100644
--- a/test/coveragetest.py
+++ b/test/coveragetest.py
@@ -90,9 +90,12 @@ class CoverageTest(TestCase):
def original_environ(self, name, if_missing=None):
"""The environment variable `name` from when the test started."""
if name in self.environ_undos:
- return self.environ_undos[name]
+ ret = self.environ_undos[name]
else:
- return os.environ.get(name, if_missing)
+ ret = os.environ.get(name)
+ if ret is None:
+ ret = if_missing
+ return ret
def undo_environ(self):
"""Undo all the changes made by `set_environ`."""