← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

  • Committer: Martin Pool
  • Date: 2010-02-10 02:03:20 UTC
  • mto: This revision was merged to the branch mainline in revision 5027.
  • Revision ID: mbp@canonical.com-20100210020320-ebyrm44ig7maa4f5
Add import tariff tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
1550
1550
            # use an env var so it propagates to subprocesses.
1551
1551
            'APPORT_DISABLE': '1',
1552
1552
        }
1553
 
        self.__old_env = {}
 
1553
        self._old_env = {}
1554
1554
        self.addCleanup(self._restoreEnvironment)
1555
1555
        for name, value in new_env.iteritems():
1556
1556
            self._captureVar(name, value)
1557
1557
 
1558
1558
    def _captureVar(self, name, newvalue):
1559
1559
        """Set an environment variable, and reset it when finished."""
1560
 
        self.__old_env[name] = osutils.set_or_unset_env(name, newvalue)
 
1560
        self._old_env[name] = osutils.set_or_unset_env(name, newvalue)
1561
1561
 
1562
1562
    def _restoreEnvironment(self):
1563
 
        for name, value in self.__old_env.iteritems():
 
1563
        for name, value in self._old_env.iteritems():
1564
1564
            osutils.set_or_unset_env(name, value)
1565
1565
 
1566
1566
    def _restoreHooks(self):
3666
3666
        'bzrlib.tests.test_identitymap',
3667
3667
        'bzrlib.tests.test_ignores',
3668
3668
        'bzrlib.tests.test_index',
 
3669
        'bzrlib.tests.test_import_tariff',
3669
3670
        'bzrlib.tests.test_info',
3670
3671
        'bzrlib.tests.test_inv',
3671
3672
        'bzrlib.tests.test_inventory_delta',