← 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: Gary van der Merwe
  • Date: 2010-08-02 19:56:52 UTC
  • mfrom: (5050.3.18 2.2)
  • mto: (5050.3.19 2.2)
  • mto: This revision was merged to the branch mainline in revision 5371.
  • Revision ID: garyvdm@gmail.com-20100802195652-o1ppjemhwrr98i61
Merge lp:bzr/2.2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_http.py
1
 
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2005-2010 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
48
48
    deprecated_in,
49
49
    )
50
50
from bzrlib.tests import (
 
51
    features,
51
52
    http_server,
52
53
    http_utils,
53
54
    )
61
62
    )
62
63
 
63
64
 
64
 
try:
 
65
if features.pycurl.available():
65
66
    from bzrlib.transport.http._pycurl import PyCurlTransport
66
 
    pycurl_present = True
67
 
except errors.DependencyNotPresent:
68
 
    pycurl_present = False
69
67
 
70
68
 
71
69
def load_tests(standard_tests, module, loader):
84
82
                        _server=http_server.HttpServer_urllib,
85
83
                        _qualified_prefix='http+urllib',)),
86
84
        ]
87
 
    if pycurl_present:
 
85
    if features.pycurl.available():
88
86
        transport_scenarios.append(
89
87
            ('pycurl', dict(_transport=PyCurlTransport,
90
88
                            _server=http_server.HttpServer_PyCurl,
91
89
                            _qualified_prefix='http+pycurl',)))
92
90
    tests.multiply_tests(t_tests, transport_scenarios, result)
93
91
 
 
92
    protocol_scenarios = [
 
93
            ('HTTP/1.0',  dict(_protocol_version='HTTP/1.0')),
 
94
            ('HTTP/1.1',  dict(_protocol_version='HTTP/1.1')),
 
95
            ]
 
96
 
 
97
    # some tests are parametrized by the protocol version only
 
98
    p_tests, remaining_tests = tests.split_suite_by_condition(
 
99
        remaining_tests, tests.condition_isinstance((
 
100
                TestAuthOnRedirected,
 
101
                )))
 
102
    tests.multiply_tests(p_tests, protocol_scenarios, result)
 
103
 
94
104
    # each implementation tested with each HTTP version
95
105
    tp_tests, remaining_tests = tests.split_suite_by_condition(
96
106
        remaining_tests, tests.condition_isinstance((
105
115
                TestRanges,
106
116
                TestSpecificRequestHandler,
107
117
                )))
108
 
    protocol_scenarios = [
109
 
            ('HTTP/1.0',  dict(_protocol_version='HTTP/1.0')),
110
 
            ('HTTP/1.1',  dict(_protocol_version='HTTP/1.1')),
111
 
            ]
112
118
    tp_scenarios = tests.multiply_scenarios(transport_scenarios,
113
119
                                            protocol_scenarios)
114
120
    tests.multiply_tests(tp_tests, tp_scenarios, result)
156
162
        activity_scenarios.append(
157
163
            ('urllib,https', dict(_activity_server=ActivityHTTPSServer,
158
164
                                  _transport=_urllib.HttpTransport_urllib,)),)
159
 
    if pycurl_present:
 
165
    if features.pycurl.available():
160
166
        activity_scenarios.append(
161
167
            ('pycurl,http', dict(_activity_server=ActivityHTTPServer,
162
168
                                 _transport=PyCurlTransport,)),)
204
210
    It records the bytes sent to it, and replies with a 200.
205
211
    """
206
212
 
207
 
    def __init__(self, expect_body_tail=None):
 
213
    def __init__(self, expect_body_tail=None, scheme=''):
208
214
        """Constructor.
209
215
 
210
216
        :type expect_body_tail: str
215
221
        self.host = None
216
222
        self.port = None
217
223
        self.received_bytes = ''
218
 
 
219
 
    def setUp(self):
 
224
        self.scheme = scheme
 
225
 
 
226
    def get_url(self):
 
227
        return '%s://%s:%s/' % (self.scheme, self.host, self.port)
 
228
 
 
229
    def start_server(self):
220
230
        self._sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
221
231
        self._sock.bind(('127.0.0.1', 0))
222
232
        self.host, self.port = self._sock.getsockname()
245
255
            # The client may have already closed the socket.
246
256
            pass
247
257
 
248
 
    def tearDown(self):
 
258
    def stop_server(self):
