~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_urlutils.py

Don't ignore bzrlib/plugins -- really bad idea because they can have bad 
old plugins lying around!

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
 
"""Tests for the urlutils wrapper."""
18
 
 
19
 
import os
20
 
import re
21
 
import sys
22
 
 
23
 
from bzrlib import osutils, urlutils
24
 
import bzrlib
25
 
from bzrlib.errors import InvalidURL, InvalidURLJoin
26
 
from bzrlib.tests import TestCaseInTempDir, TestCase, TestSkipped
27
 
 
28
 
 
29
 
class TestUrlToPath(TestCase):
30
 
    
31
 
    def test_basename(self):
32
 
        # bzrlib.urlutils.basename
33
 
        # Test bzrlib.urlutils.split()
34
 
        basename = urlutils.basename
35
 
        if sys.platform == 'win32':
36
 
            self.assertRaises(InvalidURL, basename, 'file:///path/to/foo')
37
 
            self.assertEqual('foo', basename('file:///C|/foo'))
38
 
            self.assertEqual('foo', basename('file:///C:/foo'))
39
 
            self.assertEqual('', basename('file:///C:/'))
40
 
        else:
41
 
            self.assertEqual('foo', basename('file:///foo'))
42
 
            self.assertEqual('', basename('file:///'))
43
 
 
44
 
        self.assertEqual('foo', basename('http://host/path/to/foo'))
45
 
        self.assertEqual('foo', basename('http://host/path/to/foo/'))
46
 
        self.assertEqual('',
47
 
            basename('http://host/path/to/foo/', exclude_trailing_slash=False))
48
 
        self.assertEqual('path', basename('http://host/path'))
49
 
        self.assertEqual('', basename('http://host/'))
50
 
        self.assertEqual('', basename('http://host'))
51
 
        self.assertEqual('path', basename('http:///nohost/path'))
52
 
 
53
 
        self.assertEqual('path', basename('random+scheme://user:pass@ahost:port/path'))
54
 
        self.assertEqual('path', basename('random+scheme://user:pass@ahost:port/path/'))
55
 
        self.assertEqual('', basename('random+scheme://user:pass@ahost:port/'))
56
 
 
57
 
        # relative paths
58
 
        self.assertEqual('foo', basename('path/to/foo'))
59
 
        self.assertEqual('foo', basename('path/to/foo/'))
60
 
        self.assertEqual('', basename('path/to/foo/',
61
 
            exclude_trailing_slash=False))
62
 
        self.assertEqual('foo', basename('path/../foo'))
63
 
        self.assertEqual('foo', basename('../path/foo'))
64
 
 
65
 
    def test_normalize_url_files(self):
66
 
        # Test that local paths are properly normalized
67
 
        normalize_url = urlutils.normalize_url
68
 
 
69
 
        def norm_file(expected, path):
70
 
            url = normalize_url(path)
71
 
            self.assertStartsWith(url, 'file:///')
72
 
            if sys.platform == 'win32':
73
 
                url = url[len('file:///C:'):]
74
 
            else:
75
 
                url = url[len('file://'):]
76
 
 
77
 
            self.assertEndsWith(url, expected)
78
 
 
79
 
        norm_file('path/to/foo', 'path/to/foo')
80
 
        norm_file('/path/to/foo', '/path/to/foo')
81
 
        norm_file('path/to/foo', '../path/to/foo')
82
 
 
83
 
        # Local paths are assumed to *not* be escaped at all
84
 
        try:
85
 
            u'uni/\xb5'.encode(bzrlib.user_encoding)
86
 
        except UnicodeError:
87
 
            # locale cannot handle unicode 
88
 
            pass
89
 
        else:
90
 
            norm_file('uni/%C2%B5', u'uni/\xb5')
91
 
 
92
 
        norm_file('uni/%25C2%25B5', u'uni/%C2%B5')
93
 
        norm_file('uni/%20b', u'uni/ b')
94
 
        # All the crazy characters get escaped in local paths => file:/// urls
95
 
        # The ' ' character must not be at the end, because on win32
