Merge lp:~jelmer/bzrtools/unicode-feature into lp:bzrtools

[Jelmer Vernooij]

Skip test_nonascii_paths on platforms that don't support unicode filenames.

[Aaron Bentley (abentley)]

Thanks! Merged.

=== modified file 'tests/upstream_import.py'
--- tests/upstream_import.py	2011-05-10 01:44:18 +0000
+++ tests/upstream_import.py	2011-06-10 00:24:31 +0000
@@ -24,6 +24,7 @@
 from bzrlib.tests import (
     TestCaseInTempDir,
     TestCaseWithTransport,
+    UnicodeFilenameFeature,
     )
 
 
@@ -273,6 +274,7 @@
         return tt
 
     def test_nonascii_paths(self):
+        self.requireFeature(UnicodeFilenameFeature)
         tt = self.get_empty_tt()
         encoded_file = tt.new_file(
             u'\u1234file', tt.root, 'contents', 'new-file')