/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1540.3.15 by Martin Pool
[merge] large merge to sync with bzr.dev
1
# Copyright (C) 2005, 2006 Canonical
1540.3.24 by Martin Pool
Add new protocol 'http+pycurl' that always uses PyCurl.
2
#
1540.3.15 by Martin Pool
[merge] large merge to sync with bzr.dev
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.
1540.3.24 by Martin Pool
Add new protocol 'http+pycurl' that always uses PyCurl.
7
#
1540.3.15 by Martin Pool
[merge] large merge to sync with bzr.dev
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.
1540.3.24 by Martin Pool
Add new protocol 'http+pycurl' that always uses PyCurl.
12
#
1540.3.15 by Martin Pool
[merge] large merge to sync with bzr.dev
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
1185.16.68 by Martin Pool
- http url fixes suggested by Robey Pointer, and tests
16
1540.3.3 by Martin Pool
Review updates of pycurl transport
17
# FIXME: This test should be repeated for each available http client
18
# implementation; at the moment we have urllib and pycurl.
19
1540.3.22 by Martin Pool
[patch] Add TestCase.assertIsInstance
20
# TODO: Should be renamed to bzrlib.transport.http.tests?
21
1553.1.2 by James Henstridge
Add a test to make sure the user-agent header is being sent correctly.
22
import bzrlib
1540.3.30 by Martin Pool
Fix up bogus-url tests for broken dns servers, and error imports
23
from bzrlib.errors import DependencyNotPresent
24
from bzrlib.tests import TestCase, TestSkipped
1540.3.23 by Martin Pool
Allow urls like http+pycurl://host/ to use a particular impl
25
from bzrlib.transport import Transport
1786.1.23 by John Arbash Meinel
Move offset_to_http_ranges back onto HttpTransportBase, clarify tests.
26
from bzrlib.transport.http import extract_auth, HttpTransportBase
1540.3.26 by Martin Pool
[merge] bzr.dev; pycurl not updated for readv yet
27
from bzrlib.transport.http._urllib import HttpTransport_urllib
1553.1.3 by James Henstridge
Make bzrlib.transport.http.HttpServer output referer and user agent as in
28
from bzrlib.tests.HTTPTestUtil import TestCaseWithWebserver
1185.40.20 by Robey Pointer
allow user:pass@ info in http urls to be used for auth; this should be easily expandable later to use auth config files
29
1786.1.8 by John Arbash Meinel
[merge] Johan Rydberg test updates
30
1185.40.20 by Robey Pointer
allow user:pass@ info in http urls to be used for auth; this should be easily expandable later to use auth config files
31
class FakeManager (object):
1786.1.8 by John Arbash Meinel
[merge] Johan Rydberg test updates
32
1185.40.20 by Robey Pointer
allow user:pass@ info in http urls to be used for auth; this should be easily expandable later to use auth config files
33
    def __init__(self):
34
        self.credentials = []
35
        
36
    def add_password(self, realm, host, username, password):
37
        self.credentials.append([realm, host, username, password])
38
1553.1.2 by James Henstridge
Add a test to make sure the user-agent header is being sent correctly.
39
1185.16.68 by Martin Pool
- http url fixes suggested by Robey Pointer, and tests
40
class TestHttpUrls(TestCase):
1786.1.8 by John Arbash Meinel
[merge] Johan Rydberg test updates
41
1185.40.20 by Robey Pointer
allow user:pass@ info in http urls to be used for auth; this should be easily expandable later to use auth config files
42
    def test_url_parsing(self):
43
        f = FakeManager()
44
        url = extract_auth('http://example.com', f)
45
        self.assertEquals('http://example.com', url)
46
        self.assertEquals(0, len(f.credentials))
1185.50.94 by John Arbash Meinel
Updated web page url to http://bazaar-vcs.org
47
        url = extract_auth('http://user:pass@www.bazaar-vcs.org/bzr/bzr.dev', f)
48
        self.assertEquals('http://www.bazaar-vcs.org/bzr/bzr.dev', url)
1185.40.20 by Robey Pointer
allow user:pass@ info in http urls to be used for auth; this should be easily expandable later to use auth config files
49
        self.assertEquals(1, len(f.credentials))
1185.50.94 by John Arbash Meinel
Updated web page url to http://bazaar-vcs.org
50
        self.assertEquals([None, 'www.bazaar-vcs.org', 'user', 'pass'], f.credentials[0])
1185.40.20 by Robey Pointer
allow user:pass@ info in http urls to be used for auth; this should be easily expandable later to use auth config files
51
        
