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

  • Committer: Jelmer Vernooij
  • Date: 2012-01-02 14:27:58 UTC
  • mfrom: (6410 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6441.
  • Revision ID: jelmer@samba.org-20120102142758-hl7xrn7m5hjhecdv
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_osutils.py
20
20
import errno
21
21
import os
22
22
import re
 
23
import select
23
24
import socket
24
25
import sys
25
26
import time
1216
1217
        self.requireFeature(UTF8DirReaderFeature)
1217
1218
        self._save_platform_info()
1218
1219
        win32utils.winver = None # Avoid the win32 detection code
1219
 
        osutils._fs_enc = 'UTF-8'
 
1220
        osutils._fs_enc = 'utf-8'
1220
1221
        self.assertDirReaderIs(
1221
1222
            UTF8DirReaderFeature.module.UTF8DirReader)
1222
1223
 
1224
1225
        self.requireFeature(UTF8DirReaderFeature)
1225
1226
        self._save_platform_info()
1226
1227
        win32utils.winver = None # Avoid the win32 detection code
1227
 
        osutils._fs_enc = 'US-ASCII'
1228
 
        self.assertDirReaderIs(
1229
 
            UTF8DirReaderFeature.module.UTF8DirReader)
1230
 
 
1231
 
    def test_force_walkdirs_utf8_fs_ANSI(self):
1232
 
        self.requireFeature(UTF8DirReaderFeature)
1233
 
        self._save_platform_info()
1234
 
        win32utils.winver = None # Avoid the win32 detection code
1235
 
        osutils._fs_enc = 'ANSI_X3.4-1968'
 
1228
        osutils._fs_enc = 'ascii'
1236
1229
        self.assertDirReaderIs(
1237
1230
            UTF8DirReaderFeature.module.UTF8DirReader)
1238
1231
 
1239
1232
    def test_force_walkdirs_utf8_fs_latin1(self):
1240
1233
        self._save_platform_info()
1241
1234
        win32utils.winver = None # Avoid the win32 detection code
1242
 
        osutils._fs_enc = 'latin1'
 
1235
        osutils._fs_enc = 'iso-8859-1'
1243
1236
        self.assertDirReaderIs(osutils.UnicodeDirReader)
1244
1237
 
1245
1238
    def test_force_walkdirs_utf8_nt(self):
2122
2115
        self.overrideEnv('LOGNAME', u'jrandom\xb6'.encode(ue))
2123
2116
        self.assertEqual(u'jrandom\xb6', osutils.getuser_unicode())
2124
2117
 
2125
 
    def test_no_username_bug_660174(self):
2126
 
        self.requireFeature(features.win32_feature)
2127
 
        for name in ('LOGNAME', 'USER', 'LNAME', 'USERNAME'):
2128
 
            self.overrideEnv(name, None)
2129
 
        self.assertEqual(u'UNKNOWN', osutils.getuser_unicode())
2130
 
 
2131
2118
 
2132
2119
class TestBackupNames(tests.TestCase):
2133
2120
 
2179
2166
        self.assertTrue(osutils.find_executable_on_path('sh') is not None)
2180
2167
        self.assertTrue(
2181
2168
            osutils.find_executable_on_path('THIS SHOULD NOT EXIST') is None)
 
2169
 
 
2170
 
 
2171
class TestEnvironmentErrors(tests.TestCase):
 
2172
    """Test handling of environmental errors"""
 
2173
 
 
2174
    def test_is_oserror(self):
 
2175
        self.assertTrue(osutils.is_environment_error(
 
2176
            OSError(errno.EINVAL, "Invalid parameter")))
 
2177
 
 
2178
    def test_is_ioerror(self):
 
2179
        self.assertTrue(osutils.is_environment_error(
 
2180
            IOError(errno.EINVAL, "Invalid parameter")))
 
2181
 
 
2182
    def test_is_socket_error(self):
 
2183
        self.assertTrue(osutils.is_environment_error(
 
2184
            socket.error(errno.EINVAL, "Invalid parameter")))
 
2185
 
 
2186
    def test_is_select_error(self):
 
2187
        self.assertTrue(osutils.is_environment_error(
 
2188
            select.error(errno.EINVAL, "Invalid parameter")))
 
2189
 
 
2190
    def test_is_pywintypes_error(self):
 
2191
        self.requireFeature(features.pywintypes)
 
2192
        import pywintypes
 
2193
        self.assertTrue(osutils.is_environment_error(
 
2194
            pywintypes.error(errno.EINVAL, "Invalid parameter", "Caller")))