96
 
        # it gets stripped off by ntpath.abspath
97
 
        norm_file('%27%20%3B/%3F%3A%40%26%3D%2B%24%2C%23', "' ;/?:@&=+$,#")
98
 
 
99
 
    def test_normalize_url_hybrid(self):
100
 
        # Anything with a scheme:// should be treated as a hybrid url
101
 
        # which changes what characters get escaped.
102
 
        normalize_url = urlutils.normalize_url
103
 
 
104
 
        eq = self.assertEqual
105
 
        eq('file:///foo/', normalize_url(u'file:///foo/'))
106
 
        eq('file:///foo/%20', normalize_url(u'file:///foo/ '))
107
 
        eq('file:///foo/%20', normalize_url(u'file:///foo/%20'))
108
 
        # Don't escape reserved characters
109
 
        eq('file:///ab_c.d-e/%f:?g&h=i+j;k,L#M$',
110
 
            normalize_url('file:///ab_c.d-e/%f:?g&h=i+j;k,L#M$'))
111
 
        eq('http://ab_c.d-e/%f:?g&h=i+j;k,L#M$',
112
 
            normalize_url('http://ab_c.d-e/%f:?g&h=i+j;k,L#M$'))
113
 
 
114
 
        # Escape unicode characters, but not already escaped chars
115
 
        eq('http://host/ab/%C2%B5/%C2%B5',
116
 
            normalize_url(u'http://host/ab/%C2%B5/\xb5'))
117
 
 
118
 
        # Normalize verifies URLs when they are not unicode
119
 
        # (indicating they did not come from the user)
120
 
        self.assertRaises(InvalidURL, normalize_url, 'http://host/\xb5')
121
 
        self.assertRaises(InvalidURL, normalize_url, 'http://host/ ')
122
 
 
123
 
    def test_url_scheme_re(self):
124
 
        # Test paths that may be URLs
125
 
        def test_one(url, scheme_and_path):
126
 
            """Assert that _url_scheme_re correctly matches
127
 
 
128
 
            :param scheme_and_path: The (scheme, path) that should be matched
129
 
                can be None, to indicate it should not match
130
 
            """
131
 
            m = urlutils._url_scheme_re.match(url)
132
 
            if scheme_and_path is None:
133
 
                self.assertEqual(None, m)
134
 
            else:
135
 
                self.assertEqual(scheme_and_path[0], m.group('scheme'))
136
 
                self.assertEqual(scheme_and_path[1], m.group('path'))
137
 
 
138
 
        # Local paths
139
 
        test_one('/path', None)
140
 
        test_one('C:/path', None)
141
 
        test_one('../path/to/foo', None)
142
 
        test_one(u'../path/to/fo\xe5', None)
143
 
 
144
 
        # Real URLS
145
 
        test_one('http://host/path/', ('http', 'host/path/'))
146
 
        test_one('sftp://host/path/to/foo', ('sftp', 'host/path/to/foo'))
147
 
        test_one('file:///usr/bin', ('file', '/usr/bin'))
148
 
        test_one('file:///C:/Windows', ('file', '/C:/Windows'))
149
 
        test_one('file:///C|/Windows', ('file', '/C|/Windows'))
150
 
        test_one(u'readonly+sftp://host/path/\xe5', ('readonly+sftp', u'host/path/\xe5'))
151
 
 
152
 
        # Weird stuff
153
 
        # Can't have slashes or colons in the scheme
154
 
        test_one('/path/to/://foo', None)
155
 
        test_one('path:path://foo', None)
156
 
        # Must have more than one character for scheme
157
 
        test_one('C://foo', None)
158
 
        test_one('ab://foo', ('ab', 'foo'))
159
 
 
160
 
    def test_dirname(self):
161
 
        # Test bzrlib.urlutils.dirname()
162
 
        dirname = urlutils.dirname
163
 
        if sys.platform == 'win32':
164
 
            self.assertRaises(InvalidURL, dirname, 'file:///path/to/foo')
