Rev 5573: Fixed as per jam's suggestion. in file:///home/vila/src/bzr/bugs/690563-test-isolation/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5573
revision-id: v.ladeuil+lp at free.fr-20101215163925-lo5hfpziituos10e
parent: v.ladeuil+lp at free.fr-20101215145457-m6ho7rie9ep00b30
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 690563-test-isolation
timestamp: Wed 2010-12-15 17:39:25 +0100
message:
  Fixed as per jam's suggestion.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_http.py'
--- a/bzrlib/tests/test_http.py	2010-12-15 13:57:57 +0000
+++ b/bzrlib/tests/test_http.py	2010-12-15 16:39:25 +0000
@@ -1075,15 +1075,15 @@
 
     def setUp(self):
         tests.TestCase.setUp(self)
-        self._saved_env = {}
+        self._http_saved_env = {}
         self.addCleanup(self._restore_env)
 
     def _install_env(self, env):
         for name, value in env.iteritems():
-            self._saved_env[name] = osutils.set_or_unset_env(name, value)
+            self._http_saved_env[name] = osutils.set_or_unset_env(name, value)
 
     def _restore_env(self):
-        for name, value in self._saved_env.iteritems():
+        for name, value in self._http_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._saved_env = {}
+        self._http_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._saved_env[name] = osutils.set_or_unset_env(name, value)
+            self._http_saved_env[name] = osutils.set_or_unset_env(name, value)
 
     def _restore_env(self):
-        for name, value in self._saved_env.iteritems():
+        for name, value in self._http_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._saved_env = {}
+        self._http_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._saved_env[name] = osutils.set_or_unset_env(name, value)
+            self._http_saved_env[name] = osutils.set_or_unset_env(name, value)
 
     def _restore_env(self):
-        for name, value in self._saved_env.iteritems():
+        for name, value in self._http_saved_env.iteritems():
             osutils.set_or_unset_env(name, value)
 
     def test_empty_pass(self):

=== modified file 'bzrlib/tests/test_https_ca_bundle.py'
--- a/bzrlib/tests/test_https_ca_bundle.py	2010-12-15 14:54:57 +0000
+++ b/bzrlib/tests/test_https_ca_bundle.py	2010-12-15 16:39:25 +0000
@@ -36,13 +36,13 @@
             'CURL_CA_BUNDLE': None,
             'PATH': None,
             }
-        self._saved_env = {}
+        self._http_saved_env = {}
         self.addCleanup(self._restore)
         for name, value in new_env.iteritems():
-            self._saved_env[name] = osutils.set_or_unset_env(name, None)
+            self._http_saved_env[name] = osutils.set_or_unset_env(name, None)
 
     def _restore(self):
-        for name, value in self._saved_env.iteritems():
+        for name, value in self._http_saved_env.iteritems():
             osutils.set_or_unset_env(name, value)
 
     def _make_file(self, in_dir='.'):