bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
1185.16.70
by Martin Pool
- improved handling of non-ascii branch names and test |
1 |
# Copyright (C) 2005 by Canonical Ltd
|
2 |
#
|
|
3 |
# This program is free software; you can redistribute it and/or modify
|
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
7 |
#
|
|
8 |
# This program is distributed in the hope that it will be useful,
|
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
12 |
#
|
|
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
17 |
"""Test that various operations work in a non-ASCII environment."""
|
|
18 |
||
19 |
import os |
|
|
1185.85.75
by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths. |
20 |
import sys |
21 |
from unicodedata import normalize |
|
|
1185.16.70
by Martin Pool
- improved handling of non-ascii branch names and test |
22 |
|
|
1185.85.80
by John Arbash Meinel
[merge] jam-integration 1527, including branch-formats, help text, misc bug fixes. |
23 |
from bzrlib.osutils import pathjoin, normalizes_filenames, unicode_filename |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
24 |
from bzrlib.tests import TestCaseWithTransport, TestSkipped |
25 |
from bzrlib.workingtree import WorkingTree |
|
26 |
||
27 |
||
28 |
class NonAsciiTest(TestCaseWithTransport): |
|
|
1185.16.70
by Martin Pool
- improved handling of non-ascii branch names and test |
29 |
|
30 |
def test_add_in_nonascii_branch(self): |
|
31 |
"""Test adding in a non-ASCII branch.""" |
|
32 |
br_dir = u"\u1234" |
|
|
1185.16.71
by Martin Pool
- try to avoid test failure on platforms with ascii-only filesystems |
33 |
try: |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
34 |
wt = self.make_branch_and_tree(br_dir) |
|
1185.12.91
by Aaron Bentley
Fixed exception (No such thing as EncodingError that I can see) |
35 |
except UnicodeEncodeError: |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
36 |
raise TestSkipped("filesystem can't accomodate nonascii names") |
|
1185.16.71
by Martin Pool
- try to avoid test failure on platforms with ascii-only filesystems |
37 |
return
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
38 |
file(pathjoin(br_dir, "a"), "w").write("hello") |
39 |
wt.add(["a"], ["a-id"]) |
|
|
1185.85.75
by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths. |
40 |
|
41 |
||
42 |
a_circle_c = u'\xe5' |
|
43 |
a_dots_c = u'\xe4' |
|
44 |
a_circle_d = u'a\u030a' |
|
45 |
a_dots_d = u'a\u0308' |
|
46 |
z_umlat_c = u'\u017d' |
|
47 |
z_umlat_d = u'Z\u030c' |
|
48 |
||
49 |
||
|
1185.85.81
by John Arbash Meinel
Use the correct Test Case base, so at least 'bzr selftest' starts. |
50 |
class UnicodeFilename(TestCaseWithTransport): |
|
1185.85.75
by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths. |
51 |
"""Test that UnicodeFilename returns the expected values.""" |
52 |
||
53 |
def test_a_circle(self): |
|
54 |
self.assertEqual(a_circle_d, normalize('NFKD', a_circle_c)) |
|
55 |
self.assertEqual(a_circle_c, normalize('NFKC', a_circle_d)) |
|
56 |
||
57 |
self.assertEqual((a_circle_c, True), unicode_filename(a_circle_c)) |
|
58 |
if normalizes_filenames(): |
|
59 |
self.assertEqual((a_circle_c, True), unicode_filename(a_circle_d)) |
|
60 |
else: |
|
61 |
self.assertEqual((a_circle_d, False), unicode_filename(a_circle_d)) |
|
62 |
||
63 |
def test_platform(self): |
|
|
1685.1.74
by Wouter van Heyst
fix nonascii tests to run properly under LANG=C |
64 |
try: |
65 |
self.build_tree([a_circle_c, a_dots_c, z_umlat_c]) |
|
66 |
except UnicodeError: |
|
67 |
raise TestSkipped("filesystem cannot create unicode files") |
|
|
1185.85.75
by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths. |
68 |
|
69 |
if sys.platform == 'darwin': |
|
70 |
expected = sorted([a_circle_d, a_dots_d, z_umlat_d]) |
|
71 |
else: |
|
72 |
expected = sorted([a_circle_c, a_dots_c, z_umlat_c]) |
|
73 |
||
74 |
present = sorted(os.listdir(u'.')) |
|
75 |
self.assertEqual(expected, present) |
|
76 |
||
77 |
def test_access(self): |
|
78 |
# We should always be able to access files by the path returned
|
|
79 |
# from unicode_filename
|
|
80 |
files = [a_circle_c, a_dots_c, z_umlat_c] |
|
|
1685.1.74
by Wouter van Heyst
fix nonascii tests to run properly under LANG=C |
81 |
try: |
82 |
self.build_tree(files) |
|
83 |
except UnicodeError: |
|
84 |
raise TestSkipped("filesystem cannot create unicode files") |
|
|
1185.85.75
by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths. |
85 |
|
86 |
for fname in files: |
|
87 |
path = unicode_filename(fname)[0] |
|
88 |
# We should get an exception if we can't open the file at
|
|
89 |
# this location.
|
|
90 |
f = open(path, 'rb') |
|
91 |
f.close() |
|
92 |
||
93 |