165
 
            self.assertEqual('file:///C|/', dirname('file:///C|/foo'))
166
 
            self.assertEqual('file:///C|/', dirname('file:///C|/'))
167
 
        else:
168
 
            self.assertEqual('file:///', dirname('file:///foo'))
169
 
            self.assertEqual('file:///', dirname('file:///'))
170
 
 
171
 
        self.assertEqual('http://host/path/to', dirname('http://host/path/to/foo'))
172
 
        self.assertEqual('http://host/path/to', dirname('http://host/path/to/foo/'))
173
 
        self.assertEqual('http://host/path/to/foo',
174
 
            dirname('http://host/path/to/foo/', exclude_trailing_slash=False))
175
 
        self.assertEqual('http://host/', dirname('http://host/path'))
176
 
        self.assertEqual('http://host/', dirname('http://host/'))
177
 
        self.assertEqual('http://host', dirname('http://host'))
178
 
        self.assertEqual('http:///nohost', dirname('http:///nohost/path'))
179
 
 
180
 
        self.assertEqual('random+scheme://user:pass@ahost:port/',
181
 
            dirname('random+scheme://user:pass@ahost:port/path'))
182
 
        self.assertEqual('random+scheme://user:pass@ahost:port/',
183
 
            dirname('random+scheme://user:pass@ahost:port/path/'))
184
 
        self.assertEqual('random+scheme://user:pass@ahost:port/',
185
 
            dirname('random+scheme://user:pass@ahost:port/'))
186
 
 
187
 
        # relative paths
188
 
        self.assertEqual('path/to', dirname('path/to/foo'))
189
 
        self.assertEqual('path/to', dirname('path/to/foo/'))
190
 
        self.assertEqual('path/to/foo',
191
 
            dirname('path/to/foo/', exclude_trailing_slash=False))
192
 
        self.assertEqual('path/..', dirname('path/../foo'))
193
 
        self.assertEqual('../path', dirname('../path/foo'))
194
 
 
195
 
    def test_join(self):
196
 
        def test(expected, *args):
197
 
            joined = urlutils.join(*args)
198
 
            self.assertEqual(expected, joined)
199
 
 
200
 
        # Test a single element
201
 
        test('foo', 'foo')
202
 
 
203
 
        # Test relative path joining
204
 
        test('foo/bar', 'foo', 'bar')
205
 
        test('http://foo/bar', 'http://foo', 'bar')
206
 
        test('http://foo/bar', 'http://foo', '.', 'bar')
207
 
        test('http://foo/baz', 'http://foo', 'bar', '../baz')
208
 
        test('http://foo/bar/baz', 'http://foo', 'bar/baz')
209
 
        test('http://foo/baz', 'http://foo', 'bar/../baz')
210
 
 
211
 
        # Absolute paths
212
 
        test('http://bar', 'http://foo', 'http://bar')
213
 
        test('sftp://bzr/foo', 'http://foo', 'bar', 'sftp://bzr/foo')
214
 
        test('file:///bar', 'foo', 'file:///bar')
215
 
 
216
 
        # From a base path
217
 
        test('file:///foo', 'file:///', 'foo')
218
 
        test('file:///bar/foo', 'file:///bar/', 'foo')
219
 
        test('http://host/foo', 'http://host/', 'foo')
220
 
        test('http://host/', 'http://host', '')
221
 
        
222
 
        # Invalid joinings
223
 
        # Cannot go above root
224
 
        self.assertRaises(InvalidURLJoin, urlutils.join,
225
 
                'http://foo', '../baz')
226
 
 
227
 
    def test_function_type(self):
228
 
        if sys.platform == 'win32':
229
 
            self.assertEqual(urlutils._win32_local_path_to_url, urlutils.local_path_to_url)
230
 
            self.assertEqual(urlutils._win32_local_path_from_url, urlutils.local_path_from_url)
231
 
        else:
232
 
            self.assertEqual(urlutils._posix_local_path_to_url, urlutils.local_path_to_url)
233
 
            self.assertEqual(urlutils._posix_local_path_from_url, urlutils.local_path_from_url)
