/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 breezy/tests/test_osutils_encodings.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_osutils_encodings.py
26
26
from . import (
27
27
    TestCase,
28
28
    )
29
 
from .ui_testing import (
30
 
    BytesIOWithEncoding,
31
 
    StringIOWithEncoding,
32
 
    )
 
29
from .ui_testing import BytesIOWithEncoding
33
30
 
34
31
 
35
32
class FakeCodec(object):
87
84
                             stdin_encoding,
88
85
                             user_encoding='user_encoding',
89
86
                             enable_fake_encodings=True):
90
 
        sys.stdout = StringIOWithEncoding()
 
87
        sys.stdout = BytesIOWithEncoding()
91
88
        sys.stdout.encoding = stdout_encoding
92
 
        sys.stderr = StringIOWithEncoding()
 
89
        sys.stderr = BytesIOWithEncoding()
93
90
        sys.stderr.encoding = stderr_encoding
94
 
        sys.stdin = StringIOWithEncoding()
 
91
        sys.stdin = BytesIOWithEncoding()
95
92
        sys.stdin.encoding = stdin_encoding
96
93
        osutils._cached_user_encoding = user_encoding
97
94
        if enable_fake_encodings:
162
159
 
163
160
        # check stderr
164
161
        self.assertEqual('brz: warning: unknown terminal encoding cp-unknown.\n'
165
 
                         '  Using encoding latin-1 instead.\n',
166
 
                         sys.stderr.getvalue())
 
162
                          '  Using encoding latin-1 instead.\n',
 
163
                          sys.stderr.getvalue())
167
164
 
168
165
 
169
166
class TestUserEncoding(TestCase):
174
171
        self.overrideAttr(osutils, '_cached_user_encoding', None)
175
172
        self.overrideAttr(locale, 'getpreferredencoding', self.get_encoding)
176
173
        self.overrideAttr(locale, 'CODESET', None)
177
 
        self.overrideAttr(sys, 'stderr', StringIOWithEncoding())
 
174
        self.overrideAttr(sys, 'stderr', BytesIOWithEncoding())
178
175
 
179
176
    def get_encoding(self, do_setlocale=True):
180
177
        return self._encoding
182
179
    def test_get_user_encoding(self):
183
180
        self._encoding = 'user_encoding'
184
181
        fake_codec.add('user_encoding')
185
 
        self.assertEqual('iso8859-1',  # fake_codec maps to latin-1
186
 
                         osutils.get_user_encoding())
 
182
        self.assertEqual('iso8859-1', # fake_codec maps to latin-1
 
183
                          osutils.get_user_encoding())
187
184
        self.assertEqual('', sys.stderr.getvalue())
188
185
 
189
186
    def test_user_cp0(self):
195
192
        self._encoding = 'cp-unknown'
196
193
        self.assertEqual('ascii', osutils.get_user_encoding())
197
194
        self.assertEqual('brz: warning: unknown encoding cp-unknown.'
198
 
                         ' Continuing with ascii encoding.\n',
199
 
                         sys.stderr.getvalue())
 
195
                          ' Continuing with ascii encoding.\n',
 
196
                          sys.stderr.getvalue())
200
197
 
201
198
    def test_user_empty(self):
202
199
        """Running bzr from a vim script gives '' for a preferred locale"""