249
259
        try:
250
260
            self._sock.close()
251
261
        except socket.error:
265
275
 
266
276
    def test_empty_header(self):
267
277
        scheme, remainder = self.parse_header('')
268
 
        self.assertEquals('', scheme)
 
278
        self.assertEqual('', scheme)
269
279
        self.assertIs(None, remainder)
270
280
 
271
281
    def test_negotiate_header(self):
272
282
        scheme, remainder = self.parse_header('Negotiate')
273
 
        self.assertEquals('negotiate', scheme)
 
283
        self.assertEqual('negotiate', scheme)
274
284
        self.assertIs(None, remainder)
275
285
 
276
286
    def test_basic_header(self):
277
287
        scheme, remainder = self.parse_header(
278
288
            'Basic realm="Thou should not pass"')
279
 
        self.assertEquals('basic', scheme)
280
 
        self.assertEquals('realm="Thou should not pass"', remainder)
 
289
        self.assertEqual('basic', scheme)
 
290
        self.assertEqual('realm="Thou should not pass"', remainder)
281
291
 
282
292
    def test_basic_extract_realm(self):
283
293
        scheme, remainder = self.parse_header(
285
295
            _urllib2_wrappers.BasicAuthHandler)
286
296
        match, realm = self.auth_handler.extract_realm(remainder)
287
297
        self.assertTrue(match is not None)
288
 
        self.assertEquals('Thou should not pass', realm)
 
298
        self.assertEqual('Thou should not pass', realm)
289
299
 
290
300
    def test_digest_header(self):
291
301
        scheme, remainder = self.parse_header(
292
302
            'Digest realm="Thou should not pass"')
293
 
        self.assertEquals('digest', scheme)
294
 
        self.assertEquals('realm="Thou should not pass"', remainder)
 
303
        self.assertEqual('digest', scheme)
 
304
        self.assertEqual('realm="Thou should not pass"', remainder)
295
305
 
296
306
 
297
307
class TestHTTPServer(tests.TestCase):
304
314
 
305
315
        server = http_server.HttpServer(BogusRequestHandler)
306
316
        try:
307
 
            self.assertRaises(httplib.UnknownProtocol,server.setUp)
 
317
            self.assertRaises(httplib.UnknownProtocol, server.start_server)
308
318
        except:
309
 
            server.tearDown()
 
319
            server.stop_server()
310
320
            self.fail('HTTP Server creation did not raise UnknownProtocol')
311
321
 
312
322
    def test_force_invalid_protocol(self):
313
323
        server = http_server.HttpServer(protocol_version='HTTP/0.1')
314
324
        try:
315
 
            self.assertRaises(httplib.UnknownProtocol,server.setUp)
 
325
            self.assertRaises(httplib.UnknownProtocol, server.start_server)
316
326
        except:
317
 
            server.tearDown()
 
327
            server.stop_server()
318
328
            self.fail('HTTP Server creation did not raise UnknownProtocol')
319
329
 
320
330
    def test_server_start_and_stop(self):
321
331
        server = http_server.HttpServer()
322
 
        server.setUp()
323
 
        self.assertTrue(server._http_running)
324
 
        server.tearDown()
 
332
        server.start_server()
 
333
        try:
 
334
            self.assertTrue(server._http_running)
 
335
        finally:
 
336
            server.stop_server()
325
337
        self.assertFalse(server._http_running)
326
338
 
327
339
    def test_create_http_server_one_zero(self):
330
342
            protocol_version = 'HTTP/1.0'
331
343
 
332
344
        server = http_server.HttpServer(RequestHandlerOneZero)
333
 
        server.setUp()
334
 
        self.addCleanup(server.tearDown)
 
345
        self.start_server(server)
335
346
        self.assertIsInstance(server._httpd, http_server.TestingHTTPServer)
336
347
 
337
348
    def test_create_http_server_one_one(self):
340
351
            protocol_version = 'HTTP/1.1'
341
352
 
342
353
        server = http_server.HttpServer(RequestHandlerOneOne)
343
 
        server.setUp()
344
 
        self.addCleanup(server.tearDown)
 
354
        self.start_server(server)
345
355
        self.assertIsInstance(server._httpd,
346
356
                              http_server.TestingThreadingHTTPServer)
347
357
 
352
362
 
353
363
        server = http_server.HttpServer(RequestHandlerOneZero,
354
364
                                        protocol_version='HTTP/1.1')
