← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_http.py

  • Committer: Vincent Ladeuil
  • Date: 2010-02-10 15:46:03 UTC
  • mfrom: (4985.3.21 update)
  • mto: This revision was merged to the branch mainline in revision 5021.
  • Revision ID: v.ladeuil+lp@free.fr-20100210154603-k4no1gvfuqpzrw7p
https://launchpad.net/bugs/113809
Update performs two merges in a more logical order but stop on conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_http.py
1
 
# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
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
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Tests for HTTP implementations.
18
18
 
44
44
    ui,
45
45
    urlutils,
46
46
    )
 
47
from bzrlib.symbol_versioning import (
 
48
    deprecated_in,
 
49
    )
47
50
from bzrlib.tests import (
 
51
    features,
48
52
    http_server,
49
53
    http_utils,
50
54
    )
58
62
    )
59
63
 
60
64
 
61
 
try:
 
65
if features.pycurl.available():
62
66
    from bzrlib.transport.http._pycurl import PyCurlTransport
63
 
    pycurl_present = True
64
 
except errors.DependencyNotPresent:
65
 
    pycurl_present = False
66
67
 
67
68
 
68
69
def load_tests(standard_tests, module, loader):
69
70
    """Multiply tests for http clients and protocol versions."""
70
71
    result = loader.suiteClass()
71
 
    adapter = tests.TestScenarioApplier()
72
 
    remaining_tests = standard_tests
73
72
 
74
 
    # one for each transport
 
73
    # one for each transport implementation
