~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_osutils.py

  • Committer: Andrew Bennetts
  • Date: 2008-02-18 23:26:27 UTC
  • mto: This revision was merged to the branch mainline in revision 3756.
  • Revision ID: andrew.bennetts@canonical.com-20080218232627-v6cuj0596nh3rw56
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.

Show diffs side-by-side

added added

removed removed

Lines of Context:
22
22
import stat
23
23
import sys
24
24
 
25
 
import bzrlib
26
25
from bzrlib import (
27
26
    errors,
28
27
    osutils,
1027
1026
        uni_val, env_val = probe_unicode_in_user_encoding()
1028
1027
        if uni_val is None:
1029
1028
            raise TestSkipped('Cannot find a unicode character that works in'
1030
 
                              ' encoding %s' % (bzrlib.user_encoding,))
 
1029
                              ' encoding %s' % (osutils.get_user_encoding(),))
1031
1030
 
1032
1031
        old = osutils.set_or_unset_env('BZR_TEST_ENV_VAR', uni_val)
1033
1032
        self.assertEqual(env_val, os.environ.get('BZR_TEST_ENV_VAR'))