← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_conflicts.py

  • Committer: Martin
  • Date: 2011-05-21 16:29:38 UTC
  • mto: This revision was merged to the branch mainline in revision 5907.
  • Revision ID: gzlist@googlemail.com-20110521162938-1vrw3hp0197l3vrl
Add tests for non-ascii conflict serialisation

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_conflicts.py
19
19
    tests,
20
20
    workingtree,
21
21
    )
22
 
from bzrlib.tests import script, features
 
22
from bzrlib.tests import script
23
23
 
24
24
 
25
25
def make_tree_with_conflicts(test, this_path='this', other_path='other',
86
86
class TestUnicodePaths(tests.TestCaseWithTransport):
87
87
    """Unicode characters in conflicts should be displayed properly"""
88
88
 
89
 
    _test_needs_features = [features.UnicodeFilenameFeature]
90
89
    encoding = "UTF-8"
91
90
 
92
91
    def _as_output(self, text):