Merge lp:~vila/bzr/final-cleanup into lp:bzr

[Vincent Ladeuil]

Get rid of TestCase._old_env and _captureVar

Get rid of TestCase._old_env and _captureVar as discussed with poolie in https://code.edge.launchpad.net/~vila/bzr/690563-better-env-isolation/+merge/43941

[Martin Pool (mbp)]

Well that was pretty easy! :)

review: Approve

[Vincent Ladeuil (vila)]

>>>>> Martin Pool <email address hidden> writes:

    > Review: Approve
    > Well that was pretty easy! :)

Hehe

--5627A18135F.1293007400/axe--

[Vincent Ladeuil (vila)]

sent to pqm by email

[Vincent Ladeuil (vila)]

sent to pqm by email

[Vincent Ladeuil (vila)]

sent to pqm by email

[Vincent Ladeuil (vila)]

sent to pqm by email

=== modified file 'bzrlib/tests/__init__.py'
--- bzrlib/tests/__init__.py	2011-01-07 11:17:11 +0000
+++ bzrlib/tests/__init__.py	2011-01-07 11:17:11 +0000
@@ -941,7 +941,6 @@
         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()
@@ -1647,10 +1646,6 @@
         for name, value in isolated_environ.iteritems():
             self.overrideEnv(name, value)
 
-    def _captureVar(self, name, newvalue):
-        """Set an environment variable, and reset it when finished."""
-        self._old_env[name] = osutils.set_or_unset_env(name, newvalue)
-
     def _restoreHooks(self):
         for klass, (name, hooks) in self._preserved_hooks.items():
             setattr(klass, name, hooks)
 
=== modified file 'bzrlib/tests/test_selftest.py'
--- bzrlib/tests/test_selftest.py	2011-01-07 11:17:11 +0000
+++ bzrlib/tests/test_selftest.py	2011-01-07 11:17:11 +0000
@@ -3413,28 +3413,6 @@
 
 class TestEnvironHandling(tests.TestCase):
 
-    def test__captureVar_None_called_twice_leaks(self):
-        self.failIf('MYVAR' in os.environ)
-        self._captureVar('MYVAR', '42')
-        # We need an embedded test to observe the bug
-        class Test(tests.TestCase):
-            def test_me(self):
-                # The first call save the 42 value
-                self._captureVar('MYVAR', None)
-                self.assertEquals(None, os.environ.get('MYVAR'))
-                self.assertEquals('42', self._old_env.get('MYVAR'))
-                # But the second one erases it !
-                self._captureVar('MYVAR', None)
-                self.assertEquals(None, self._old_env.get('MYVAR'))
-        output = StringIO()
-        result = tests.TextTestResult(output, 0, 1)
-        Test('test_me').run(result)
-        if not result.wasStrictlySuccessful():
-            self.fail(output.getvalue())
-        # And we have lost all trace of the original value
-        self.assertEquals(None, os.environ.get('MYVAR'))
-        self.assertEquals(None, self._old_env.get('MYVAR'))
-
     def test_overrideEnv_None_called_twice_doesnt_leak(self):
         self.failIf('MYVAR' in os.environ)
         self.overrideEnv('MYVAR', '42')
 
=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- doc/en/release-notes/bzr-2.3.txt	2011-01-07 11:17:11 +0000
+++ doc/en/release-notes/bzr-2.3.txt	2011-01-07 11:17:11 +0000
@@ -103,6 +103,10 @@
 * Check sphinx compatibility for tests requiring older sphinx versions.
   (Vincent Ladeuil, #688072)
 
+* ``TestCase._captureVar`` and ``TestCase._old_env`` have been deleted due to
+  bug #690563. Test writers are encouraged to use ``TestCase.overrideEnv``
+  instead. (Vincent Ladeuil)
+
 * ``TestDebuntuExpansions`` was escaping the test isolation by calling the
   wrong base class ``setUp``. (Vincent Ladeuil, #684622)