/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/__init__.py

merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
315
315
        self.report_success(test)
316
316
        self._cleanupLogFile(test)
317
317
        unittest.TestResult.addSuccess(self, test)
 
318
        test._log_contents = ''
318
319
 
319
320
    def _testConcluded(self, test):
320
321
        """Common code when a test has finished.
357
358
            # seems best to treat this as success from point-of-view of unittest
358
359
            # -- it actually does nothing so it barely matters :)
359
360
            unittest.TestResult.addSuccess(self, test)
 
361
            test._log_contents = ''
360
362
 
361
363
    def printErrorList(self, flavour, errors):
362
364
        for test, err in errors:
790
792
    _keep_log_file = False
791
793
    # record lsprof data when performing benchmark calls.
792
794
    _gather_lsprof_in_benchmarks = False
 
795
    attrs_to_keep = ('_testMethodName', '_testMethodDoc',
 
796
                     '_log_contents', '_log_file_name', '_benchtime',
 
797
                     '_TestCase__testMethodName')
793
798
 
794
799
    def __init__(self, methodName='testMethod'):
795
800
        super(TestCase, self).__init__(methodName)
811
816
        Tests that want to use debug flags can just set them in the
812
817
        debug_flags set during setup/teardown.
813
818
        """
814
 
        self._preserved_debug_flags = set(debug.debug_flags)
815
 
        debug.debug_flags.clear()
816
 
        self.addCleanup(self._restore_debug_flags)
 
819
        if 'selftest_debug' not in debug.debug_flags:
 
820
            self._preserved_debug_flags = set(debug.debug_flags)
 
821
            debug.debug_flags.clear()
 
822
            self.addCleanup(self._restore_debug_flags)
817
823
 
818
824
    def _clear_hooks(self):
819
825
        # prevent hooks affecting tests
1283
1289
                    result.addSuccess(self)
1284
1290
                result.stopTest(self)
1285
1291
                return
1286
 
        return unittest.TestCase.run(self, result)
 
1292
        try:
 
1293
            return unittest.TestCase.run(self, result)
 
1294
        finally:
 
1295
            saved_attrs = {}
 
1296
            absent_attr = object()
 
1297
            for attr_name in self.attrs_to_keep:
 
1298
                attr = getattr(self, attr_name, absent_attr)
 
1299
                if attr is not absent_attr:
 
1300
                    saved_attrs[attr_name] = attr
 
1301
            self.__dict__ = saved_attrs
1287
1302
 
1288
1303
    def tearDown(self):
1289
1304
        self._runCleanups()