← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_trace.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-03-02 14:46:17 UTC
  • mfrom: (5055.4.3 trivial)
  • Revision ID: pqm@pqm.ubuntu.com-20100302144617-2vtu14t81e3acd8f
(vila, for doxxx) Fix trace.show_error signature

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_trace.py
36
36
    pop_log_file,
37
37
    push_log_file,
38
38
    _rollover_trace_maybe,
 
39
    show_error,
39
40
    )
40
41
 
41
42
 
215
216
        # have to do a replaceent here as well.
216
217
        self.assertContainsRe(log, "ascii argument: \xb5".decode('utf8',
217
218
            'replace'))
 
219
        
 
220
    def test_show_error(self):
 
221
        show_error('error1')
 
222
        show_error(u'error2 \xb5 blah')
 
223
        show_error('arg: %s', 'blah')
 
224
        show_error('arg2: %(key)s', {'key':'stuff'})
 
225
        try:
 
226
            raise Exception("oops")
 
227
        except:
 
228
            show_error('kwarg', exc_info=True)
 
229
        log = self.get_log()
 
230
        self.assertContainsRe(log, 'error1')
 
231
        self.assertContainsRe(log, u'error2 \xb5 blah')
 
232
        self.assertContainsRe(log, 'arg: blah')
 
233
        self.assertContainsRe(log, 'arg2: stuff')
 
234
        self.assertContainsRe(log, 'kwarg')
 
235
        self.assertContainsRe(log, 'Traceback \\(most recent call last\\):')
 
236
        self.assertContainsRe(log, 'File ".*test_trace.py", line .*, in test_show_error')
 
237
        self.assertContainsRe(log, 'raise Exception\\("oops"\\)')
 
238
        self.assertContainsRe(log, 'Exception: oops')
218
239
 
219
240
    def test_push_log_file(self):
220
241
        """Can push and pop log file, and this catches mutter messages.