234
 
 
235
 
    def test_posix_local_path_to_url(self):
236
 
        to_url = urlutils._posix_local_path_to_url
237
 
        self.assertEqual('file:///path/to/foo',
238
 
            to_url('/path/to/foo'))
239
 
 
240
 
        try:
241
 
            result = to_url(u'/path/to/r\xe4ksm\xf6rg\xe5s')
242
 
        except UnicodeError:
243
 
            raise TestSkipped("local encoding cannot handle unicode")
244
 
 
245
 
        self.assertEqual('file:///path/to/r%C3%A4ksm%C3%B6rg%C3%A5s', result)
246
 
 
247
 
    def test_posix_local_path_from_url(self):
248
 
        from_url = urlutils._posix_local_path_from_url
249
 
        self.assertEqual('/path/to/foo',
250
 
            from_url('file:///path/to/foo'))
251
 
        self.assertEqual(u'/path/to/r\xe4ksm\xf6rg\xe5s',
252
 
            from_url('file:///path/to/r%C3%A4ksm%C3%B6rg%C3%A5s'))
253
 
        self.assertEqual(u'/path/to/r\xe4ksm\xf6rg\xe5s',
254
 
            from_url('file:///path/to/r%c3%a4ksm%c3%b6rg%c3%a5s'))
255
 
 
256
 
        self.assertRaises(InvalidURL, from_url, '/path/to/foo')
257
 
 
258
 
    def test_win32_local_path_to_url(self):
259
 
        to_url = urlutils._win32_local_path_to_url
260
 
        self.assertEqual('file:///C:/path/to/foo',
261
 
            to_url('C:/path/to/foo'))
262
 
        # BOGUS: on win32, ntpath.abspath will strip trailing
263
 
        #       whitespace, so this will always fail
264
 
        #       Though under linux, it fakes abspath support
265
 
        #       and thus will succeed
266
 
        # self.assertEqual('file:///C:/path/to/foo%20',
267
 
        #     to_url('C:/path/to/foo '))
268
 
        self.assertEqual('file:///C:/path/to/f%20oo',
269
 
            to_url('C:/path/to/f oo'))
270
 
 
271
 
        try:
272
 
            result = to_url(u'd:/path/to/r\xe4ksm\xf6rg\xe5s')
273
 
        except UnicodeError:
274
 
            raise TestSkipped("local encoding cannot handle unicode")
275
 
 
276
 
        self.assertEqual('file:///D:/path/to/r%C3%A4ksm%C3%B6rg%C3%A5s', result)
277
 
 
278
 
    def test_win32_local_path_from_url(self):
279
 
        from_url = urlutils._win32_local_path_from_url
280
 
        self.assertEqual('C:/path/to/foo',
281
 
            from_url('file:///C|/path/to/foo'))
282
 
        self.assertEqual(u'D:/path/to/r\xe4ksm\xf6rg\xe5s',
283
 
            from_url('file:///d|/path/to/r%C3%A4ksm%C3%B6rg%C3%A5s'))
284
 
        self.assertEqual(u'D:/path/to/r\xe4ksm\xf6rg\xe5s',
285
 
            from_url('file:///d:/path/to/r%c3%a4ksm%c3%b6rg%c3%a5s'))
286
 
 
287
 
        self.assertRaises(InvalidURL, from_url, '/path/to/foo')
288
 
        # Not a valid _win32 url, no drive letter
289
 
        self.assertRaises(InvalidURL, from_url, 'file:///path/to/foo')
290
 
 
291
 
    def test__win32_extract_drive_letter(self):
292
 
        extract = urlutils._win32_extract_drive_letter
293
 
        self.assertEqual(('file:///C:', '/foo'), extract('file://', '/C:/foo'))
294
 
        self.assertEqual(('file:///d|', '/path'), extract('file://', '/d|/path'))
295
 
        self.assertRaises(InvalidURL, extract, 'file://', '/path')
296
 
 
297
 
    def test_split(self):
298
 
        # Test bzrlib.urlutils.split()
