Rev 5575: _cleanEnvironment can use overrideEnv, this prepare future cleanups. 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: 5575
revision-id: v.ladeuil+lp at free.fr-20101216104406-h6ha0p7efs79fe0p
parent: v.ladeuil+lp at free.fr-20101216101443-0em53d3ae5kmworm
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 690563-better-env-isolation
timestamp: Thu 2010-12-16 11:44:06 +0100
message:
  _cleanEnvironment can use overrideEnv, this prepare future cleanups.
-------------- next part --------------
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2010-12-16 10:14:43 +0000
+++ b/bzrlib/tests/__init__.py	2010-12-16 10:44:06 +0000
@@ -851,6 +851,7 @@
         self.addDetail("log", content.Content(content.ContentType("text",
             "plain", {"charset": "utf8"}),
             lambda:[self._get_log(keep_log_file=True)]))
+        self._old_env = {}
         self._cleanEnvironment()
         self._silenceUI()
         self._startLogFile()
@@ -1598,10 +1599,9 @@
             # use an env var so it propagates to subprocesses.
             'APPORT_DISABLE': '1',
         }
-        self._old_env = {}
         self.addCleanup(self._restoreEnvironment)
         for name, value in new_env.iteritems():
-            self._captureVar(name, value)
+            self.overrideEnv(name, value)
 
     def _captureVar(self, name, newvalue):
         """Set an environment variable, and reset it when finished."""