Rev 5571: Fix test_http isolation bug in file:///home/vila/src/bzr/bugs/690563-test-isolation/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5571
revision-id: v.ladeuil+lp at free.fr-20101215135757-jfcdf0gkg4dkgxle
parent: pqm at pqm.ubuntu.com-20101215012832-s7gz2rnm1n94f4eu
fixes bug(s): https://launchpad.net/bugs/690563
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 690563-test-isolation
timestamp: Wed 2010-12-15 14:57:57 +0100
message:
  Fix test_http isolation bug
-------------- next part --------------
=== modified file 'bzrlib/tests/test_http.py'
--- a/bzrlib/tests/test_http.py	2010-12-14 16:27:12 +0000
+++ b/bzrlib/tests/test_http.py	2010-12-15 13:57:57 +0000
@@ -1075,15 +1075,15 @@
 
     def setUp(self):
         tests.TestCase.setUp(self)
-        self._old_env = {}
+        self._saved_env = {}
         self.addCleanup(self._restore_env)
 
     def _install_env(self, env):
         for name, value in env.iteritems():
-            self._old_env[name] = osutils.set_or_unset_env(name, value)
+            self._saved_env[name] = osutils.set_or_unset_env(name, value)
 
     def _restore_env(self):
-        for name, value in self._old_env.iteritems():
+        for name, value in self._saved_env.iteritems():
             osutils.set_or_unset_env(name, value)
 
     def _proxied_request(self):
@@ -1136,7 +1136,7 @@
             self.no_proxy_host = self.server_host_port
         # The secondary server is the proxy
         self.proxy_url = self.get_secondary_url()
-        self._old_env = {}
+        self._saved_env = {}
 
     def _testing_pycurl(self):
         # TODO: This is duplicated for lots of the classes in this file
@@ -1145,10 +1145,10 @@
 
     def _install_env(self, env):
         for name, value in env.iteritems():
-            self._old_env[name] = osutils.set_or_unset_env(name, value)
+            self._saved_env[name] = osutils.set_or_unset_env(name, value)
 
     def _restore_env(self):
-        for name, value in self._old_env.iteritems():
+        for name, value in self._saved_env.iteritems():
             osutils.set_or_unset_env(name, value)
 
     def proxied_in_env(self, env):
@@ -1707,7 +1707,7 @@
 
     def setUp(self):
         super(TestProxyAuth, self).setUp()
-        self._old_env = {}
+        self._saved_env = {}
         self.addCleanup(self._restore_env)
         # Override the contents to avoid false positives
         self.build_tree_contents([('a', 'not proxied contents of a\n'),
@@ -1722,10 +1722,10 @@
 
     def _install_env(self, env):
         for name, value in env.iteritems():
-            self._old_env[name] = osutils.set_or_unset_env(name, value)
+            self._saved_env[name] = osutils.set_or_unset_env(name, value)
 
     def _restore_env(self):
-        for name, value in self._old_env.iteritems():
+        for name, value in self._saved_env.iteritems():
             osutils.set_or_unset_env(name, value)
 
     def test_empty_pass(self):

=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- a/doc/en/release-notes/bzr-2.3.txt	2010-12-14 23:32:28 +0000
+++ b/doc/en/release-notes/bzr-2.3.txt	2010-12-15 13:57:57 +0000
@@ -40,6 +40,10 @@
   designated by the action. This will *ignore* all differences that would
   have been merge cleanly otherwise. (Vincent Ladeuil, #638451)
 
+* ``bt.test_http`` was breaking ``os.environ`` by erasing the values save by
+  ``TestCase`` leading to ``bt.test_import_tariff`` failures.
+  (Vincent Ladeuil, #690563)
+
 Bug Fixes
 *********