Merge lp:~spiv/bzr/lang-c-failures-632387-2.2 into lp:bzr/2.2

[Andrew Bennetts]

Fix test failures in a LANG=C environment caused by tests using non-ascii unicode filenames without checking if that feature is available.

This fixes the test failures in lp:bzr/2.2 due to running under LANG=C (and LC_CTYPE= LANG=C LC_ALL=), at least on my Ubuntu 10.10 system. In all cases the best fix seemed to be to just skip if unicode filenames weren't possible.

[Martin Pool (mbp)]

Thanks, this is very nice to fix for SRUs.

istm that on modern unix, even with LANG=C, it may be reasonable to assume the filesystem names are actually still in UTF-8. Or at least it's probably more useful to treat them as UTF-8 than to fail. But that's a separate bug.

The fixes look reasonable to me.

I wonder how hard it would be to fix 2.1 for the sake of covering more SRUs?

review: Approve

[Andrew Bennetts (spiv)]

Probably not too hard to fix 2.1 too. I'm inclined to get 2.2's selftest working nicely in the deb build environment first then look at backporting in one batch.

[Andrew Bennetts (spiv)]

sent to pqm by email

=== modified file 'NEWS'
--- NEWS	2010-09-20 09:13:57 +0000
+++ NEWS	2010-09-23 04:05:59 +0000
@@ -34,6 +34,9 @@
 Testing
 *******
 
+* Fix tests that failed when run under ``LANG=C``.
+  (Andrew Bennetts, #632387)
+
 
 bzr 2.2.1
 #########

=== modified file 'bzrlib/tests/blackbox/test_alias.py'
--- bzrlib/tests/blackbox/test_alias.py	2010-06-23 08:19:28 +0000
+++ bzrlib/tests/blackbox/test_alias.py	2010-09-23 04:05:59 +0000
@@ -16,10 +16,9 @@
 #
 
 """Tests of the 'bzr alias' command."""
-import os
 import codecs
 
-from bzrlib.tests import TestCaseWithTransport
+from bzrlib.tests import TestCaseWithTransport, UnicodeFilenameFeature
 from bzrlib.config import (ensure_config_dir_exists, config_filename)
 
 
@@ -46,6 +45,9 @@
 
     def test_unicode_alias(self):
         """Unicode aliases should work (Bug #529930)"""
+        # XXX: strictly speaking, lack of unicode filenames doesn't imply that
+        # unicode command lines aren't available.
+        self.requireFeature(UnicodeFilenameFeature)
         config_enc = 'utf-8'
         file_name = u'foo\xb6'
 

=== modified file 'bzrlib/tests/blackbox/test_commit.py'
--- bzrlib/tests/blackbox/test_commit.py	2010-07-14 08:53:58 +0000
+++ bzrlib/tests/blackbox/test_commit.py	2010-09-23 04:05:59 +0000
@@ -33,6 +33,7 @@
 from bzrlib.tests import (
     probe_bad_non_ascii,
     TestSkipped,
+    UnicodeFilenameFeature,
     )
 from bzrlib.tests import TestCaseWithTransport
 
@@ -112,6 +113,7 @@
     def test_unicode_commit_message_is_filename(self):
         """Unicode commit message same as a filename (Bug #563646).
         """
+        self.requireFeature(UnicodeFilenameFeature)
         file_name = u'\N{euro sign}'
         self.run_bzr(['init'])
         open(file_name, 'w').write('hello world')

=== modified file 'bzrlib/tests/blackbox/test_export.py'
--- bzrlib/tests/blackbox/test_export.py	2010-06-11 07:32:12 +0000
+++ bzrlib/tests/blackbox/test_export.py	2010-09-23 04:05:59 +0000
@@ -66,15 +66,13 @@
         self.assertEqual(['test/a'], sorted(ball.getnames()))
 
     def test_tar_export_unicode(self):
+        self.requireFeature(tests.UnicodeFilenameFeature)
         tree = self.make_branch_and_tree('tar')
         # FIXME: using fname = u'\xe5.txt' below triggers a bug revealed since
         # bzr.dev revno 4216 but more related to OSX/working trees/unicode than
         # export itself --vila 20090406
         fname = u'\N{Euro Sign}.txt'
-        try:
-            self.build_tree(['tar/' + fname])
-        except UnicodeError:
-            raise tests.TestSkipped('Unable to represent path %r' % (fname,))
+        self.build_tree(['tar/' + fname])
         tree.add([fname])
         tree.commit('first')
 
@@ -87,6 +85,7 @@
 
     def test_tar_export_unicode_basedir(self):
         """Test for bug #413406"""
+        self.requireFeature(tests.UnicodeFilenameFeature)
         basedir = u'\N{euro sign}'
         os.mkdir(basedir)
         os.chdir(basedir)
@@ -119,12 +118,10 @@
         self.assertEqual(['test/a'], sorted(zfile.namelist()))
 
     def test_zip_export_unicode(self):
+        self.requireFeature(tests.UnicodeFilenameFeature)
         tree = self.make_branch_and_tree('zip')
         fname = u'\N{Euro Sign}.txt'
-        try:
-            self.build_tree(['zip/' + fname])
-        except UnicodeError:
-            raise tests.TestSkipped('Unable to represent path %r' % (fname,))
+        self.build_tree(['zip/' + fname])
         tree.add([fname])
         tree.commit('first')
 

=== modified file 'bzrlib/tests/test_osutils.py'
--- bzrlib/tests/test_osutils.py	2010-07-08 09:11:44 +0000
+++ bzrlib/tests/test_osutils.py	2010-09-23 04:05:59 +0000
@@ -21,7 +21,6 @@
 import os
 import re
 import socket
-import stat
 import sys
 import time
 
@@ -2076,5 +2075,12 @@
 
     def test_unicode_user(self):
         ue = osutils.get_user_encoding()
-        osutils.set_or_unset_env('LOGNAME', u'jrandom\xb6'.encode(ue))
-        self.assertEqual(u'jrandom\xb6', osutils.getuser_unicode())
+        uni_val, env_val = tests.probe_unicode_in_user_encoding()
+        if uni_val is None:
+            raise tests.TestSkipped(
+                'Cannot find a unicode character that works in encoding %s'
+                % (osutils.get_user_encoding(),))
+        uni_username = u'jrandom' + uni_val
+        encoded_username = uni_username.encode(ue)
+        osutils.set_or_unset_env('LOGNAME', encoded_username)
+        self.assertEqual(uni_username, osutils.getuser_unicode())