← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

resolve conflicts against trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_log.py
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