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

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_locale.py
43
43
    def test_log_C(self):
44
44
        out, err = self.run_bzr_subprocess('--no-aliases', '--no-plugins',
45
45
               '-q', 'log', '--log-format=long', 'tree',
46
 
               env_changes={'LANG':'C', 'BZR_PROGRESS_BAR':'none'})
 
46
               env_changes={'LANG':'C', 'BZR_PROGRESS_BAR':'none',
 
47
                            'LC_ALL':None, 'LC_CTYPE':None, 'LANGUAGE':None})
47
48
        self.assertEqual('', err)
48
49
        self.assertEqualDiff("""\
49
50
------------------------------------------------------------
58
59
    def test_log_BOGUS(self):
59
60
        out, err = self.run_bzr_subprocess('--no-aliases', '--no-plugins',
60
61
               '-q', 'log', '--log-format=long', 'tree',
61
 
               env_changes={'LANG':'BOGUS', 'BZR_PROGRESS_BAR':'none'})
 
62
               env_changes={'LANG':'BOGUS', 'BZR_PROGRESS_BAR':'none',
 
63
                            'LC_ALL':None, 'LC_CTYPE':None, 'LANGUAGE':None})
62
64
        # XXX: This depends on the exact formatting of a locale.Error
63
65
        # as the first part of the string. It may be a little tempermental
64
66
        self.assertEqualDiff("""\
65
67
bzr: warning: unsupported locale setting
66
 
  Could not what text encoding to use.
 
68
  Could not determine what text encoding to use.
67
69
  This error usually means your Python interpreter
68
70
  doesn't support the locale set by $LANG (BOGUS)
69
71
  Continuing with ascii encoding.