~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_msgeditor.py

merge from mbp.

Show diffs side-by-side

added added

removed removed

Lines of Context:
21
21
 
22
22
from bzrlib.branch import Branch
23
23
from bzrlib.msgeditor import make_commit_message_template
24
 
from bzrlib.tests import TestCaseInTempDir
 
24
from bzrlib.tests import TestCaseInTempDir, TestSkipped
25
25
 
26
26
from bzrlib.tests.treeshape import build_tree_contents
27
27
 
31
31
    b = Branch.initialize('.')
32
32
    working_tree = b.working_tree()
33
33
    filename = u'hell\u00d8'
34
 
    build_tree_contents([(filename, 'contents of hello')])
 
34
    try:
 
35
        build_tree_contents([(filename, 'contents of hello')])
 
36
    except UnicodeEncodeError:
 
37
        raise TestSkipped("can't build unicode working tree in "
 
38
                "filesystem encoding %s" % sys.getfilesystemencoding())
35
39
    working_tree.add(filename)
36
40
    return working_tree
37
41