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

  • Committer: Vincent Ladeuil
  • Date: 2010-01-25 15:55:48 UTC
  • mto: (4985.1.4 add-attr-cleanup)
  • mto: This revision was merged to the branch mainline in revision 4988.
  • Revision ID: v.ladeuil+lp@free.fr-20100125155548-0l352pujvt5bzl5e
Deploy addAttrCleanup on the whole test suite.

Several use case worth mentioning:

- setting a module or any other object attribute is the majority
by far. In some cases the setting itself is deferred but most of
the time we want to set at the same time we add the cleanup.

- there multiple occurrences of protecting hooks or ui factory
which are now useless (the test framework takes care of that now),

- there was some lambda uses that can now be avoided.

That first cleanup already simplifies things a lot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_osutils_encodings.py
75
75
 
76
76
    def setUp(self):
77
77
        TestCase.setUp(self)
78
 
        self.overrideAttr(sys, 'stdin')
79
 
        self.overrideAttr(sys, 'stdout')
80
 
        self.overrideAttr(sys, 'stderr')
81
 
        self.overrideAttr(osutils, '_cached_user_encoding')
 
78
        self.addAttrCleanup(sys, 'stdin')
 
79
        self.addAttrCleanup(sys, 'stdout')
 
80
        self.addAttrCleanup(sys, 'stderr')
 
81
        self.addAttrCleanup(osutils, '_cached_user_encoding')
82
82
 
83
83
    def make_wrapped_streams(self,
84
84
                             stdout_encoding,
150
150
 
151
151
    def setUp(self):
152
152
        TestCase.setUp(self)
153
 
        self.overrideAttr(locale, 'getpreferredencoding')
 
153
        self.addAttrCleanup(locale, 'getpreferredencoding')
154
154
        self.addCleanup(osutils.set_or_unset_env,
155
155
                        'LANG', os.environ.get('LANG'))
156
 
        self.overrideAttr(sys, 'stderr', StringIOWrapper())
 
156
        self.addAttrCleanup(sys, 'stderr')
 
157
        sys.stderr = StringIOWrapper()
157
158
 
158
159
    def test_get_user_encoding(self):
159
160
        def f():