openstack/python-swiftclient
Code Issues Proposed changes

Merge "Fix unit tests failing when OS_ env vars are set"

Browse Source
This commit is contained in:
Jenkins 2014-09-26 15:48:49 +00:00 committed by Gerrit Code Review
commit 08c111e771
1 changed files with 5 additions and 4 deletions

9
tests/unit/test_shell.py

@ -435,14 +435,15 @@ class TestParsing(unittest.TestCase):
def setUp(self): def setUp(self):
super(TestParsing, self).setUp() super(TestParsing, self).setUp()
self._orig_environ = os.environ.copy() self._environ_vars = {}
keys = os.environ.keys() keys = os.environ.keys()
for k in keys: for k in keys:
if k in ('ST_KEY', 'ST_USER', 'ST_AUTH'): if (k in ('ST_KEY', 'ST_USER', 'ST_AUTH')
del os.environ[k] or k.startswith('OS_')):
self._environ_vars[k] = os.environ.pop(k)
def tearDown(self): def tearDown(self):
os.environ = self._orig_environ os.environ.update(self._environ_vars)
def _make_fake_command(self, result): def _make_fake_command(self, result):
def fake_command(parser, args, thread_manager): def fake_command(parser, args, thread_manager):