299
 
        split = urlutils.split
300
 
        if sys.platform == 'win32':
301
 
            self.assertRaises(InvalidURL, split, 'file:///path/to/foo')
302
 
            self.assertEqual(('file:///C|/', 'foo'), split('file:///C|/foo'))
303
 
            self.assertEqual(('file:///C:/', ''), split('file:///C:/'))
304
 
        else:
305
 
            self.assertEqual(('file:///', 'foo'), split('file:///foo'))
306
 
            self.assertEqual(('file:///', ''), split('file:///'))
307
 
 
308
 
        self.assertEqual(('http://host/path/to', 'foo'), split('http://host/path/to/foo'))
309
 
        self.assertEqual(('http://host/path/to', 'foo'), split('http://host/path/to/foo/'))
310
 
        self.assertEqual(('http://host/path/to/foo', ''),
311
 
            split('http://host/path/to/foo/', exclude_trailing_slash=False))
312
 
        self.assertEqual(('http://host/', 'path'), split('http://host/path'))
313
 
        self.assertEqual(('http://host/', ''), split('http://host/'))
314
 
        self.assertEqual(('http://host', ''), split('http://host'))
315
 
        self.assertEqual(('http:///nohost', 'path'), split('http:///nohost/path'))
316
 
 
317
 
        self.assertEqual(('random+scheme://user:pass@ahost:port/', 'path'),
318
 
            split('random+scheme://user:pass@ahost:port/path'))
319
 
        self.assertEqual(('random+scheme://user:pass@ahost:port/', 'path'),
320
 
            split('random+scheme://user:pass@ahost:port/path/'))
321
 
        self.assertEqual(('random+scheme://user:pass@ahost:port/', ''),
322
 
            split('random+scheme://user:pass@ahost:port/'))
323
 
 
324
 
        # relative paths
325
 
        self.assertEqual(('path/to', 'foo'), split('path/to/foo'))
326
 
        self.assertEqual(('path/to', 'foo'), split('path/to/foo/'))
327
 
        self.assertEqual(('path/to/foo', ''),
328
 
            split('path/to/foo/', exclude_trailing_slash=False))
329
 
        self.assertEqual(('path/..', 'foo'), split('path/../foo'))
330
 
        self.assertEqual(('../path', 'foo'), split('../path/foo'))
331
 
 
332
 
    def test__win32_strip_local_trailing_slash(self):
333
 
        strip = urlutils._win32_strip_local_trailing_slash
334
 
        self.assertEqual('file://', strip('file://'))
335
 
        self.assertEqual('file:///', strip('file:///'))
336
 
        self.assertEqual('file:///C', strip('file:///C'))
337
 
        self.assertEqual('file:///C:', strip('file:///C:'))
338
 
        self.assertEqual('file:///d|', strip('file:///d|'))
339
 
        self.assertEqual('file:///C:/', strip('file:///C:/'))
340
 
        self.assertEqual('file:///C:/a', strip('file:///C:/a/'))
341
 
 
342
 
    def test_strip_trailing_slash(self):
343
 
        sts = urlutils.strip_trailing_slash
344
 
        if sys.platform == 'win32':
345
 
            self.assertEqual('file:///C|/', sts('file:///C|/'))
346
 
            self.assertEqual('file:///C:/foo', sts('file:///C:/foo'))
347
 
            self.assertEqual('file:///C|/foo', sts('file:///C|/foo/'))
348
 
        else:
349
 
            self.assertEqual('file:///', sts('file:///'))
350
 
            self.assertEqual('file:///foo', sts('file:///foo'))
351
 
            self.assertEqual('file:///foo', sts('file:///foo/'))
352
 
 
353
 
        self.assertEqual('http://host/', sts('http://host/'))
354
 
        self.assertEqual('http://host/foo', sts('http://host/foo'))
355
 
        self.assertEqual('http://host/foo', sts('http://host/foo/'))
356
 
 
357
 
        # No need to fail just because the slash is missing
358
 
        self.assertEqual('http://host', sts('http://host'))
