← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_cleanup.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-11-17 09:21:07 UTC
  • mfrom: (4800.1.3 trivial)
  • Revision ID: pqm@pqm.ubuntu.com-20091117092107-8ag9sr4hd0cubo6r
(mbp) really fix Japanese sphinx

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_cleanup.py
39
39
        self.call_log.append('no_op_cleanup')
40
40
 
41
41
    def assertLogContains(self, regex):
42
 
        self.assertContainsRe(self.get_log(), regex, re.DOTALL)
 
42
        log = self._get_log(keep_log_file=True)
 
43
        self.assertContainsRe(log, regex, re.DOTALL)
43
44
 
44
45
    def failing_cleanup(self):
45
46
        self.call_log.append('failing_cleanup')
183
184
        self.assertRaises(ErrorA, _do_with_cleanups, cleanups,
184
185
            self.trivial_func)
185
186
        self.assertLogContains('Cleanup failed:.*ErrorB')
186
 
        self.assertFalse('ErrorA' in self.get_log())
 
187
        log = self._get_log(keep_log_file=True)
 
188
        self.assertFalse('ErrorA' in log)
187
189
 
188
190
    def make_two_failing_cleanup_funcs(self):
189
191
        def raise_a():