Rev 5581: Make overrideEnv returns the value to make it even closer to overrideAttr. in file:///home/vila/src/bzr/bugs/690563-better-env-isolation/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/690563-better-env-isolation/

------------------------------------------------------------
revno: 5581
revision-id: v.ladeuil+lp at free.fr-20101216151711-dek1mauthfujemwu
parent: v.ladeuil+lp at free.fr-20101216150042-88zr3m0zfjbuxzx7
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 690563-better-env-isolation
timestamp: Thu 2010-12-16 16:17:11 +0100
message:
  Make overrideEnv returns the value to make it even closer to overrideAttr.
-------------- next part --------------
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2010-12-16 12:13:32 +0000
+++ b/bzrlib/tests/__init__.py	2010-12-16 15:17:11 +0000
@@ -1540,15 +1540,18 @@
             setattr(obj, attr_name, new)
         return value
 
-    def overrideEnv(self, name, value):
+    def overrideEnv(self, name, new):
         """Set an environment variable, and reset it when the test finished.
 
         :param name: The name if the environment variable.
-        :param value: The value to set the variable to. If None, the 
+        :param new: The value to set the variable to. If None, the 
             variable is deleted from the environment.
+
+        :returns: The actual variable value.
         """
-        old_value = osutils.set_or_unset_env(name, value)
-        self.addCleanup(osutils.set_or_unset_env, name, old_value)
+        value = osutils.set_or_unset_env(name, new)
+        self.addCleanup(osutils.set_or_unset_env, name, value)
+        return value
 
     def _cleanEnvironment(self):
         new_env = {