355
 
        server.setUp()
356
 
        self.addCleanup(server.tearDown)
 
365
        self.start_server(server)
357
366
        self.assertIsInstance(server._httpd,
358
367
                              http_server.TestingThreadingHTTPServer)
359
368
 
364
373
 
365
374
        server = http_server.HttpServer(RequestHandlerOneOne,
366
375
                                        protocol_version='HTTP/1.0')
367
 
        server.setUp()
368
 
        self.addCleanup(server.tearDown)
 
376
        self.start_server(server)
369
377
        self.assertIsInstance(server._httpd,
370
378
                              http_server.TestingHTTPServer)
371
379
 
374
382
    """Test case to inherit from if pycurl is present"""
375
383
 
376
384
    def _get_pycurl_maybe(self):
377
 
        try:
378
 
            from bzrlib.transport.http._pycurl import PyCurlTransport
379
 
            return PyCurlTransport
380
 
        except errors.DependencyNotPresent:
381
 
            raise tests.TestSkipped('pycurl not present')
 
385
        self.requireFeature(features.pycurl)
 
386
        return PyCurlTransport
382
387
 
383
388
    _transport = property(_get_pycurl_maybe)
384
389
 
391
396
    def test_url_parsing(self):
392
397
        f = FakeManager()
393
398
        url = http.extract_auth('http://example.com', f)
394
 
        self.assertEquals('http://example.com', url)
395
 
        self.assertEquals(0, len(f.credentials))
 
399
        self.assertEqual('http://example.com', url)
 
400
        self.assertEqual(0, len(f.credentials))
396
401
        url = http.extract_auth(
397
 
            'http://user:pass@www.bazaar-vcs.org/bzr/bzr.dev', f)
398
 
        self.assertEquals('http://www.bazaar-vcs.org/bzr/bzr.dev', url)
399
 
        self.assertEquals(1, len(f.credentials))
400
 
        self.assertEquals([None, 'www.bazaar-vcs.org', 'user', 'pass'],
401
 
                          f.credentials[0])
 
402
            'http://user:pass@example.com/bzr/bzr.dev', f)
 
403
        self.assertEqual('http://example.com/bzr/bzr.dev', url)
 
404
        self.assertEqual(1, len(f.credentials))
 
405
        self.assertEqual([None, 'example.com', 'user', 'pass'],
 
406
                         f.credentials[0])
402
407
 
403
408
 
404
409
class TestHttpTransportUrls(tests.TestCase):
431
436
    def test_http_impl_urls(self):
432
437
        """There are servers which ask for particular clients to connect"""
433
438
        server = self._server()
 
439
        server.start_server()
434
440
        try:
435
 
            server.setUp()
436
441
            url = server.get_url()
437
442
            self.assertTrue(url.startswith('%s://' % self._qualified_prefix))
438
443
        finally:
439
 
            server.tearDown()
 
444
            server.stop_server()
440
445
 
441
446
 
442
447
class TestHttps_pycurl(TestWithTransport_pycurl, tests.TestCase):
451
456
        https by supplying a fake version_info that do not
452
457
        support it.
