cleanup environment changes reliably

ros · Dec 15, 2017 · df23d4d · df23d4d
1 parent df957b4
commit df23d4d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/test/unit_tests/test_environment_cache.py b/test/unit_tests/test_environment_cache.py
@@ -58,6 +58,7 @@ def test_appends_windows(self):
         self.assertEqual(['set foo=bar'], code)
 
     def test_generate_environment_script(self):
+        old_environ = os.environ
         try:
             fake_environ = os.environ.copy()
             fake_environ['FOO'] = '/bar'
@@ -80,5 +81,6 @@ def test_generate_environment_script(self):
             self.assertTrue('export BAR="/bar"' in result, result)
             self.assertEqual('#!/usr/bin/env sh', result[0])
         finally:
+            os.environ = old_environ
             catkin.environment_cache.os.environ = os.environ
             shutil.rmtree(rootdir)
diff --git a/test/unit_tests/test_workspace.py b/test/unit_tests/test_workspace.py
@@ -16,6 +16,7 @@
 class WorkspaceTest(unittest.TestCase):
 
     def test_get_workspaces(self):
+        old_environ = os.environ
         try:
             root_dir = tempfile.mkdtemp()
             ws1 = os.path.join(root_dir, 'ws1')
@@ -38,6 +39,7 @@ def test_get_workspaces(self):
             self.assertEqual([ws2, ws1], get_workspaces())
         finally:
             shutil.rmtree(root_dir)
+            os.environ = old_environ
             catkin.workspace.os.environ = os.environ
 
     def test_get_source_paths(self):