~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/__init__.py

Hide more stuff in bzrlib.trace

Show diffs side-by-side

added added

removed removed

Lines of Context:
27
27
import unittest
28
28
import time
29
29
 
 
30
from logging import debug, warning, error
 
31
 
30
32
import bzrlib.commands
31
33
import bzrlib.trace
32
 
import bzrlib.fetch
33
34
import bzrlib.osutils as osutils
34
35
from bzrlib.selftest import TestUtil
35
36
from bzrlib.selftest.TestUtil import TestLoader, TestSuite
38
39
MODULES_TO_TEST = []
39
40
MODULES_TO_DOCTEST = []
40
41
 
41
 
from logging import debug, warning, error
42
42
 
43
43
 
44
44
class EarlyStoppingTestResultAdapter(object):
222
222
        """
223
223
        fileno, name = tempfile.mkstemp(suffix='.log', prefix='testbzr')
224
224
        self._log_file = os.fdopen(fileno, 'w+')
225
 
        hdlr = logging.StreamHandler(self._log_file)
226
 
        hdlr.setLevel(logging.DEBUG)
227
 
        hdlr.setFormatter(logging.Formatter('%(levelname)8s  %(message)s'))
228
 
        logging.getLogger('').addHandler(hdlr)
229
 
        logging.getLogger('').setLevel(logging.DEBUG)
230
 
        self._log_hdlr = hdlr
 
225
        bzrlib.trace.enable_test_log(self._log_file)
231
226
        debug('opened log file %s', name)
232
227
        self._log_file_name = name
233
228
        self.addCleanup(self._finishLogFile)
237
232
 
238
233
        Read contents into memory, close, and delete.
239
234
        """
 
235
        bzrlib.trace.disable_test_log()
240
236
        self._log_file.seek(0)
241
237
        self._log_contents = self._log_file.read()
242
238
        self._log_file.close()
277
273
            os.environ['EMAIL'] = self.email
278
274
 
279
275
    def tearDown(self):
280
 
        logging.getLogger('').removeHandler(self._log_hdlr)
281
 
        bzrlib.trace.enable_default_logging()
282
 
        logging.debug('%s teardown', self.id())
283
276
        self._runCleanups()
284
277
        unittest.TestCase.tearDown(self)
285
278