/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

  • Committer: Alexander Belchenko
  • Date: 2008-02-06 10:07:17 UTC
  • mfrom: (3211 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3230.
  • Revision ID: bialix@ukr.net-20080206100717-wnixj1s8u2fks08r
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
275
275
        elif isinstance(err[1], UnavailableFeature):
276
276
            return self.addNotSupported(test, err[1].args[0])
277
277
        else:
 
278
            self._cleanupLogFile(test)
278
279
            unittest.TestResult.addError(self, test, err)
279
280
            self.error_count += 1
280
281
            self.report_error(test, err)
291
292
        if isinstance(err[1], KnownFailure):
292
293
            return self._addKnownFailure(test, err)
293
294
        else:
 
295
            self._cleanupLogFile(test)
294
296
            unittest.TestResult.addFailure(self, test, err)
295
297
            self.failure_count += 1
296
298
            self.report_failure(test, err)
310
312
                    self._formatTime(benchmark_time),
311
313
                    test.id()))
312
314
        self.report_success(test)
 
315
        self._cleanupLogFile(test)
313
316
        unittest.TestResult.addSuccess(self, test)
314
317
 
315
318
    def _testConcluded(self, test):
317
320
 
318
321
        Called regardless of whether it succeded, failed, etc.
319
322
        """
320
 
        self._cleanupLogFile(test)
 
323
        pass
321
324
 
322
325
    def _addKnownFailure(self, test, err):
323
326
        self.known_failure_count += 1
1311
1314
        import bzrlib.trace
1312
1315
        bzrlib.trace._trace_file.flush()
1313
1316
        if self._log_contents:
 
1317
            # XXX: this can hardly contain the content flushed above --vila
 
1318
            # 20080128
1314
1319
            return self._log_contents
1315
1320
        if self._log_file_name is not None:
1316
1321
            logfile = open(self._log_file_name)