← 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: Andrew Bennetts
  • Date: 2010-01-15 03:58:20 UTC
  • mfrom: (4963 +trunk)
  • mto: (4973.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4975.
  • Revision ID: andrew.bennetts@canonical.com-20100115035820-ilb3t36swgzq6v1l
Merge lp:bzr.

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
 
        log = self._get_log(keep_log_file=True)
43
 
        self.assertContainsRe(log, regex, re.DOTALL)
 
42
        self.assertContainsRe(self.get_log(), regex, re.DOTALL)
44
43
 
45
44
    def failing_cleanup(self):
46
45
        self.call_log.append('failing_cleanup')
184
183
        self.assertRaises(ErrorA, _do_with_cleanups, cleanups,
185
184
            self.trivial_func)
186
185
        self.assertLogContains('Cleanup failed:.*ErrorB')
187
 
        log = self._get_log(keep_log_file=True)
188
 
        self.assertFalse('ErrorA' in log)
 
186
        self.assertFalse('ErrorA' in self.get_log())
189
187
 
190
188
    def make_two_failing_cleanup_funcs(self):
191
189
        def raise_a():