summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Podolyaka <rpodolyaka@mirantis.com>2013-03-28 13:28:37 +0200
committerRoman Podolyaka <rpodolyaka@mirantis.com>2013-03-28 13:37:27 +0200
commitcdab77259a5410fe4e89e90e2d83b316216d0e9b (patch)
treeeae1aff92f7d9133d492ea70929d6177c5202fe1
parent243c8ff6a817ac3dd5d6c34407d3d6aa111b1d7c (diff)
downloadpython-novaclient-cdab77259a5410fe4e89e90e2d83b316216d0e9b.tar.gz
Ensure shell tests use isolated env variables set
Fixes bug 1161008. Change-Id: Id9d76f39c898d4cff65aefa636e9dd2f092d42bd
-rw-r--r--tests/test_shell.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/test_shell.py b/tests/test_shell.py
index 7e71c5c9..433b220b 100644
--- a/tests/test_shell.py
+++ b/tests/test_shell.py
@@ -20,10 +20,8 @@ FAKE_ENV = {'OS_USERNAME': 'username',
class ShellTest(utils.TestCase):
def make_env(self, exclude=None):
- for var, val in FAKE_ENV.items():
- if var == exclude:
- continue
- self.useFixture(fixtures.EnvironmentVariable(var, val))
+ env = dict((k, v) for k, v in FAKE_ENV.items() if k != exclude)
+ self.useFixture(fixtures.MonkeyPatch('os.environ', env))
def setUp(self):
super(ShellTest, self).setUp()