359
 
        # TODO: jam 20060502 Should this raise InvalidURL?
360
 
        self.assertEqual('file://', sts('file://'))
361
 
 
362
 
        self.assertEqual('random+scheme://user:pass@ahost:port/path',
363
 
            sts('random+scheme://user:pass@ahost:port/path'))
364
 
        self.assertEqual('random+scheme://user:pass@ahost:port/path',
365
 
            sts('random+scheme://user:pass@ahost:port/path/'))
366
 
        self.assertEqual('random+scheme://user:pass@ahost:port/',
367
 
            sts('random+scheme://user:pass@ahost:port/'))
368
 
 
369
 
        # Make sure relative paths work too
370
 
        self.assertEqual('path/to/foo', sts('path/to/foo'))
371
 
        self.assertEqual('path/to/foo', sts('path/to/foo/'))
372
 
        self.assertEqual('../to/foo', sts('../to/foo/'))
373
 
        self.assertEqual('path/../foo', sts('path/../foo/'))
374
 
 
375
 
    def test_unescape_for_display_utf8(self):
376
 
        # Test that URLs are converted to nice unicode strings for display
377
 
        def test(expected, url, encoding='utf-8'):
378
 
            disp_url = urlutils.unescape_for_display(url, encoding=encoding)
379
 
            self.assertIsInstance(disp_url, unicode)
380
 
            self.assertEqual(expected, disp_url)
381
 
 
382
 
        test('http://foo', 'http://foo')
383
 
        if sys.platform == 'win32':
384
 
            test('C:/foo/path', 'file:///C|/foo/path')
385
 
            test('C:/foo/path', 'file:///C:/foo/path')
386
 
        else:
387
 
            test('/foo/path', 'file:///foo/path')
388
 
 
389
 
        test('http://foo/%2Fbaz', 'http://foo/%2Fbaz')
390
 
        test(u'http://host/r\xe4ksm\xf6rg\xe5s',
391
 
             'http://host/r%C3%A4ksm%C3%B6rg%C3%A5s')
392
 
 
393
 
        # Make sure special escaped characters stay escaped
394
 
        test(u'http://host/%3B%2F%3F%3A%40%26%3D%2B%24%2C%23',
395
 
             'http://host/%3B%2F%3F%3A%40%26%3D%2B%24%2C%23')
396
 
 
397
 
        # Can we handle sections that don't have utf-8 encoding?
398
 
        test(u'http://host/%EE%EE%EE/r\xe4ksm\xf6rg\xe5s',
399
 
             'http://host/%EE%EE%EE/r%C3%A4ksm%C3%B6rg%C3%A5s')
400
 
 
401
 
        # Test encoding into output that can handle some characters
402
 
        test(u'http://host/%EE%EE%EE/r\xe4ksm\xf6rg\xe5s',
403
 
             'http://host/%EE%EE%EE/r%C3%A4ksm%C3%B6rg%C3%A5s',
404
 
             encoding='iso-8859-1')
405
 
 
406
 
        # This one can be encoded into utf8
407
 
        test(u'http://host/\u062c\u0648\u062c\u0648',
408
 
             'http://host/%d8%ac%d9%88%d8%ac%d9%88',
409
 
             encoding='utf-8')
410
 
 
411
 
        # This can't be put into 8859-1 and so stays as escapes
412
 
        test(u'http://host/%d8%ac%d9%88%d8%ac%d9%88',
413
 
             'http://host/%d8%ac%d9%88%d8%ac%d9%88',
414
 
             encoding='iso-8859-1')
415
 
 
416
 
    def test_escape(self):
417
 
        self.assertEqual('%25', urlutils.escape('%'))
418
 
        self.assertEqual('%C3%A5', urlutils.escape(u'\xe5'))
419
 
 
420
 
    def test_unescape(self):
421
 
        self.assertEqual('%', urlutils.unescape('%25'))
422
 
        self.assertEqual(u'\xe5', urlutils.unescape('%C3%A5'))
423
 
 
424
 
        self.assertRaises(InvalidURL, urlutils.unescape, u'\xe5')
