Rev 5909: (gz) Require UnicodeFilenameFeature for new tests in bb.test_conflicts in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5909 [merge]
revision-id: pqm at pqm.ubuntu.com-20110522135417-n76kmfgwmhygrj7g
parent: pqm at pqm.ubuntu.com-20110521193506-jcqa7fl03yt164zg
parent: gzlist at googlemail.com-20110522115147-73hzalp1j09s8yty
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2011-05-22 13:54:17 +0000
message:
  (gz) Require UnicodeFilenameFeature for new tests in bb.test_conflicts
   (Martin [gz])
modified:
  bzrlib/tests/blackbox/test_conflicts.py test_conflicts.py-20060228151432-9723ebb925b999cf
=== modified file 'bzrlib/tests/blackbox/test_conflicts.py'
--- a/bzrlib/tests/blackbox/test_conflicts.py	2011-05-21 16:29:38 +0000
+++ b/bzrlib/tests/blackbox/test_conflicts.py	2011-05-22 11:51:47 +0000
@@ -19,7 +19,7 @@
     tests,
     workingtree,
     )
-from bzrlib.tests import script
+from bzrlib.tests import script, UnicodeFilenameFeature
 
 
 def make_tree_with_conflicts(test, this_path='this', other_path='other',
@@ -86,6 +86,7 @@
 class TestUnicodePaths(tests.TestCaseWithTransport):
     """Unicode characters in conflicts should be displayed properly"""
 
+    _test_needs_features = [UnicodeFilenameFeature]
     encoding = "UTF-8"
 
     def _as_output(self, text):