Rev 4271: Fix PQM failures. in file:///home/vila/src/bzr/bugs/355454-unicode-warning/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/355454-unicode-warning/

------------------------------------------------------------
revno: 4271
revision-id: v.ladeuil+lp at free.fr-20090505184608-0u9g7qblwx8bi47o
parent: v.ladeuil+lp at free.fr-20090505164939-33sx6w7221bgubaq
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 355454-unicode-warning
timestamp: Tue 2009-05-05 20:46:08 +0200
message:
  Fix PQM failures.
  
  * bzrlib/tests/test_osutils.py:
  (TestDirReader.test_walk_unicode_tree,
  TestDirReader.test_symlink): Requires UnicodeFilenameFeature.
  (TestReadLink): Requires Requires UnicodeFilenameFeature.
  (TestReadLink): Requires UnicodeFilenameFeature *and*
  SymlinkFeature.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_osutils.py'
--- a/bzrlib/tests/test_osutils.py	2009-05-05 16:49:39 +0000
+++ b/bzrlib/tests/test_osutils.py	2009-05-05 18:46:08 +0000
@@ -1698,6 +1698,7 @@
         return filtered_dirblocks
 
     def test_walk_unicode_tree(self):
+        self.requireFeature(tests.UnicodeFilenameFeature)
         tree, expected_dirblocks = self._get_unicode_tree()
         self.build_tree(tree)
         result = list(osutils._walkdirs_utf8('.'))
@@ -1705,6 +1706,7 @@
 
     def test_symlink(self):
         self.requireFeature(tests.SymlinkFeature)
+        self.requireFeature(tests.UnicodeFilenameFeature)
         target = u'target\N{Euro Sign}'
         link_name = u'l\N{Euro Sign}nk'
         os.symlink(target, link_name)
@@ -1725,9 +1727,10 @@
     The only guarantee offered by os.readlink(), starting with 2.6, is that a
     unicode string will be returned if a unicode string is passed.
 
-    But prior python versions failed to properly encode a the passed unicode
+    But prior python versions failed to properly encode the passed unicode
     string.
     """
+    _test_needs_features = [tests.SymlinkFeature, tests.UnicodeFilenameFeature]
 
     def setUp(self):
         super(tests.TestCaseInTempDir, self).setUp()