75
74
    t_tests, remaining_tests = tests.split_suite_by_condition(
76
 
        remaining_tests, tests.condition_isinstance((
 
75
        standard_tests, tests.condition_isinstance((
77
76
                TestHttpTransportRegistration,
78
77
                TestHttpTransportUrls,
79
78
                Test_redirected_to,
83
82
                        _server=http_server.HttpServer_urllib,
84
83
                        _qualified_prefix='http+urllib',)),
85
84
        ]
86
 
    if pycurl_present:
 
85
    if features.pycurl.available():
87
86
        transport_scenarios.append(
88
87
            ('pycurl', dict(_transport=PyCurlTransport,
89
88
                            _server=http_server.HttpServer_PyCurl,
90
89
                            _qualified_prefix='http+pycurl',)))
91
 
    adapter.scenarios = transport_scenarios
92
 
    tests.adapt_tests(t_tests, adapter, result)
 
90
    tests.multiply_tests(t_tests, transport_scenarios, result)
93
91
 
94
 
    # multiplied by one for each protocol version
 
92
    # each implementation tested with each HTTP version
95
93
    tp_tests, remaining_tests = tests.split_suite_by_condition(
96
94
        remaining_tests, tests.condition_isinstance((
97
95
                SmartHTTPTunnellingTest,
109
107
            ('HTTP/1.0',  dict(_protocol_version='HTTP/1.0')),
110
108
            ('HTTP/1.1',  dict(_protocol_version='HTTP/1.1')),
111
109
            ]
112
 
    tp_scenarios = tests.multiply_scenarios(adapter.scenarios,
 
110
    tp_scenarios = tests.multiply_scenarios(transport_scenarios,
113
111
                                            protocol_scenarios)
114
 
    adapter.scenarios = tp_scenarios
115
 
    tests.adapt_tests(tp_tests, adapter, result)
116
 
 
117
 
    # multiplied by one for each authentication scheme
 
112
    tests.multiply_tests(tp_tests, tp_scenarios, result)
 
113
 
 
114
    # proxy auth: each auth scheme on all http versions on all implementations.
 
115
    tppa_tests, remaining_tests = tests.split_suite_by_condition(
 
116
        remaining_tests, tests.condition_isinstance((
 
117
                TestProxyAuth,
 
118
                )))
 
119
    proxy_auth_scheme_scenarios = [
 
120
        ('basic', dict(_auth_server=http_utils.ProxyBasicAuthServer)),
 
121
        ('digest', dict(_auth_server=http_utils.ProxyDigestAuthServer)),
 
122
        ('basicdigest',
 
123
         dict(_auth_server=http_utils.ProxyBasicAndDigestAuthServer)),
 
124
        ]
 
125
    tppa_scenarios = tests.multiply_scenarios(tp_scenarios,
 
126
                                              proxy_auth_scheme_scenarios)
 
127
    tests.multiply_tests(tppa_tests, tppa_scenarios, result)
 
128
 
 
129
    # auth: each auth scheme on all http versions on all implementations.
118
130
    tpa_tests, remaining_tests = tests.split_suite_by_condition(
119
131
        remaining_tests, tests.condition_isinstance((
120
132
                TestAuth,
121
133
                )))
122
134
    auth_scheme_scenarios = [
123
 
        ('basic', dict(_auth_scheme='basic')),
124
 
        ('digest', dict(_auth_scheme='digest')),
 
135
        ('basic', dict(_auth_server=http_utils.HTTPBasicAuthServer)),
 
136
        ('digest', dict(_auth_server=http_utils.HTTPDigestAuthServer)),
 
137
        ('basicdigest',
 
138
         dict(_auth_server=http_utils.HTTPBasicAndDigestAuthServer)),
125
139
        ]
126
 
    adapter.scenarios = tests.multiply_scenarios(adapter.scenarios,
127
 
                                                 auth_scheme_scenarios)
128
 
    tests.adapt_tests(tpa_tests, adapter, result)
 
140
    tpa_scenarios = tests.multiply_scenarios(tp_scenarios,
 
141
                                             auth_scheme_scenarios)
 
142
    tests.multiply_tests(tpa_tests, tpa_scenarios, result)
129
143
 
 
144
    # activity: on all http[s] versions on all implementations
130
145
    tpact_tests, remaining_tests = tests.split_suite_by_condition(
131
146
        remaining_tests, tests.condition_isinstance((
132
147
                TestActivity,
133
148
                )))
134
149
    activity_scenarios = [
135
 
        ('http', dict(_activity_server=ActivityHTTPServer)),
 
150
        ('urllib,http', dict(_activity_server=ActivityHTTPServer,
 
151
                             _transport=_urllib.HttpTransport_urllib,)),
136
152
        ]
137
153
    if tests.HTTPSServerFeature.available():
138
154
        activity_scenarios.append(
139
 
            ('https', dict(_activity_server=ActivityHTTPSServer,)))
140
 
    adapter.scenarios = tests.multiply_scenarios(tp_scenarios,
141
 
                                                 activity_scenarios)
142
 
    tests.adapt_tests(tpact_tests, adapter, result)
 
155
            ('urllib,https', dict(_activity_server=ActivityHTTPSServer,
 
156
                                  _transport=_urllib.HttpTransport_urllib,)),)
 
157
    if features.pycurl.available():
 
158
        activity_scenarios.append(
 
159
            ('pycurl,http', dict(_activity_server=ActivityHTTPServer,
 
160
                                 _transport=PyCurlTransport,)),)
 
161
        if tests.HTTPSServerFeature.available():
 
162
            from bzrlib.tests import (
 
163
                ssl_certs,
 
164
                )
 
165
            # FIXME: Until we have a better way to handle self-signed
 
166
            # certificates (like allowing them in a test specific
 
167
            # authentication.conf for example), we need some specialized pycurl
 
168
            # transport for tests.
 
169
            class HTTPS_pycurl_transport(PyCurlTransport):
 
170
 
 
171
                def __init__(self, base, _from_transport=None):
 
172
                    super(HTTPS_pycurl_transport, self).__init__(
 
173
                        base, _from_transport)
 
174
                    self.cabundle = str(ssl_certs.build_path('ca.crt'))
 
175
 
 
176
            activity_scenarios.append(
 
177
                ('pycurl,https', dict(_activity_server=ActivityHTTPSServer,
 
178
                                      _transport=HTTPS_pycurl_transport,)),)
 
179
 
 
180
    tpact_scenarios = tests.multiply_scenarios(activity_scenarios,
 
181
                                               protocol_scenarios)
 
182
    tests.multiply_tests(tpact_tests, tpact_scenarios, result)
143
183
 
144
184
    # No parametrization for the remaining tests
145
185
    result.addTests(remaining_tests)
158
198
 
159
199
class RecordingServer(object):
160
200
    """A fake HTTP server.
161
 
    
 
201
 
162
202
    It records the bytes sent to it, and replies with a 200.
163
203
    """
164
204
 
165
 
    def __init__(self, expect_body_tail=None):
 
205
    def __init__(self, expect_body_tail=None, scheme=''):
166
206
        """Constructor.
167
207
 
168
208
        :type expect_body_tail: str
173
213
        self.host = None
174
214
        self.port = None
175
215
        self.received_bytes = ''
176
 
 
177
 
    def setUp(self):
 
216
        self.scheme = scheme
 
217
 
 
218
    def get_url(self):
 
219
        return '%s://%s:%s/' % (self.scheme, self.host, self.port)
 
220
 
 
221
    def start_server(self):
178
222
        self._sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
179
223
        self._sock.bind(('127.0.0.1', 0))
180
224
        self.host, self.port = self._sock.getsockname()
203
247
            # The client may have already closed the socket.
204
248
            pass
205
249
 
206
 
    def tearDown(self):
 
250
    def stop_server(self):
207
251
        try:
208
252
            self._sock.close()
209
253
        except socket.error:
213
257
        self.port = None
214
258
 
215
259
 
 
260
class TestAuthHeader(tests.TestCase):
 
261
 
 
262
    def parse_header(self, header, auth_handler_class=None):
 
263
        if auth_handler_class is None:
 
264
            auth_handler_class = _urllib2_wrappers.AbstractAuthHandler
 
265
        self.auth_handler =  auth_handler_class()
 
266
        return self.auth_handler._parse_auth_header(header)
 
267
 
 
268
    def test_empty_header(self):
 
269
        scheme, remainder = self.parse_header('')
 
270
        self.assertEqual('', scheme)
 
271
        self.assertIs(None, remainder)
 
272
 
 
273
    def test_negotiate_header(self):
 
274
        scheme, remainder = self.parse_header('Negotiate')
 
275
        self.assertEqual('negotiate', scheme)
 
276
        self.assertIs(None, remainder)
 
277
 
 
278
    def test_basic_header(self):
 
279
        scheme, remainder = self.parse_header(
 
280
            'Basic realm="Thou should not pass"')
 
281
        self.assertEqual('basic', scheme)
 
282
        self.assertEqual('realm="Thou should not pass"', remainder)
 
283
 
 
284
    def test_basic_extract_realm(self):
 
285
        scheme, remainder = self.parse_header(
 
286
            'Basic realm="Thou should not pass"',
 
287
            _urllib2_wrappers.BasicAuthHandler)
 
288
        match, realm = self.auth_handler.extract_realm(remainder)
 
289
        self.assertTrue(match is not None)
 
290
        self.assertEqual('Thou should not pass', realm)
 
291
 
 
292
    def test_digest_header(self):
 
293
        scheme, remainder = self.parse_header(
 
294
            'Digest realm="Thou should not pass"')
 
295
        self.assertEqual('digest', scheme)
 
296
        self.assertEqual('realm="Thou should not pass"', remainder)
 
297
 
 
298
 
216
299
class TestHTTPServer(tests.TestCase):
217
300
    """Test the HTTP servers implementations."""
218
301
 
223
306
 
224
307
        server = http_server.HttpServer(BogusRequestHandler)
225
308
        try:
226
 
            self.assertRaises(httplib.UnknownProtocol,server.setUp)
 
309
            self.assertRaises(httplib.UnknownProtocol, server.start_server)
227
310
        except:
228
 
            server.tearDown()
 
311
            server.stop_server()
229
312
            self.fail('HTTP Server creation did not raise UnknownProtocol')
230
313
 
231
314
    def test_force_invalid_protocol(self):
232
315
        server = http_server.HttpServer(protocol_version='HTTP/0.1')
233
316
        try:
234
 
            self.assertRaises(httplib.UnknownProtocol,server.setUp)
 
317
            self.assertRaises(httplib.UnknownProtocol, server.start_server)
235
318
        except:
236
 
            server.tearDown()
 
319
            server.stop_server()
237
320
            self.fail('HTTP Server creation did not raise UnknownProtocol')
238
321
 
239
322
    def test_server_start_and_stop(self):
240
323
        server = http_server.HttpServer()
241
 
        server.setUp()
242
 
        self.assertTrue(server._http_running)
243
 
        server.tearDown()
 
324
        server.start_server()
 
325
        try:
 
326
            self.assertTrue(server._http_running)
 
327
        finally:
 
328
            server.stop_server()
244
329
        self.assertFalse(server._http_running)
245
330
 
246
331
    def test_create_http_server_one_zero(self):
249
334
            protocol_version = 'HTTP/1.0'
250
335
 
251
336
        server = http_server.HttpServer(RequestHandlerOneZero)
252
 
        server.setUp()
253
 
        self.addCleanup(server.tearDown)
 
337
        self.start_server(server)
254
338
        self.assertIsInstance(server._httpd, http_server.TestingHTTPServer)
255
339
 
256
340
    def test_create_http_server_one_one(self):
259
343
            protocol_version = 'HTTP/1.1'
260
344
 
261
345
        server = http_server.HttpServer(RequestHandlerOneOne)
262
 
        server.setUp()
263
 
        self.addCleanup(server.tearDown)
 
346
        self.start_server(server)
264
347
        self.assertIsInstance(server._httpd,
265
348
                              http_server.TestingThreadingHTTPServer)
266
349
 
271
354
 
272
355
        server = http_server.HttpServer(RequestHandlerOneZero,
273
356
                                        protocol_version='HTTP/1.1')
274
 
        server.setUp()
275
 
        self.addCleanup(server.tearDown)
 
357
        self.start_server(server)
276
358
        self.assertIsInstance(server._httpd,
277
359
                              http_server.TestingThreadingHTTPServer)
278
360
 
283
365
 
284
366
        server = http_server.HttpServer(RequestHandlerOneOne,
285
367
                                        protocol_version='HTTP/1.0')
286
 
        server.setUp()
287
 
        self.addCleanup(server.tearDown)
 
368
        self.start_server(server)
288
369
        self.assertIsInstance(server._httpd,
289
370
                              http_server.TestingHTTPServer)
290
371
 
293
374
    """Test case to inherit from if pycurl is present"""
294
375
 
295
376
    def _get_pycurl_maybe(self):
296
 
        try:
297
 
            from bzrlib.transport.http._pycurl import PyCurlTransport
298
 
            return PyCurlTransport
299
 
        except errors.DependencyNotPresent:
300
 
            raise tests.TestSkipped('pycurl not present')
 
377
        self.requireFeature(features.pycurl)
 
378
        return PyCurlTransport
301
379
 
302
380
    _transport = property(_get_pycurl_maybe)
303
381
 
310
388
    def test_url_parsing(self):
311
389
        f = FakeManager()
312
390
        url = http.extract_auth('http://example.com', f)
313
 
        self.assertEquals('http://example.com', url)
314
 
        self.assertEquals(0, len(f.credentials))
 
391
        self.assertEqual('http://example.com', url)
 
392
        self.assertEqual(0, len(f.credentials))
315
393
        url = http.extract_auth(
316
 
            'http://user:pass@www.bazaar-vcs.org/bzr/bzr.dev', f)
317
 
        self.assertEquals('http://www.bazaar-vcs.org/bzr/bzr.dev', url)
318
 
        self.assertEquals(1, len(f.credentials))
319
 
        self.assertEquals([None, 'www.bazaar-vcs.org', 'user', 'pass'],
320
 
                          f.credentials[0])
 
394
            'http://user:pass@example.com/bzr/bzr.dev', f)
 
395
        self.assertEqual('http://example.com/bzr/bzr.dev', url)
 
396
        self.assertEqual(1, len(f.credentials))
 
397
        self.assertEqual([None, 'example.com', 'user', 'pass'],
 
398
                         f.credentials[0])
321
399
 
322
400
 
323
401
class TestHttpTransportUrls(tests.TestCase):
350
428
    def test_http_impl_urls(self):
351
429
        """There are servers which ask for particular clients to connect"""
352
430
        server = self._server()
 
431
        server.start_server()
353
432
        try:
354
 
            server.setUp()
355
433
            url = server.get_url()
356
434
            self.assertTrue(url.startswith('%s://' % self._qualified_prefix))
357
435
        finally:
358
 
            server.tearDown()
 
436
            server.stop_server()
359
437
 
360
438
 
361
439
class TestHttps_pycurl(TestWithTransport_pycurl, tests.TestCase):
370
448
        https by supplying a fake version_info that do not
371
449
        support it.
372
450
        """
373
 
        try:
374
 
            import pycurl
375
 
        except ImportError:
376
 
            raise tests.TestSkipped('pycurl not present')
 
451
        self.requireFeature(features.pycurl)
 
452
        # Import the module locally now that we now it's available.
 
453
        pycurl = features.pycurl.module
377
454
 
378
 
        version_info_orig = pycurl.version_info
379
 
        try:
380
 
            # Now that we have pycurl imported, we can fake its version_info
381
 
            # This was taken from a windows pycurl without SSL
382
 
            # (thanks to bialix)
383
 
            pycurl.version_info = lambda : (2,
384
 
                                            '7.13.2',
385
 
                                            462082,
386
 
                                            'i386-pc-win32',
387
 
                                            2576,
388
 
                                            None,
389
 
                                            0,
390
 
                                            None,
391
 
                                            ('ftp', 'gopher', 'telnet',
392
 
                                             'dict', 'ldap', 'http', 'file'),
393
 
                                            None,
394
 
                                            0,
395
 
                                            None)
396
 
            self.assertRaises(errors.DependencyNotPresent, self._transport,
397
 
                              'https://launchpad.net')
398
 
        finally:
399
 
            # Restore the right function
400
 
            pycurl.version_info = version_info_orig
 
455
        self.overrideAttr(pycurl, 'version_info',
 
456
                          # Fake the pycurl version_info This was taken from
 
457
                          # a windows pycurl without SSL (thanks to bialix)
 
458
                          lambda : (2,
 
459
                                    '7.13.2',
 
460
                                    462082,
 
461
                                    'i386-pc-win32',
 
462
                                    2576,
 
463
                                    None,
 
464
                                    0,
 
465
                                    None,
 
466
                                    ('ftp', 'gopher', 'telnet',
 
467
                                     'dict', 'ldap', 'http', 'file'),
 
468
                                    None,
 
469
                                    0,
 
470
                                    None))
 
471
        self.assertRaises(errors.DependencyNotPresent, self._transport,
 
472
                          'https://launchpad.net')
401
473
 
402
474
 
403
475
class TestHTTPConnections(http_utils.TestCaseWithWebserver):
462
534
class TestPost(tests.TestCase):
463
535
 
464
536
    def test_post_body_is_received(self):
465
 
        server = RecordingServer(expect_body_tail='end-of-body')
466
 
        server.setUp()
467
 
        self.addCleanup(server.tearDown)
468
 
        scheme = self._qualified_prefix
469
 
        url = '%s://%s:%s/' % (scheme, server.host, server.port)
 
537
        server = RecordingServer(expect_body_tail='end-of-body',
 
538
            scheme=self._qualified_prefix)
 
539
        self.start_server(server)
 
540
        url = server.get_url()
470
541
        http_transport = self._transport(url)
471
542
        code, response = http_transport._post('abc def end-of-body')
472
543
        self.assertTrue(
521
592
                                      protocol_version=self._protocol_version)
522
593
 
523
594
    def _testing_pycurl(self):
524
 
        return pycurl_present and self._transport == PyCurlTransport
 
595
        # TODO: This is duplicated for lots of the classes in this file
 
596
        return (features.pycurl.available()
 
597
                and self._transport == PyCurlTransport)
525
598
 
526
599
 
527
600
class WallRequestHandler(http_server.TestingHTTPRequestHandler):
544
617
        # for details) make no distinction between a closed
545
618
        # socket and badly formatted status line, so we can't
546
619
        # just test for ConnectionError, we have to test
547
 
        # InvalidHttpResponse too.
548
 
        self.assertRaises((errors.ConnectionError, errors.InvalidHttpResponse),
 
620
        # InvalidHttpResponse too. And pycurl may raise ConnectionReset
 
621
        # instead of ConnectionError too.
 
622
        self.assertRaises(( errors.ConnectionError, errors.ConnectionReset,
 
623
                            errors.InvalidHttpResponse),
549
624
                          t.has, 'foo/bar')
550
625
 
551
626
    def test_http_get(self):
552
627
        server = self.get_readonly_server()
553
628
        t = self._transport(server.get_url())
554
 
        self.assertRaises((errors.ConnectionError, errors.InvalidHttpResponse),
 
629
        self.assertRaises((errors.ConnectionError, errors.ConnectionReset,
 
630
                           errors.InvalidHttpResponse),
555
631
                          t.get, 'foo/bar')
556
632
 
557
633
 
633
709
    _req_handler_class = BadProtocolRequestHandler
634
710
 
635
711
    def setUp(self):
636
 
        if pycurl_present and self._transport == PyCurlTransport:
 
712
        if self._testing_pycurl():
637
713
            raise tests.TestNotApplicable(
638
714
                "pycurl doesn't check the protocol version")
639
715
        super(TestBadProtocolServer, self).setUp()
683
759
        self.assertEqual(None, server.host)
684
760
        self.assertEqual(None, server.port)
685
761
 
686
 
    def test_setUp_and_tearDown(self):
 
762
    def test_setUp_and_stop(self):
687
763
        server = RecordingServer(expect_body_tail=None)
688
 
        server.setUp()
 
764
        server.start_server()
689
765
        try:
690
766
            self.assertNotEqual(None, server.host)
691
767
            self.assertNotEqual(None, server.port)
692
768
        finally:
693
 
            server.tearDown()
 
769
            server.stop_server()
694
770
        self.assertEqual(None, server.host)
695
771
        self.assertEqual(None, server.port)
696
772
 
697
773
    def test_send_receive_bytes(self):
698
 
        server = RecordingServer(expect_body_tail='c')
699
 
        server.setUp()
700
 
        self.addCleanup(server.tearDown)
 
774
        server = RecordingServer(expect_body_tail='c', scheme='http')
 
775
        self.start_server(server)
701
776
        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
702
777
        sock.connect((server.host, server.port))
703
778
        sock.sendall('abc')
797
872
        # bytes on the socket
798
873
        ireadv = iter(t.readv('a', ((0, 1), (1, 1), (2, 4), (6, 4))))
799
874
        self.assertEqual((0, '0'), ireadv.next())
800
 
        # The server should have issued one request so far 
 
875
        # The server should have issued one request so far
801
876
        self.assertEqual(1, server.GET_request_nb)
802
877
        self.assertEqual('0123456789', t.get_bytes('a'))
803
878
        # get_bytes issued an additional request, the readv pending ones are
1094
1169
        if self._testing_pycurl():
1095
1170
            # Oh my ! pycurl does not check for the port as part of
1096
1171
            # no_proxy :-( So we just test the host part
1097
 
            self.no_proxy_host = 'localhost'
 
1172
            self.no_proxy_host = self.server.host
1098
1173
        else:
1099
1174
            self.no_proxy_host = self.proxy_address
1100
1175
        # The secondary server is the proxy
1103
1178
        self._old_env = {}
1104
1179
 
1105
1180
    def _testing_pycurl(self):
1106
 
        return pycurl_present and self._transport == PyCurlTransport
 
1181
        # TODO: This is duplicated for lots of the classes in this file
 
1182
        return (features.pycurl.available()
 
1183
                and self._transport == PyCurlTransport)
1107
1184
 
1108
1185
    def create_transport_secondary_server(self):
1109
1186
        """Creates an http server that will serve files with
1260
1337
    def test_read_redirected_bundle_from_url(self):
1261
1338
        from bzrlib.bundle import read_bundle_from_url
1262
1339
        url = self.old_transport.abspath('bundle')
1263
 
        bundle = read_bundle_from_url(url)
 
1340
        bundle = self.applyDeprecated(deprecated_in((1, 12, 0)),
 
1341
                read_bundle_from_url, url)
1264
1342
        # If read_bundle_from_url was successful we get an empty bundle
1265
1343
        self.assertEqual([], bundle.revisions)
1266
1344
 
1277
1355
        # Since the tests using this class will replace
1278
1356
        # _urllib2_wrappers.Request, we can't just call the base class __init__
1279
1357
        # or we'll loop.
1280
 
        RedirectedRequest.init_orig(self, method, url, args, kwargs)
 
1358
        RedirectedRequest.init_orig(self, method, url, *args, **kwargs)
1281
1359
        self.follow_redirections = True
1282
1360
 
1283
1361
 
 
1362
def install_redirected_request(test):
 
1363
    test.overrideAttr(_urllib2_wrappers, 'Request', RedirectedRequest)
 
1364
 
 
1365
 
1284
1366
class TestHTTPSilentRedirections(http_utils.TestCaseWithRedirectedWebserver):
1285
1367
    """Test redirections.
1286
1368
 
1296
1378
    """
1297
1379
 
1298
1380
    def setUp(self):
1299
 
        if pycurl_present and self._transport == PyCurlTransport:
 
1381
        if (features.pycurl.available()
 
1382
            and self._transport == PyCurlTransport):
1300
1383
            raise tests.TestNotApplicable(
1301
1384
                "pycurl doesn't redirect silently annymore")
1302
1385
        super(TestHTTPSilentRedirections, self).setUp()
1303
 
        self.setup_redirected_request()
1304
 
        self.addCleanup(self.cleanup_redirected_request)
 
1386
        install_redirected_request(self)
1305
1387
        self.build_tree_contents([('a','a'),
1306
1388
                                  ('1/',),
1307
1389
                                  ('1/a', 'redirected once'),
1317
1399
 
1318
1400
        self.old_transport = self._transport(self.old_server.get_url())
1319
1401
 
1320
 
    def setup_redirected_request(self):
1321
 
        self.original_class = _urllib2_wrappers.Request
1322
 
        _urllib2_wrappers.Request = RedirectedRequest
1323
 
 
1324
 
    def cleanup_redirected_request(self):
1325
 
        _urllib2_wrappers.Request = self.original_class
1326
 
 
1327
1402
    def create_transport_secondary_server(self):
1328
1403
        """Create the secondary server, redirections are defined in the tests"""
1329
1404
        return http_utils.HTTPServerRedirecting(
1333
1408
        t = self.old_transport
1334
1409
 
1335
1410
        req = RedirectedRequest('GET', t.abspath('a'))
1336
 
        req.follow_redirections = True
1337
1411
        new_prefix = 'http://%s:%s' % (self.new_server.host,
1338
1412
                                       self.new_server.port)
1339
1413
        self.old_server.redirections = \
1340
1414
            [('(.*)', r'%s/1\1' % (new_prefix), 301),]
1341
 
        self.assertEquals('redirected once',t._perform(req).read())
 
1415
        self.assertEqual('redirected once',t._perform(req).read())
1342
1416
 
1343
1417
    def test_five_redirections(self):
1344
1418
        t = self.old_transport
1345
1419
 
1346
1420
        req = RedirectedRequest('GET', t.abspath('a'))
1347
 
        req.follow_redirections = True
1348
1421
        old_prefix = 'http://%s:%s' % (self.old_server.host,
1349
1422
                                       self.old_server.port)
1350
1423
        new_prefix = 'http://%s:%s' % (self.new_server.host,
1356
1429
            ('/4(.*)', r'%s/5\1' % (new_prefix), 301),
1357
1430
            ('(/[^/]+)', r'%s/1\1' % (old_prefix), 301),
1358
1431
            ]
1359
 
        self.assertEquals('redirected 5 times',t._perform(req).read())
 
1432
        self.assertEqual('redirected 5 times',t._perform(req).read())
1360
1433
 
1361
1434
 
1362
1435
class TestDoCatchRedirections(http_utils.TestCaseWithRedirectedWebserver):
1375
1448
        t = self._transport(self.new_server.get_url())
1376
1449
 
1377
1450
        # We use None for redirected so that we fail if redirected
1378
 
        self.assertEquals('0123456789',
1379
 
                          transport.do_catching_redirections(
 
1451
        self.assertEqual('0123456789',
 
1452
                         transport.do_catching_redirections(
1380
1453
                self.get_a, t, None).read())
1381
1454
 
1382
1455
    def test_one_redirection(self):
1387
1460
            dir, file = urlutils.split(exception.target)
1388
1461
            return self._transport(dir)
1389
1462
 
1390
 
        self.assertEquals('0123456789',
1391
 
                          transport.do_catching_redirections(
 
1463
        self.assertEqual('0123456789',
 
1464
                         transport.do_catching_redirections(
1392
1465
                self.get_a, self.old_transport, redirected).read())
1393
 
        self.assertEquals(1, self.redirections)
 
1466
        self.assertEqual(1, self.redirections)
1394
1467
 
1395
1468
    def test_redirection_loop(self):
1396
1469
 
1410
1483
 
1411
1484
    _auth_header = 'Authorization'
1412
1485
    _password_prompt_prefix = ''
 
1486
    _username_prompt_prefix = ''
 
1487
    # Set by load_tests
 
1488
    _auth_server = None
1413
1489
 
1414
1490
    def setUp(self):
1415
1491
        super(TestAuth, self).setUp()
1418
1494
                                  ('b', 'contents of b\n'),])
1419
1495
 
1420
1496
    def create_transport_readonly_server(self):
1421
 
        if self._auth_scheme == 'basic':
1422
 
            server = http_utils.HTTPBasicAuthServer(
1423
 
                protocol_version=self._protocol_version)
1424
 
        else:
1425
 
            if self._auth_scheme != 'digest':
1426
 
                raise AssertionError('Unknown auth scheme: %r'
1427
 
                                     % self._auth_scheme)
1428
 
            server = http_utils.HTTPDigestAuthServer(
1429
 
                protocol_version=self._protocol_version)
1430
 
        return server
 
1497
        return self._auth_server(protocol_version=self._protocol_version)
1431
1498
 
1432
1499
    def _testing_pycurl(self):
1433
 
        return pycurl_present and self._transport == PyCurlTransport
 
1500
        # TODO: This is duplicated for lots of the classes in this file
 
1501
        return (features.pycurl.available()
 
1502
                and self._transport == PyCurlTransport)
1434
1503
 
1435
1504
    def get_user_url(self, user, password):
1436
1505
        """Build an url embedding user and password"""
1484
1553
        # initial 'who are you' and 'this is not you, who are you')
1485
1554
        self.assertEqual(2, self.server.auth_required_errors)
1486
1555
 
 
1556
    def test_prompt_for_username(self):
 
1557
        if self._testing_pycurl():
 
1558
            raise tests.TestNotApplicable(
 
1559
                'pycurl cannot prompt, it handles auth by embedding'
 
1560
                ' user:pass in urls only')
 
1561
 
 
1562
        self.server.add_user('joe', 'foo')
 
1563
        t = self.get_user_transport(None, None)
 
1564
        stdout = tests.StringIOWrapper()
 
1565
        stderr = tests.StringIOWrapper()
 
1566
        ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n',
 
1567
                                            stdout=stdout, stderr=stderr)
 
1568
        self.assertEqual('contents of a\n',t.get('a').read())
 
1569
        # stdin should be empty
 
1570
        self.assertEqual('', ui.ui_factory.stdin.readline())
 
1571
        stderr.seek(0)
 
1572
        expected_prompt = self._expected_username_prompt(t._unqualified_scheme)
 
1573
        self.assertEqual(expected_prompt, stderr.read(len(expected_prompt)))
 
1574
        self.assertEqual('', stdout.getvalue())
 
1575
        self._check_password_prompt(t._unqualified_scheme, 'joe',
 
1576
                                    stderr.readline())
 
1577
 
1487
1578
    def test_prompt_for_password(self):
1488
1579
        if self._testing_pycurl():
1489
1580
            raise tests.TestNotApplicable(
1493
1584
        self.server.add_user('joe', 'foo')
1494
1585
        t = self.get_user_transport('joe', None)
1495
1586
        stdout = tests.StringIOWrapper()
1496
 
        ui.ui_factory = tests.TestUIFactory(stdin='foo\n', stdout=stdout)
1497
 
        self.assertEqual('contents of a\n',t.get('a').read())
 
1587
        stderr = tests.StringIOWrapper()
 
1588
        ui.ui_factory = tests.TestUIFactory(stdin='foo\n',
 
1589
                                            stdout=stdout, stderr=stderr)
 
1590
        self.assertEqual('contents of a\n', t.get('a').read())
1498
1591
        # stdin should be empty
1499
1592
        self.assertEqual('', ui.ui_factory.stdin.readline())
1500
1593
        self._check_password_prompt(t._unqualified_scheme, 'joe',
1501
 
                                    stdout.getvalue())
 
1594
                                    stderr.getvalue())
 
1595
        self.assertEqual('', stdout.getvalue())
1502
1596
        # And we shouldn't prompt again for a different request
1503
1597
        # against the same transport.
1504
1598
        self.assertEqual('contents of b\n',t.get('b').read())
1514
1608
                              % (scheme.upper(),
1515
1609
                                 user, self.server.host, self.server.port,
1516
1610
                                 self.server.auth_realm)))
1517
 
        self.assertEquals(expected_prompt, actual_prompt)
 
1611
        self.assertEqual(expected_prompt, actual_prompt)
 
1612
 
 
1613
    def _expected_username_prompt(self, scheme):
 
1614
        return (self._username_prompt_prefix
 
1615
                + "%s %s:%d, Realm: '%s' username: " % (scheme.upper(),
 
1616
                                 self.server.host, self.server.port,
 
1617
                                 self.server.auth_realm))
1518
1618
 
1519
1619
    def test_no_prompt_for_password_when_using_auth_config(self):
1520
1620
        if self._testing_pycurl():
1528
1628
        self.server.add_user(user, password)
1529
1629
        t = self.get_user_transport(user, None)
1530
1630
        ui.ui_factory = tests.TestUIFactory(stdin=stdin_content,
1531
 
                                            stdout=tests.StringIOWrapper())
 
1631
                                            stderr=tests.StringIOWrapper())
1532
1632
        # Create a minimal config file with the right password
1533
1633
        conf = config.AuthenticationConfig()
1534
1634
        conf._get_config().update(
1562
1662
        self.assertEqual(1, self.server.auth_required_errors)
1563
1663
 
1564
1664
    def test_changing_nonce(self):
1565
 
        if self._auth_scheme != 'digest':
1566
 
            raise tests.TestNotApplicable('HTTP auth digest only test')
 
1665
        if self._auth_server not in (http_utils.HTTPDigestAuthServer,
 
1666
                                     http_utils.ProxyDigestAuthServer):
 
1667
            raise tests.TestNotApplicable('HTTP/proxy auth digest only test')
1567
1668
        if self._testing_pycurl():
1568
1669
            raise tests.KnownFailure(
1569
1670
                'pycurl does not handle a nonce change')
1587
1688
    """Test proxy authentication schemes."""
1588
1689
 
1589
1690
    _auth_header = 'Proxy-authorization'
1590
 
    _password_prompt_prefix='Proxy '
 
1691
    _password_prompt_prefix = 'Proxy '
 
1692
    _username_prompt_prefix = 'Proxy '
1591
1693
 
1592
1694
    def setUp(self):
1593
1695
        super(TestProxyAuth, self).setUp()
1600
1702
                                  ('b-proxied', 'contents of b\n'),
1601
1703
                                  ])
1602
1704
 
1603
 
    def create_transport_readonly_server(self):
1604
 
        if self._auth_scheme == 'basic':
1605
 
            server = http_utils.ProxyBasicAuthServer(
1606
 
                protocol_version=self._protocol_version)
1607
 
        else:
1608
 
            if self._auth_scheme != 'digest':
1609
 
                raise AssertionError('Unknown auth scheme: %r'
1610
 
                                     % self._auth_scheme)
1611
 
            server = http_utils.ProxyDigestAuthServer(
1612
 
                protocol_version=self._protocol_version)
1613
 
        return server
1614
 
 
1615
1705
    def get_user_transport(self, user, password):
1616
1706
        self._install_env({'all_proxy': self.get_user_url(user, password)})
1617
1707
        return self._transport(self.server.get_url())
1756
1846
                             'http://www.example.com/foo/subdir')
1757
1847
        self.assertIsInstance(r, type(t))
1758
1848
        # Both transports share the some connection
1759
 
        self.assertEquals(t._get_connection(), r._get_connection())
 
1849
        self.assertEqual(t._get_connection(), r._get_connection())
1760
1850
 
1761
1851
    def test_redirected_to_self_with_slash(self):
1762
1852
        t = self._transport('http://www.example.com/foo')
1766
1856
        # Both transports share the some connection (one can argue that we
1767
1857
        # should return the exact same transport here, but that seems
1768
1858
        # overkill).
1769
 
        self.assertEquals(t._get_connection(), r._get_connection())
 
1859
        self.assertEqual(t._get_connection(), r._get_connection())
1770
1860
 
1771
1861
    def test_redirected_to_host(self):
1772
1862
        t = self._transport('http://www.example.com/foo')
1791
1881
        r = t._redirected_to('http://www.example.com/foo',
1792
1882
                             'https://foo.example.com/foo')
1793
1883
        self.assertIsInstance(r, type(t))
1794
 
        self.assertEquals(t._user, r._user)
 
1884
        self.assertEqual(t._user, r._user)
1795
1885
 
1796
1886
 
1797
1887
class PredefinedRequestHandler(http_server.TestingHTTPRequestHandler):
1856
1946
        pass
1857
1947
 
1858
1948
 
1859
 
class TestActivity(tests.TestCase):
 
1949
class TestActivityMixin(object):
1860
1950
    """Test socket activity reporting.
1861
1951
 
1862
1952
    We use a special purpose server to control the bytes sent and received and
1866
1956
    def setUp(self):
1867
1957
        tests.TestCase.setUp(self)
1868
1958
        self.server = self._activity_server(self._protocol_version)
1869
 
        self.server.setUp()
 
1959
        self.server.start_server()
1870
1960
        self.activities = {}
1871
1961
        def report_activity(t, bytes, direction):
1872
1962
            count = self.activities.get(direction, 0)
1875
1965
 
1876
1966
        # We override at class level because constructors may propagate the
1877
1967
        # bound method and render instance overriding ineffective (an
1878
 
        # alternative would be be to define a specific ui factory instead...)
 
1968
        # alternative would be to define a specific ui factory instead...)
1879
1969
        self.orig_report_activity = self._transport._report_activity
1880
1970
        self._transport._report_activity = report_activity
1881
1971
 
1882
1972
    def tearDown(self):
1883
1973
        self._transport._report_activity = self.orig_report_activity
1884
 
        self.server.tearDown()
 
1974
        self.server.stop_server()
1885
1975
        tests.TestCase.tearDown(self)
1886
1976
 
1887
1977
    def get_transport(self):
2000
2090
        code, f = t._post('abc def end-of-body\n')
2001
2091
        self.assertEqual('lalala whatever as long as itsssss\n', f.read())
2002
2092
        self.assertActivitiesMatch()
 
2093
 
 
2094
 
 
2095
class TestActivity(tests.TestCase, TestActivityMixin):
 
2096
 
 
2097
    def setUp(self):
 
2098
        tests.TestCase.setUp(self)
 
2099
        self.server = self._activity_server(self._protocol_version)
 
2100
        self.server.start_server()
 
2101
        self.activities = {}
 
2102
        def report_activity(t, bytes, direction):
 
2103
            count = self.activities.get(direction, 0)
 
2104
            count += bytes
 
2105
            self.activities[direction] = count
 
2106
 
 
2107
        # We override at class level because constructors may propagate the
 
2108
        # bound method and render instance overriding ineffective (an
 
2109
        # alternative would be to define a specific ui factory instead...)
 
2110
        self.orig_report_activity = self._transport._report_activity
 
2111
        self._transport._report_activity = report_activity
 
2112
 
 
2113
    def tearDown(self):
 
2114
        self._transport._report_activity = self.orig_report_activity
 
2115
        self.server.stop_server()
 
2116
        tests.TestCase.tearDown(self)
 
2117
 
 
2118
 
 
2119
class TestNoReportActivity(tests.TestCase, TestActivityMixin):
 
2120
 
 
2121
    def setUp(self):
 
2122
        tests.TestCase.setUp(self)
 
2123
        # Unlike TestActivity, we are really testing ReportingFileSocket and
 
2124
        # ReportingSocket, so we don't need all the parametrization. Since
 
2125
        # ReportingFileSocket and ReportingSocket are wrappers, it's easier to
 
2126
        # test them through their use by the transport than directly (that's a
 
2127
        # bit less clean but far more simpler and effective).
 
2128
        self.server = ActivityHTTPServer('HTTP/1.1')
 
2129
        self._transport=_urllib.HttpTransport_urllib
 
2130
 
 
2131
        self.server.start_server()
 
2132
 
 
2133
        # We override at class level because constructors may propagate the
 
2134
        # bound method and render instance overriding ineffective (an
 
2135
        # alternative would be to define a specific ui factory instead...)
 
2136
        self.orig_report_activity = self._transport._report_activity
 
2137
        self._transport._report_activity = None
 
2138
 
 
2139
    def tearDown(self):
 
2140
        self._transport._report_activity = self.orig_report_activity
 
2141
        self.server.stop_server()
 
2142
        tests.TestCase.tearDown(self)
 
2143
 
 
2144
    def assertActivitiesMatch(self):
 
2145
        # Nothing to check here
 
2146
        pass
 
2147
 
 
2148
 
 
2149
class TestAuthOnRedirected(http_utils.TestCaseWithRedirectedWebserver):
 
2150
    """Test authentication on the redirected http server."""
 
2151
 
 
2152
    _auth_header = 'Authorization'
 
2153
    _password_prompt_prefix = ''
 
2154
    _username_prompt_prefix = ''
 
2155
    _auth_server = http_utils.HTTPBasicAuthServer
 
2156
    _transport = _urllib.HttpTransport_urllib
 
2157
 
 
2158
    def create_transport_readonly_server(self):
 
2159
        return self._auth_server()
 
2160
 
 
2161
    def create_transport_secondary_server(self):
 
2162
        """Create the secondary server redirecting to the primary server"""
 
2163
        new = self.get_readonly_server()
 
2164
 
 
2165
        redirecting = http_utils.HTTPServerRedirecting()
 
2166
        redirecting.redirect_to(new.host, new.port)
 
2167
        return redirecting
 
2168
 
 
2169
    def setUp(self):
 
2170
        super(TestAuthOnRedirected, self).setUp()
 
2171
        self.build_tree_contents([('a','a'),
 
2172
                                  ('1/',),
 
2173
                                  ('1/a', 'redirected once'),
 
2174
                                  ],)
 
2175
        new_prefix = 'http://%s:%s' % (self.new_server.host,
 
2176
                                       self.new_server.port)
 
2177
        self.old_server.redirections = [
 
2178
            ('(.*)', r'%s/1\1' % (new_prefix), 301),]
 
2179
        self.old_transport = self._transport(self.old_server.get_url())
 
2180
        self.new_server.add_user('joe', 'foo')
 
2181
 
 
2182
    def get_a(self, transport):
 
2183
        return transport.get('a')
 
2184
 
 
2185
    def test_auth_on_redirected_via_do_catching_redirections(self):
 
2186
        self.redirections = 0
 
2187
 
 
2188
        def redirected(transport, exception, redirection_notice):
 
2189
            self.redirections += 1
 
2190
            dir, file = urlutils.split(exception.target)
 
2191
            return self._transport(dir)
 
2192
 
 
2193
        stdout = tests.StringIOWrapper()
 
2194
        stderr = tests.StringIOWrapper()
 
2195
        ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n',
 
2196
                                            stdout=stdout, stderr=stderr)
 
2197
        self.assertEqual('redirected once',
 
2198
                         transport.do_catching_redirections(
 
2199
                self.get_a, self.old_transport, redirected).read())
 
2200
        self.assertEqual(1, self.redirections)
 
2201
        # stdin should be empty
 
2202
        self.assertEqual('', ui.ui_factory.stdin.readline())
 
2203
        # stdout should be empty, stderr will contains the prompts
 
2204
        self.assertEqual('', stdout.getvalue())
 
2205
 
 
2206
    def test_auth_on_redirected_via_following_redirections(self):
 
2207
        self.new_server.add_user('joe', 'foo')
 
2208
        stdout = tests.StringIOWrapper()
 
2209
        stderr = tests.StringIOWrapper()
 
2210
        ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n',
 
2211
                                            stdout=stdout, stderr=stderr)
 
2212
        t = self.old_transport
 
2213
        req = RedirectedRequest('GET', t.abspath('a'))
 
2214
        new_prefix = 'http://%s:%s' % (self.new_server.host,
 
2215
                                       self.new_server.port)
 
2216
        self.old_server.redirections = [
 
2217
            ('(.*)', r'%s/1\1' % (new_prefix), 301),]
 
2218
        self.assertEqual('redirected once',t._perform(req).read())
 
2219
        # stdin should be empty
 
2220
        self.assertEqual('', ui.ui_factory.stdin.readline())
 
2221
        # stdout should be empty, stderr will contains the prompts
 
2222
        self.assertEqual('', stdout.getvalue())
 
2223
 
 
2224