diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-09-26 15:48:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-09-26 15:48:49 +0000 |
| commit | 08c111e771f011a4ca8b093dda71a25871810291 (patch) | |
| tree | ce938b749c6a3e0f7e3504350db08e7195249879 | |
| parent | d721871cfaf9cf9ea986cb59eaeddd90e14f4d2a (diff) | |
| parent | b13c84b2ef8a7fee31de2a77b66b50370e6968e5 (diff) | |
| download | python-swiftclient-08c111e771f011a4ca8b093dda71a25871810291.tar.gz | |
Merge "Fix unit tests failing when OS_ env vars are set"
| -rw-r--r-- | tests/unit/test_shell.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/unit/test_shell.py b/tests/unit/test_shell.py index 031b689..78da0dd 100644 --- a/tests/unit/test_shell.py +++ b/tests/unit/test_shell.py @@ -435,14 +435,15 @@ class TestParsing(unittest.TestCase): def setUp(self): super(TestParsing, self).setUp() - self._orig_environ = os.environ.copy() + self._environ_vars = {} keys = os.environ.keys() for k in keys: - if k in ('ST_KEY', 'ST_USER', 'ST_AUTH'): - del os.environ[k] + if (k in ('ST_KEY', 'ST_USER', 'ST_AUTH') + or k.startswith('OS_')): + self._environ_vars[k] = os.environ.pop(k) def tearDown(self): - os.environ = self._orig_environ + os.environ.update(self._environ_vars) def _make_fake_command(self, result): def fake_command(parser, args, thread_manager): |