453
458
        """
454
 
        try:
455
 
            import pycurl
456
 
        except ImportError:
457
 
            raise tests.TestSkipped('pycurl not present')
 
459
        self.requireFeature(features.pycurl)
 
460
        # Import the module locally now that we now it's available.
 
461
        pycurl = features.pycurl.module
458
462
 
459
 
        version_info_orig = pycurl.version_info
460
 
        try:
461
 
            # Now that we have pycurl imported, we can fake its version_info
462
 
            # This was taken from a windows pycurl without SSL
463
 
            # (thanks to bialix)
464
 
            pycurl.version_info = lambda : (2,
465
 
                                            '7.13.2',
466
 
                                            462082,
467
 
                                            'i386-pc-win32',
468
 
                                            2576,
469
 
                                            None,
470
 
                                            0,
471
 
                                            None,
472
 
                                            ('ftp', 'gopher', 'telnet',
473
 
                                             'dict', 'ldap', 'http', 'file'),
474
 
                                            None,
475
 
                                            0,
476
 
                                            None)
477
 
            self.assertRaises(errors.DependencyNotPresent, self._transport,
478
 
                              'https://launchpad.net')
479
 
        finally:
480
 
            # Restore the right function
481
 
            pycurl.version_info = version_info_orig
 
463
        self.overrideAttr(pycurl, 'version_info',
 
464
                          # Fake the pycurl version_info This was taken from
 
465
                          # a windows pycurl without SSL (thanks to bialix)
 
466
                          lambda : (2,
 
467
                                    '7.13.2',
 
468
                                    462082,
 
469
                                    'i386-pc-win32',
 
470
                                    2576,
 
471
                                    None,
 
472
                                    0,
 
473
                                    None,
 
474
                                    ('ftp', 'gopher', 'telnet',
 
475
                                     'dict', 'ldap', 'http', 'file'),
 
476
                                    None,
 
477
                                    0,
 
478
                                    None))
 
479
        self.assertRaises(errors.DependencyNotPresent, self._transport,
 
480
                          'https://launchpad.net')
482
481
 
483
482
 
484
483
class TestHTTPConnections(http_utils.TestCaseWithWebserver):
543
542
class TestPost(tests.TestCase):
544
543
 
545
544
    def test_post_body_is_received(self):
546
 
        server = RecordingServer(expect_body_tail='end-of-body')
547
 
        server.setUp()
548
 
        self.addCleanup(server.tearDown)
549
 
        scheme = self._qualified_prefix
550
 
        url = '%s://%s:%s/' % (scheme, server.host, server.port)
 
545
        server = RecordingServer(expect_body_tail='end-of-body',
 
546
            scheme=self._qualified_prefix)
 
547
        self.start_server(server)
 
548
        url = server.get_url()
551
549
        http_transport = self._transport(url)
552
550
        code, response = http_transport._post('abc def end-of-body')
553
551
        self.assertTrue(
602
600
                                      protocol_version=self._protocol_version)
603
601
 
604
602
    def _testing_pycurl(self):
605
 
        return pycurl_present and self._transport == PyCurlTransport
 
603
        # TODO: This is duplicated for lots of the classes in this file
 
604
        return (features.pycurl.available()
 
605
                and self._transport == PyCurlTransport)
606
606
 
607
607
 
608
608
class WallRequestHandler(http_server.TestingHTTPRequestHandler):
625
625
        # for details) make no distinction between a closed
626
626
        # socket and badly formatted status line, so we can't
627
627
        # just test for ConnectionError, we have to test
628
 
        # InvalidHttpResponse too.
629
 
        self.assertRaises((errors.ConnectionError, errors.InvalidHttpResponse),
 
628
        # InvalidHttpResponse too. And pycurl may raise ConnectionReset
 
629
        # instead of ConnectionError too.
 
630
        self.assertRaises(( errors.ConnectionError, errors.ConnectionReset,
 
631
                            errors.InvalidHttpResponse),
630
632
                          t.has, 'foo/bar')
631
633
 
632
634
    def test_http_get(self):
633
635
        server = self.get_readonly_server()
634
636
        t = self._transport(server.get_url())
635
 
        self.assertRaises((errors.ConnectionError, errors.InvalidHttpResponse),
 
637
        self.assertRaises((errors.ConnectionError, errors.ConnectionReset,
 
638
                           errors.InvalidHttpResponse),
636
639
                          t.get, 'foo/bar')
637
640
 
638
641
 
714
717
    _req_handler_class = BadProtocolRequestHandler
715
718
 
716
719
    def setUp(self):
717
 
        if pycurl_present and self._transport == PyCurlTransport:
 
720
        if self._testing_pycurl():
718
721
            raise tests.TestNotApplicable(
719
722
                "pycurl doesn't check the protocol version")
720
723
        super(TestBadProtocolServer, self).setUp()
764
767
        self.assertEqual(None, server.host)
765
768
        self.assertEqual(None, server.port)
766
769
 
767
 
    def test_setUp_and_tearDown(self):
 
770
    def test_setUp_and_stop(self):
768
771
        server = RecordingServer(expect_body_tail=None)
769
 
        server.setUp()
 
772
        server.start_server()
770
773
        try:
771
774
            self.assertNotEqual(None, server.host)
772
775
            self.assertNotEqual(None, server.port)
773
776
        finally:
774
 
            server.tearDown()
 
777
            server.stop_server()
775
778
        self.assertEqual(None, server.host)
776
779
        self.assertEqual(None, server.port)
777
780
 
778
781
    def test_send_receive_bytes(self):
779
 
        server = RecordingServer(expect_body_tail='c')
780
 
        server.setUp()
781
 
        self.addCleanup(server.tearDown)
 
782
        server = RecordingServer(expect_body_tail='c', scheme='http')
 
783
        self.start_server(server)
782
784
        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
783
785
        sock.connect((server.host, server.port))
784
786
        sock.sendall('abc')
1175
1177
        if self._testing_pycurl():
1176
1178
            # Oh my ! pycurl does not check for the port as part of
1177
1179
            # no_proxy :-( So we just test the host part
1178
 
            self.no_proxy_host = 'localhost'
 
1180
            self.no_proxy_host = self.server.host
1179
1181
        else:
1180
1182
            self.no_proxy_host = self.proxy_address
1181
1183
        # The secondary server is the proxy
1184
1186
        self._old_env = {}
1185
1187
 
1186
1188
    def _testing_pycurl(self):
1187
 
        return pycurl_present and self._transport == PyCurlTransport
 
1189
        # TODO: This is duplicated for lots of the classes in this file
 
1190
        return (features.pycurl.available()
 
1191
                and self._transport == PyCurlTransport)
1188
1192
 
1189
1193
    def create_transport_secondary_server(self):
1190
1194
        """Creates an http server that will serve files with
