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

  • Committer: Robert Collins
  • Date: 2010-05-06 11:08:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506110810-h3j07fh5gmw54s25
Cleaner matcher matching revised unlocking protocol.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_cleanup.py
1
 
# Copyright (C) 2009 Canonical Ltd
 
1
# Copyright (C) 2009, 2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
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():