1185.16.68 by Martin Pool
- http url fixes suggested by Robey Pointer, and tests
52
    def test_abs_url(self):
53
        """Construction of absolute http URLs"""
1185.50.94 by John Arbash Meinel
Updated web page url to http://bazaar-vcs.org
54
        t = HttpTransport_urllib('http://bazaar-vcs.org/bzr/bzr.dev/')
1185.16.68 by Martin Pool
- http url fixes suggested by Robey Pointer, and tests
55
        eq = self.assertEqualDiff
56
        eq(t.abspath('.'),
1185.50.94 by John Arbash Meinel
Updated web page url to http://bazaar-vcs.org
57
           'http://bazaar-vcs.org/bzr/bzr.dev')
1185.16.68 by Martin Pool
- http url fixes suggested by Robey Pointer, and tests
58
        eq(t.abspath('foo/bar'), 
1185.50.94 by John Arbash Meinel
Updated web page url to http://bazaar-vcs.org
59
           'http://bazaar-vcs.org/bzr/bzr.dev/foo/bar')
1185.16.68 by Martin Pool
- http url fixes suggested by Robey Pointer, and tests
60
        eq(t.abspath('.bzr'),
1185.50.94 by John Arbash Meinel
Updated web page url to http://bazaar-vcs.org
61
           'http://bazaar-vcs.org/bzr/bzr.dev/.bzr')
1185.16.68 by Martin Pool
- http url fixes suggested by Robey Pointer, and tests
62
        eq(t.abspath('.bzr/1//2/./3'),
1185.50.94 by John Arbash Meinel
Updated web page url to http://bazaar-vcs.org
63
           'http://bazaar-vcs.org/bzr/bzr.dev/.bzr/1/2/3')
1185.16.68 by Martin Pool
- http url fixes suggested by Robey Pointer, and tests
64
65
    def test_invalid_http_urls(self):
66
        """Trap invalid construction of urls"""
1185.50.94 by John Arbash Meinel
Updated web page url to http://bazaar-vcs.org
67
        t = HttpTransport_urllib('http://bazaar-vcs.org/bzr/bzr.dev/')
1185.16.68 by Martin Pool
- http url fixes suggested by Robey Pointer, and tests
68
        self.assertRaises(ValueError,
69
            t.abspath,
70
            '.bzr/')
71
        self.assertRaises(ValueError,
72
            t.abspath,
73
            '/.bzr')
74
75
    def test_http_root_urls(self):
76
        """Construction of URLs from server root"""
1540.3.26 by Martin Pool
[merge] bzr.dev; pycurl not updated for readv yet
77
        t = HttpTransport_urllib('http://bzr.ozlabs.org/')
1185.16.68 by Martin Pool
- http url fixes suggested by Robey Pointer, and tests
78
        eq = self.assertEqualDiff
79
        eq(t.abspath('.bzr/tree-version'),
80
           'http://bzr.ozlabs.org/.bzr/tree-version')
1553.1.2 by James Henstridge
Add a test to make sure the user-agent header is being sent correctly.
81
1540.3.24 by Martin Pool
Add new protocol 'http+pycurl' that always uses PyCurl.
82
    def test_http_impl_urls(self):
83
        """There are servers which ask for particular clients to connect"""
84
        try:
85
            from bzrlib.transport.http._pycurl import HttpServer_PyCurl
86
            server = HttpServer_PyCurl()
87
            try:
88
                server.setUp()
89
                url = server.get_url()
90
                self.assertTrue(url.startswith('http+pycurl://'))
91
            finally:
92
                server.tearDown()
1540.3.30 by Martin Pool
Fix up bogus-url tests for broken dns servers, and error imports
93
        except DependencyNotPresent:
1540.3.24 by Martin Pool
Add new protocol 'http+pycurl' that always uses PyCurl.
94
            raise TestSkipped('pycurl not present')
1553.1.2 by James Henstridge
Add a test to make sure the user-agent header is being sent correctly.
95
1786.1.8 by John Arbash Meinel
[merge] Johan Rydberg test updates
96
1540.3.33 by Martin Pool
Fix http tests that were failing to run tearDown when setup got a missing dependency
97
class TestHttpMixins(object):
98
99
    def _prep_tree(self):
100
        self.build_tree(['xxx', 'foo/', 'foo/bar'], line_endings='binary',
101
                        transport=self.get_transport())
1553.1.2 by James Henstridge
Add a test to make sure the user-agent header is being sent correctly.
102
103
    def test_http_has(self):
1185.50.84 by John Arbash Meinel
[merge] bzr.dev, cleanup conflicts, fixup http tests for new TestCase layout.
104
        server = self.get_readonly_server()
