Merge "fixed unit tests when env vars are set"

1 files changed, 11 insertions, 0 deletions

diff --git a/tests/unit/test_shell.py b/tests/unit/test_shell.py
index eb979a7..96f6d1d 100644
--- a/tests/unit/test_shell.py
+++ b/tests/unit/test_shell.py
@@ -388,6 +388,17 @@ class TestSubcommandHelp(unittest.TestCase):
 
 class TestParsing(unittest.TestCase):
 
+    def setUp(self):
+        super(TestParsing, self).setUp()
+        self._orig_environ = os.environ.copy()
+        keys = os.environ.keys()
+        for k in keys:
+            if k in ('ST_KEY', 'ST_USER', 'ST_AUTH'):
+                del os.environ[k]
+
+    def tearDown(self):
+        os.environ = self._orig_environ
+
     def _make_fake_command(self, result):
         def fake_command(parser, args, thread_manager):
             result[0], result[1] = swiftclient.shell.parse_args(parser, args)