/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

Merge commit builder changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_osutils.py
24
24
import sys
25
25
import time
26
26
 
27
 
import bzrlib
28
27
from bzrlib import (
29
28
    errors,
30
29
    osutils,
292
291
    def test_format_date(self):
293
292
        self.assertRaises(errors.UnsupportedTimezoneFormat,
294
293
            osutils.format_date, 0, timezone='foo')
 
294
        self.assertIsInstance(osutils.format_date(0), str)
 
295
        self.assertIsInstance(osutils.format_local_date(0), unicode)
 
296
        # Testing for the actual value of the local weekday without
 
297
        # duplicating the code from format_date is difficult.
 
298
        # Instead blackbox.test_locale should check for localized
 
299
        # dates once they do occur in output strings.
295
300
 
296
301
    def test_dereference_path(self):
297
302
        self.requireFeature(SymlinkFeature)
1351
1356
        uni_val, env_val = probe_unicode_in_user_encoding()
1352
1357
        if uni_val is None:
1353
1358
            raise TestSkipped('Cannot find a unicode character that works in'
1354
 
                              ' encoding %s' % (bzrlib.user_encoding,))
 
1359
                              ' encoding %s' % (osutils.get_user_encoding(),))
1355
1360
 
1356
1361
        old = osutils.set_or_unset_env('BZR_TEST_ENV_VAR', uni_val)
1357
1362
        self.assertEqual(env_val, os.environ.get('BZR_TEST_ENV_VAR'))