1540.3.15 by Martin Pool
[merge] large merge to sync with bzr.dev
105
        t = self._transport(server.get_url())
1553.1.2 by James Henstridge
Add a test to make sure the user-agent header is being sent correctly.
106
        self.assertEqual(t.has('foo/bar'), True)
1185.50.84 by John Arbash Meinel
[merge] bzr.dev, cleanup conflicts, fixup http tests for new TestCase layout.
107
        self.assertEqual(len(server.logs), 1)
1540.3.15 by Martin Pool
[merge] large merge to sync with bzr.dev
108
        self.assertContainsRe(server.logs[0], 
109
            r'"HEAD /foo/bar HTTP/1.." (200|302) - "-" "bzr/')
1553.1.5 by James Henstridge
Make HTTP transport has() method do HEAD requests, and update test to
110
1540.3.15 by Martin Pool
[merge] large merge to sync with bzr.dev
111
    def test_http_has_not_found(self):
112
        server = self.get_readonly_server()
113
        t = self._transport(server.get_url())
1553.1.5 by James Henstridge
Make HTTP transport has() method do HEAD requests, and update test to
114
        self.assertEqual(t.has('not-found'), False)
1540.3.15 by Martin Pool
[merge] large merge to sync with bzr.dev
115
        self.assertContainsRe(server.logs[1], 
116
            r'"HEAD /not-found HTTP/1.." 404 - "-" "bzr/')
1553.1.2 by James Henstridge
Add a test to make sure the user-agent header is being sent correctly.
117
118
    def test_http_get(self):
1185.50.84 by John Arbash Meinel
[merge] bzr.dev, cleanup conflicts, fixup http tests for new TestCase layout.
119
        server = self.get_readonly_server()
1540.3.15 by Martin Pool
[merge] large merge to sync with bzr.dev
120
        t = self._transport(server.get_url())
1553.1.2 by James Henstridge
Add a test to make sure the user-agent header is being sent correctly.
121
        fp = t.get('foo/bar')
122
        self.assertEqualDiff(
123
            fp.read(),
1553.1.3 by James Henstridge
Make bzrlib.transport.http.HttpServer output referer and user agent as in
124
            'contents of foo/bar\n')
1185.50.84 by John Arbash Meinel
[merge] bzr.dev, cleanup conflicts, fixup http tests for new TestCase layout.
125
        self.assertEqual(len(server.logs), 1)
1540.3.15 by Martin Pool
[merge] large merge to sync with bzr.dev
126
        self.assertTrue(server.logs[0].find(
127
            '"GET /foo/bar HTTP/1.1" 200 - "-" "bzr/%s' % bzrlib.__version__) > -1)
128
129
1540.3.33 by Martin Pool
Fix http tests that were failing to run tearDown when setup got a missing dependency
130
class TestHttpConnections_urllib(TestCaseWithWebserver, TestHttpMixins):
1786.1.8 by John Arbash Meinel
[merge] Johan Rydberg test updates
131
1540.3.33 by Martin Pool
Fix http tests that were failing to run tearDown when setup got a missing dependency
132
    _transport = HttpTransport_urllib
1540.3.15 by Martin Pool
[merge] large merge to sync with bzr.dev
133
134
    def setUp(self):
1540.3.33 by Martin Pool
Fix http tests that were failing to run tearDown when setup got a missing dependency
135
        TestCaseWithWebserver.setUp(self)
136
        self._prep_tree()
137
138
139
140
class TestHttpConnections_pycurl(TestCaseWithWebserver, TestHttpMixins):
141
142
    def _get_pycurl_maybe(self):
1540.3.29 by Martin Pool
Prevent selftest failure when pycurl is not installed
143
        try:
144
            from bzrlib.transport.http._pycurl import PyCurlTransport
1612.1.1 by Martin Pool
Raise errors correctly on pycurl connection failure
145
            return PyCurlTransport
1540.3.30 by Martin Pool
Fix up bogus-url tests for broken dns servers, and error imports
146
        except DependencyNotPresent:
1540.3.29 by Martin Pool
Prevent selftest failure when pycurl is not installed
147
            raise TestSkipped('pycurl not present')
1540.3.15 by Martin Pool
[merge] large merge to sync with bzr.dev
148
1540.3.33 by Martin Pool
Fix http tests that were failing to run tearDown when setup got a missing dependency
149
    _transport = property(_get_pycurl_maybe)
150
151
    def setUp(self):
152
        TestCaseWithWebserver.setUp(self)
