← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_selftest.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-01-11 04:26:43 UTC
  • mfrom: (5574.8.2 final-cleanup)
  • Revision ID: pqm@pqm.ubuntu.com-20110111042643-kuy4z47p5vxp00tr
(vila) Get rid of TestCase._old_env and _captureVar (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_selftest.py
3413
3413
 
3414
3414
class TestEnvironHandling(tests.TestCase):
3415
3415
 
3416
 
    def test__captureVar_None_called_twice_leaks(self):
3417
 
        self.failIf('MYVAR' in os.environ)
3418
 
        self._captureVar('MYVAR', '42')
3419
 
        # We need an embedded test to observe the bug
3420
 
        class Test(tests.TestCase):
3421
 
            def test_me(self):
3422
 
                # The first call save the 42 value
3423
 
                self._captureVar('MYVAR', None)
3424
 
                self.assertEquals(None, os.environ.get('MYVAR'))
3425
 
                self.assertEquals('42', self._old_env.get('MYVAR'))
3426
 
                # But the second one erases it !
3427
 
                self._captureVar('MYVAR', None)
3428
 
                self.assertEquals(None, self._old_env.get('MYVAR'))
3429
 
        output = StringIO()
3430
 
        result = tests.TextTestResult(output, 0, 1)
3431
 
        Test('test_me').run(result)
3432
 
        if not result.wasStrictlySuccessful():
3433
 
            self.fail(output.getvalue())
3434
 
        # And we have lost all trace of the original value
3435
 
        self.assertEquals(None, os.environ.get('MYVAR'))
3436
 
        self.assertEquals(None, self._old_env.get('MYVAR'))
3437
 
 
3438
3416
    def test_overrideEnv_None_called_twice_doesnt_leak(self):
3439
3417
        self.failIf('MYVAR' in os.environ)
3440
3418
        self.overrideEnv('MYVAR', '42')