~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_log.py

  • Committer: John Arbash Meinel
  • Date: 2011-05-26 08:05:45 UTC
  • mfrom: (5916 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5917.
  • Revision ID: john@arbash-meinel.com-20110526080545-5tprxfczyj4bfk0o
Merge bzr.dev 5916 and make sure the right patch is applied.

Show diffs side-by-side

added added

removed removed

Lines of Context:
75
75
                self.log_catcher = test_log.LogCatcher(*args, **kwargs)
76
76
                # Always return our own log formatter
77
77
                return self.log_catcher
 
78
        # Break cycle with closure over self on cleanup by removing method
 
79
        self.addCleanup(setattr, MyLogFormatter, "__new__", None)
78
80
 
79
81
        def getme(branch):
80
82
                # Always return our own log formatter class hijacking the