← 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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-01-26 10:49:57 UTC
  • mfrom: (4987.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100126104957-dmtqnc0pckuruyla
(vila,
        jam) Implement TestCase.overrideAttr to simplify tests setUp/cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_log.py
77
77
                # Always return our own log formatter
78
78
                return self.log_catcher
79
79
 
80
 
        orig = log.log_formatter_registry.get_default
81
 
        def restore():
82
 
            log.log_formatter_registry.get_default = orig
83
 
        self.addCleanup(restore)
84
 
 
85
80
        def getme(branch):
86
81
                # Always return our own log formatter class hijacking the
87
82
                # default behavior (which requires setting up a config
88
83
                # variable)
89
84
            return MyLogFormatter
90
 
        log.log_formatter_registry.get_default = getme
 
85
        self.overrideAttr(log.log_formatter_registry, 'get_default', getme)
91
86
 
92
87
    def get_captured_revisions(self):
93
88
        return self.log_catcher.revisions
611
606
 
612
607
    def setUp(self):
613
608
        super(TestLogEncodings, self).setUp()
614
 
        self.user_encoding = osutils._cached_user_encoding
615
 
        def restore():
616
 
            osutils._cached_user_encoding = self.user_encoding
617
 
        self.addCleanup(restore)
 
609
        self.overrideAttr(osutils, '_cached_user_encoding')
618
610
 
619
611
    def create_branch(self):
620
612
        bzr = self.run_bzr