/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_selftest.py

More use cases for overrideEnv, _cleanEnvironment *may* contain too much variables now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_selftest.py
3387
3387
        result = tests.ExtendedTestResult(StringIO(), 0, 1)
3388
3388
        post_mortem_calls = []
3389
3389
        self.overrideAttr(pdb, "post_mortem", post_mortem_calls.append)
3390
 
        self.addCleanup(osutils.set_or_unset_env, "BZR_TEST_PDB",
3391
 
            osutils.set_or_unset_env("BZR_TEST_PDB", None))
 
3390
        self.overrideEnv('BZR_TEST_PDB', None)
3392
3391
        result._post_mortem(1)
3393
 
        os.environ["BZR_TEST_PDB"] = "on"
 
3392
        self.overrideEnv('BZR_TEST_PDB', 'on')
3394
3393
        result._post_mortem(2)
3395
3394
        self.assertEqual([2], post_mortem_calls)
3396
3395
 
3416
3415
class TestEnvironHandling(tests.TestCase):
3417
3416
 
3418
3417
    def test__captureVar_None_called_twice_leaks(self):
 
3418
        self.failIf('MYVAR' in os.environ)
3419
3419
        self._captureVar('MYVAR', '42')
3420
3420
        # We need an embedded test to observe the bug
3421
3421
        class Test(tests.TestCase):
3437
3437
        self.assertEquals(None, self._old_env.get('MYVAR'))
3438
3438
 
3439
3439
    def test_overrideEnv_None_called_twice_doesnt_leak(self):
 
3440
        self.failIf('MYVAR' in os.environ)
3440
3441
        self.overrideEnv('MYVAR', '42')
3441
3442
        # We use an embedded test to make sure we fix the _captureVar bug
3442
3443
        class Test(tests.TestCase):