← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_osutils.py

 Merge NEWS entry as agreed upon with poolie

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_osutils.py
21
21
import os
22
22
import re
23
23
import socket
24
 
import stat
25
24
import sys
26
25
import time
27
26
 
1072
1071
        if sys.platform == 'win32':
1073
1072
            raise tests.TestNotApplicable(
1074
1073
                "readdir IOError not tested on win32")
 
1074
        self.requireFeature(features.not_running_as_root)
1075
1075
        os.mkdir("test-unreadable")
1076
1076
        os.chmod("test-unreadable", 0000)
1077
1077
        # must chmod it back so that it can be removed
2076
2076
 
2077
2077
    def test_unicode_user(self):
2078
2078
        ue = osutils.get_user_encoding()
2079
 
        osutils.set_or_unset_env('LOGNAME', u'jrandom\xb6'.encode(ue))
2080
 
        self.assertEqual(u'jrandom\xb6', osutils.getuser_unicode())
 
2079
        uni_val, env_val = tests.probe_unicode_in_user_encoding()
 
2080
        if uni_val is None:
 
2081
            raise tests.TestSkipped(
 
2082
                'Cannot find a unicode character that works in encoding %s'
 
2083
                % (osutils.get_user_encoding(),))
 
2084
        uni_username = u'jrandom' + uni_val
 
2085
        encoded_username = uni_username.encode(ue)
 
2086
        osutils.set_or_unset_env('LOGNAME', encoded_username)
 
2087
        self.assertEqual(uni_username, osutils.getuser_unicode())