1363
1367
        self.follow_redirections = True
1364
1368
 
1365
1369
 
 
1370
def install_redirected_request(test):
 
1371
    test.overrideAttr(_urllib2_wrappers, 'Request', RedirectedRequest)
 
1372
 
 
1373
 
1366
1374
class TestHTTPSilentRedirections(http_utils.TestCaseWithRedirectedWebserver):
1367
1375
    """Test redirections.
1368
1376
 
1378
1386
    """
1379
1387
 
1380
1388
    def setUp(self):
1381
 
        if pycurl_present and self._transport == PyCurlTransport:
 
1389
        if (features.pycurl.available()
 
1390
            and self._transport == PyCurlTransport):
1382
1391
            raise tests.TestNotApplicable(
1383
1392
                "pycurl doesn't redirect silently annymore")
1384
1393
        super(TestHTTPSilentRedirections, self).setUp()
1385
 
        self.setup_redirected_request()
1386
 
        self.addCleanup(self.cleanup_redirected_request)
 
1394
        install_redirected_request(self)
1387
1395
        self.build_tree_contents([('a','a'),
1388
1396
                                  ('1/',),
1389
1397
                                  ('1/a', 'redirected once'),
1399
1407
 
1400
1408
        self.old_transport = self._transport(self.old_server.get_url())
1401
1409
 
1402
 
    def setup_redirected_request(self):
1403
 
        self.original_class = _urllib2_wrappers.Request
1404
 
        _urllib2_wrappers.Request = RedirectedRequest
1405
 
 
1406
 
    def cleanup_redirected_request(self):
1407
 
        _urllib2_wrappers.Request = self.original_class
1408
 
 
1409
1410
    def create_transport_secondary_server(self):
1410
1411
        """Create the secondary server, redirections are defined in the tests"""
1411
1412
        return http_utils.HTTPServerRedirecting(
1415
1416
        t = self.old_transport
1416
1417
 
1417
1418
        req = RedirectedRequest('GET', t.abspath('a'))
1418
 
        req.follow_redirections = True
1419
1419
        new_prefix = 'http://%s:%s' % (self.new_server.host,
1420
1420
                                       self.new_server.port)
1421
1421
        self.old_server.redirections = \
1422
1422
            [('(.*)', r'%s/1\1' % (new_prefix), 301),]
1423
 
        self.assertEquals('redirected once',t._perform(req).read())
 
1423
        self.assertEqual('redirected once',t._perform(req).read())
1424
1424
 
1425
1425
    def test_five_redirections(self):
1426
1426
        t = self.old_transport
1427
1427
 
1428
1428
        req = RedirectedRequest('GET', t.abspath('a'))
1429
 
        req.follow_redirections = True
1430
1429
        old_prefix = 'http://%s:%s' % (self.old_server.host,
1431
1430
                                       self.old_server.port)
1432
1431
        new_prefix = 'http://%s:%s' % (self.new_server.host,
1438
1437
            ('/4(.*)', r'%s/5\1' % (new_prefix), 301),
1439
1438
            ('(/[^/]+)', r'%s/1\1' % (old_prefix), 301),
1440
1439
            ]
1441
 
        self.assertEquals('redirected 5 times',t._perform(req).read())
 
1440
        self.assertEqual('redirected 5 times',t._perform(req).read())
1442
1441
 
1443
1442
 
1444
1443
class TestDoCatchRedirections(http_utils.TestCaseWithRedirectedWebserver):
1457
1456
        t = self._transport(self.new_server.get_url())
1458
1457
 
1459
1458
        # We use None for redirected so that we fail if redirected
1460
 
        self.assertEquals('0123456789',
1461
 
                          transport.do_catching_redirections(
 
1459
        self.assertEqual('0123456789',
 
1460
                         transport.do_catching_redirections(
1462
1461
                self.get_a, t, None).read())
1463
1462
 
1464
1463
    def test_one_redirection(self):
1469
1468
            dir, file = urlutils.split(exception.target)
1470
1469
            return self._transport(dir)
1471
1470
 
1472
 
        self.assertEquals('0123456789',
1473
 
                          transport.do_catching_redirections(
 
1471
        self.assertEqual('0123456789',
 
1472
                         transport.do_catching_redirections(
1474
1473
                self.get_a, self.old_transport, redirected).read())
1475
 
        self.assertEquals(1, self.redirections)
 
1474
        self.assertEqual(1, self.redirections)
1476
1475
 
1477
1476
    def test_redirection_loop(self):
1478
1477
 
1506
1505
        return self._auth_server(protocol_version=self._protocol_version)
1507
1506
 
1508
1507
    def _testing_pycurl(self):
1509
 
        return pycurl_present and self._transport == PyCurlTransport
 
1508
        # TODO: This is duplicated for lots of the classes in this file
 
1509
        return (features.pycurl.available()
 
1510
                and self._transport == PyCurlTransport)
1510
1511
 
1511
1512
    def get_user_url(self, user, password):
1512
1513
        """Build an url embedding user and password"""
1577
1578
        self.assertEqual('', ui.ui_factory.stdin.readline())
1578
1579
        stderr.seek(0)
1579
1580
        expected_prompt = self._expected_username_prompt(t._unqualified_scheme)
1580
 
        self.assertEquals(expected_prompt, stderr.read(len(expected_prompt)))
1581
 
        self.assertEquals('', stdout.getvalue())
 
1581
        self.assertEqual(expected_prompt, stderr.read(len(expected_prompt)))
 
1582
        self.assertEqual('', stdout.getvalue())
1582
1583
        self._check_password_prompt(t._unqualified_scheme, 'joe',
1583
1584
                                    stderr.readline())
1584
1585
 
1599
1600
        self.assertEqual('', ui.ui_factory.stdin.readline())
1600
1601
        self._check_password_prompt(t._unqualified_scheme, 'joe',
1601
1602
                                    stderr.getvalue())
1602
 
        self.assertEquals('', stdout.getvalue())
 
1603
        self.assertEqual('', stdout.getvalue())
1603
1604
        # And we shouldn't prompt again for a different request
1604
1605
        # against the same transport.
1605
1606
        self.assertEqual('contents of b\n',t.get('b').read())
1615
1616
                              % (scheme.upper(),
1616
1617
                                 user, self.server.host, self.server.port,
1617
1618
                                 self.server.auth_realm)))
1618
 
        self.assertEquals(expected_prompt, actual_prompt)
 
1619
        self.assertEqual(expected_prompt, actual_prompt)
1619
1620
 
1620
1621
    def _expected_username_prompt(self, scheme):
1621
1622
        return (self._username_prompt_prefix
1635
1636
        self.server.add_user(user, password)
1636
1637
        t = self.get_user_transport(user, None)
1637
1638
        ui.ui_factory = tests.TestUIFactory(stdin=stdin_content,
1638
 
                                            stdout=tests.StringIOWrapper())
 
1639
                                            stderr=tests.StringIOWrapper())
1639
1640
        # Create a minimal config file with the right password
1640
1641
        conf = config.AuthenticationConfig()
1641
1642
        conf._get_config().update(
1853
1854
                             'http://www.example.com/foo/subdir')
1854
1855
        self.assertIsInstance(r, type(t))
1855
1856
        # Both transports share the some connection
1856
 
        self.assertEquals(t._get_connection(), r._get_connection())
 
1857
        self.assertEqual(t._get_connection(), r._get_connection())
1857
1858
 
1858
1859
    def test_redirected_to_self_with_slash(self):
1859
1860
        t = self._transport('http://www.example.com/foo')
1863
1864
        # Both transports share the some connection (one can argue that we
1864
1865
        # should return the exact same transport here, but that seems
1865
1866
        # overkill).
1866
 
        self.assertEquals(t._get_connection(), r._get_connection())
 
1867
        self.assertEqual(t._get_connection(), r._get_connection())
1867
1868
 
1868
1869
    def test_redirected_to_host(self):
1869
1870
        t = self._transport('http://www.example.com/foo')
1888
1889
        r = t._redirected_to('http://www.example.com/foo',
1889
1890
                             'https://foo.example.com/foo')
1890
1891
        self.assertIsInstance(r, type(t))
1891
 
        self.assertEquals(t._user, r._user)
 
1892
        self.assertEqual(t._user, r._user)
1892
1893
 
1893
1894
 
1894
1895
class PredefinedRequestHandler(http_server.TestingHTTPRequestHandler):
1953
1954
        pass
1954
1955
 
1955
1956
 
1956
 
class TestActivity(tests.TestCase):
 
1957
class TestActivityMixin(object):
1957
1958
    """Test socket activity reporting.
1958
1959
 
1959
1960
    We use a special purpose server to control the bytes sent and received and
1963
1964
    def setUp(self):
1964
1965
        tests.TestCase.setUp(self)
1965
1966
        self.server = self._activity_server(self._protocol_version)
1966
 
        self.server.setUp()
 
1967
        self.server.start_server()
1967
1968
        self.activities = {}
1968
1969
        def report_activity(t, bytes, direction):
1969
1970
            count = self.activities.get(direction, 0)
1978
1979
 
1979
1980
    def tearDown(self):
1980
1981
        self._transport._report_activity = self.orig_report_activity
1981
 
        self.server.tearDown()
 
1982
        self.server.stop_server()
1982
1983
        tests.TestCase.tearDown(self)
1983
1984
 
1984
1985
    def get_transport(self):
2097
2098
        code, f = t._post('abc def end-of-body\n')
2098
2099
        self.assertEqual('lalala whatever as long as itsssss\n', f.read())
2099
2100
        self.assertActivitiesMatch()
 
2101
 
 
2102
 
 
2103
class TestActivity(tests.TestCase, TestActivityMixin):
 
2104
 
 
2105
    def setUp(self):
 
2106
        tests.TestCase.setUp(self)
 
2107
        self.server = self._activity_server(self._protocol_version)
 
2108
        self.server.start_server()
 
2109
        self.activities = {}
 
2110
        def report_activity(t, bytes, direction):
 
2111
            count = self.activities.get(direction, 0)
 
2112
            count += bytes
 
2113
            self.activities[direction] = count
 
2114
 
 
2115
        # We override at class level because constructors may propagate the
 
2116
        # bound method and render instance overriding ineffective (an
 
2117
        # alternative would be to define a specific ui factory instead...)
 
2118
        self.orig_report_activity = self._transport._report_activity
 
2119
        self._transport._report_activity = report_activity
 
2120
 
 
2121
    def tearDown(self):
 
2122
        self._transport._report_activity = self.orig_report_activity
 
2123
        self.server.stop_server()
 
2124
        tests.TestCase.tearDown(self)
 
2125
 
 
2126
 
 
2127
class TestNoReportActivity(tests.TestCase, TestActivityMixin):
 
2128
 
 
2129
    def setUp(self):
 
2130
        tests.TestCase.setUp(self)
 
2131
        # Unlike TestActivity, we are really testing ReportingFileSocket and
 
2132
        # ReportingSocket, so we don't need all the parametrization. Since
 
2133
        # ReportingFileSocket and ReportingSocket are wrappers, it's easier to
 
2134
        # test them through their use by the transport than directly (that's a
 
2135
        # bit less clean but far more simpler and effective).
 
2136
        self.server = ActivityHTTPServer('HTTP/1.1')
 
2137
        self._transport=_urllib.HttpTransport_urllib
 
2138
 
 
2139
        self.server.start_server()
 
2140
 
 
2141
        # We override at class level because constructors may propagate the
 
2142
        # bound method and render instance overriding ineffective (an
 
2143
        # alternative would be to define a specific ui factory instead...)
 
2144
        self.orig_report_activity = self._transport._report_activity
 
2145
        self._transport._report_activity = None
 
2146
 
 
2147
    def tearDown(self):
 
2148
        self._transport._report_activity = self.orig_report_activity
 
2149
        self.server.stop_server()
 
2150
        tests.TestCase.tearDown(self)
 
2151
 
 
2152
    def assertActivitiesMatch(self):
 
2153
        # Nothing to check here
 
2154
        pass
 
2155
 
 
2156
 
 
2157
class TestAuthOnRedirected(http_utils.TestCaseWithRedirectedWebserver):
 
2158
    """Test authentication on the redirected http server."""
 
2159
 
 
2160
    _auth_header = 'Authorization'
 
2161
    _password_prompt_prefix = ''
 
2162
    _username_prompt_prefix = ''
 
2163
    _auth_server = http_utils.HTTPBasicAuthServer
 
2164
    _transport = _urllib.HttpTransport_urllib
 
2165
 
 
2166
    def create_transport_readonly_server(self):
 
2167
        return self._auth_server(protocol_version=self._protocol_version)
 
2168
 
 
2169
    def create_transport_secondary_server(self):
 
2170
        """Create the secondary server redirecting to the primary server"""
 
2171
        new = self.get_readonly_server()
 
2172
 
 
2173
        redirecting = http_utils.HTTPServerRedirecting(
 
2174
            protocol_version=self._protocol_version)
 
2175
        redirecting.redirect_to(new.host, new.port)
 
2176
        return redirecting
 
2177
 
 
2178
    def setUp(self):
 
2179
        super(TestAuthOnRedirected, self).setUp()
 
2180
        self.build_tree_contents([('a','a'),
 
2181
                                  ('1/',),
 
2182
                                  ('1/a', 'redirected once'),
 
2183
                                  ],)
 
2184
        new_prefix = 'http://%s:%s' % (self.new_server.host,
 
2185
                                       self.new_server.port)
 
2186
        self.old_server.redirections = [
 
2187
            ('(.*)', r'%s/1\1' % (new_prefix), 301),]
 
2188
        self.old_transport = self._transport(self.old_server.get_url())
 
2189
        self.new_server.add_user('joe', 'foo')
 
2190
 
 
2191
    def get_a(self, transport):
 
2192
        return transport.get('a')
 
2193
 
 
2194
    def test_auth_on_redirected_via_do_catching_redirections(self):
 
2195
        self.redirections = 0
 
2196
 
 
2197
        def redirected(transport, exception, redirection_notice):
 
2198
            self.redirections += 1
 
2199
            dir, file = urlutils.split(exception.target)
 
2200
            return self._transport(dir)
 
2201
 
 
2202
        stdout = tests.StringIOWrapper()
 
2203
        stderr = tests.StringIOWrapper()
 
2204
        ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n',
 
2205
                                            stdout=stdout, stderr=stderr)
 
2206
        self.assertEqual('redirected once',
 
2207
                         transport.do_catching_redirections(
 
2208
                self.get_a, self.old_transport, redirected).read())
 
2209
        self.assertEqual(1, self.redirections)
 
2210
        # stdin should be empty
 
2211
        self.assertEqual('', ui.ui_factory.stdin.readline())
 
2212
        # stdout should be empty, stderr will contains the prompts
 
2213
        self.assertEqual('', stdout.getvalue())
 
2214
 
 
2215
    def test_auth_on_redirected_via_following_redirections(self):
 
2216
        self.new_server.add_user('joe', 'foo')
 
2217
        stdout = tests.StringIOWrapper()
 
2218
        stderr = tests.StringIOWrapper()
 
2219
        ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n',
 
2220
                                            stdout=stdout, stderr=stderr)
 
2221
        t = self.old_transport
 
2222
        req = RedirectedRequest('GET', t.abspath('a'))
 
2223
        new_prefix = 'http://%s:%s' % (self.new_server.host,
 
2224
                                       self.new_server.port)
 
2225
        self.old_server.redirections = [
 
2226
            ('(.*)', r'%s/1\1' % (new_prefix), 301),]
 
2227
        self.assertEqual('redirected once',t._perform(req).read())
 
2228
        # stdin should be empty
 
2229
        self.assertEqual('', ui.ui_factory.stdin.readline())
 
2230
        # stdout should be empty, stderr will contains the prompts
 
2231
        self.assertEqual('', stdout.getvalue())
 
2232
 
 
2233