153
        self._prep_tree()
154
155
1540.3.23 by Martin Pool
Allow urls like http+pycurl://host/ to use a particular impl
156
157
class TestHttpTransportRegistration(TestCase):
158
    """Test registrations of various http implementations"""
159
160
    def test_http_registered(self):
161
        import bzrlib.transport.http._urllib
162
        from bzrlib.transport import get_transport
163
        # urlllib should always be present
164
        t = get_transport('http+urllib://bzr.google.com/')
165
        self.assertIsInstance(t, Transport)
1540.3.26 by Martin Pool
[merge] bzr.dev; pycurl not updated for readv yet
166
        self.assertIsInstance(t, bzrlib.transport.http._urllib.HttpTransport_urllib)
1786.1.23 by John Arbash Meinel
Move offset_to_http_ranges back onto HttpTransportBase, clarify tests.
167
168
169
class TestOffsets(TestCase):
1786.1.28 by John Arbash Meinel
Update and add tests for the HttpTransportBase.range_header
170
    """Test offsets_to_ranges method"""
1786.1.23 by John Arbash Meinel
Move offset_to_http_ranges back onto HttpTransportBase, clarify tests.
171
172
    def test_offsets_to_ranges_simple(self):
173
        to_range = HttpTransportBase.offsets_to_ranges
1786.1.39 by John Arbash Meinel
Remove the ability to read negative offsets from readv()
174
        ranges = to_range([(10, 1)])
1786.1.23 by John Arbash Meinel
Move offset_to_http_ranges back onto HttpTransportBase, clarify tests.
175
        self.assertEqual([[10, 10]], ranges)
1786.1.39 by John Arbash Meinel
Remove the ability to read negative offsets from readv()
176
177
        ranges = to_range([(0, 1), (1, 1)])
178
        self.assertEqual([[0, 1]], ranges)
179
180
        ranges = to_range([(1, 1), (0, 1)])
181
        self.assertEqual([[0, 1]], ranges)
1786.1.23 by John Arbash Meinel
Move offset_to_http_ranges back onto HttpTransportBase, clarify tests.
182
183
    def test_offset_to_ranges_overlapped(self):
184
        to_range = HttpTransportBase.offsets_to_ranges
185
1786.1.39 by John Arbash Meinel
Remove the ability to read negative offsets from readv()
186
        ranges = to_range([(10, 1), (20, 2), (22, 5)])
187
        self.assertEqual([[10, 10], [20, 26]], ranges)
188
189
        ranges = to_range([(10, 1), (11, 2), (22, 5)])
190
        self.assertEqual([[10, 12], [22, 26]], ranges)
1786.1.23 by John Arbash Meinel
Move offset_to_http_ranges back onto HttpTransportBase, clarify tests.
191
1786.1.28 by John Arbash Meinel
Update and add tests for the HttpTransportBase.range_header
192
193
class TestRangeHeader(TestCase):
194
    """Test range_header method"""
195
196
    def check_header(self, value, ranges=[], tail=0):
197
        range_header = HttpTransportBase.range_header
198
        self.assertEqual(value, range_header(ranges, tail))
199
200
    def test_range_header_single(self):
1786.1.36 by John Arbash Meinel
pycurl expects us to just set the range of bytes, not including bytes=
201
        self.check_header('0-9', ranges=[[0,9]])
202
        self.check_header('100-109', ranges=[[100,109]])
1786.1.28 by John Arbash Meinel
Update and add tests for the HttpTransportBase.range_header
203
204
    def test_range_header_tail(self):
1786.1.36 by John Arbash Meinel
pycurl expects us to just set the range of bytes, not including bytes=
205
        self.check_header('-10', tail=10)
206
        self.check_header('-50', tail=50)
1786.1.28 by John Arbash Meinel
Update and add tests for the HttpTransportBase.range_header
207
208
    def test_range_header_multi(self):
1786.1.36 by John Arbash Meinel
pycurl expects us to just set the range of bytes, not including bytes=
209
        self.check_header('0-9,100-200,300-5000',
1786.1.28 by John Arbash Meinel
Update and add tests for the HttpTransportBase.range_header
210
                          ranges=[(0,9), (100, 200), (300,5000)])
211
212
    def test_range_header_mixed(self):
1786.1.36 by John Arbash Meinel
pycurl expects us to just set the range of bytes, not including bytes=
213
        self.check_header('0-9,300-5000,-50',
1786.1.28 by John Arbash Meinel
Update and add tests for the HttpTransportBase.range_header
214
                          ranges=[(0,9), (300,5000)],
215
                          tail=50)