425
 
        self.assertRaises(InvalidURL, urlutils.unescape, '\xe5')
426
 
        self.assertRaises(InvalidURL, urlutils.unescape, '%E5')
427
 
 
428
 
    def test_escape_unescape(self):
429
 
        self.assertEqual(u'\xe5', urlutils.unescape(urlutils.escape(u'\xe5')))
430
 
        self.assertEqual('%', urlutils.unescape(urlutils.escape('%')))
431
 
 
432
 
    def test_relative_url(self):
433
 
        def test(expected, base, other):
434
 
            result = urlutils.relative_url(base, other)
435
 
            self.assertEqual(expected, result)
436
 
            
437
 
        test('a', 'http://host/', 'http://host/a')
438
 
        test('http://entirely/different', 'sftp://host/branch',
439
 
                    'http://entirely/different')
440
 
        test('../person/feature', 'http://host/branch/mainline',
441
 
                    'http://host/branch/person/feature')
442
 
        test('..', 'http://host/branch', 'http://host/')
443
 
        test('http://host2/branch', 'http://host1/branch', 'http://host2/branch')
444
 
        test('.', 'http://host1/branch', 'http://host1/branch')
445
 
        test('../../../branch/2b', 'file:///home/jelmer/foo/bar/2b',
446
 
                    'file:///home/jelmer/branch/2b')
447
 
        test('../../branch/2b', 'sftp://host/home/jelmer/bar/2b',
448
 
                    'sftp://host/home/jelmer/branch/2b')
449
 
        test('../../branch/feature/%2b', 'http://host/home/jelmer/bar/%2b',
450
 
                    'http://host/home/jelmer/branch/feature/%2b')
451
 
        test('../../branch/feature/2b', 'http://host/home/jelmer/bar/2b/', 
452
 
                    'http://host/home/jelmer/branch/feature/2b')
453
 
        # relative_url should preserve a trailing slash
454
 
        test('../../branch/feature/2b/', 'http://host/home/jelmer/bar/2b/',
455
 
                    'http://host/home/jelmer/branch/feature/2b/')
456
 
        test('../../branch/feature/2b/', 'http://host/home/jelmer/bar/2b',
457
 
                    'http://host/home/jelmer/branch/feature/2b/')
458
 
 
459
 
        # TODO: treat http://host as http://host/
460
 
        #       relative_url is typically called from a branch.base or
461
 
        #       transport.base which always ends with a /
462
 
        #test('a', 'http://host', 'http://host/a')
463
 
        test('http://host/a', 'http://host', 'http://host/a')
464
 
        #test('.', 'http://host', 'http://host/')
465
 
        test('http://host/', 'http://host', 'http://host/')
466
 
        #test('.', 'http://host/', 'http://host')
467
 
        test('http://host', 'http://host/', 'http://host')
468
 
 
469
 
 
470
 
class TestCwdToURL(TestCaseInTempDir):
471
 
    """Test that local_path_to_url works base on the cwd"""
472
 
 
473
 
    def test_dot(self):
474
 
        # This test will fail if getcwd is not ascii
475
 
        os.mkdir('mytest')
476
 
        os.chdir('mytest')
477
 
 
478
 
        url = urlutils.local_path_to_url('.')
479
 
        self.assertEndsWith(url, '/mytest')
480
 
 
481
 
    def test_non_ascii(self):
482
 
        try:
483
 
            os.mkdir(u'dod\xe9')
484
 
        except UnicodeError:
485
 
            raise TestSkipped('cannot create unicode directory')
486
 
 
487
 
        os.chdir(u'dod\xe9')
488
 
 
489
 
        # On Mac OSX this directory is actually: 
490
 
        #   u'/dode\u0301' => '/dode\xcc\x81
491
 
        # but we should normalize it back to 
492
 
        #   u'/dod\xe9' => '/dod\xc3\xa9'
493
 
        url = urlutils.local_path_to_url('.')
494
 
        self.assertEndsWith(url, '/dod%C3%A9')