← 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: Canonical.com Patch Queue Manager
  • Date: 2009-08-14 05:49:27 UTC
  • mfrom: (4476.3.86 inventory-delta)
  • Revision ID: pqm@pqm.ubuntu.com-20090814054927-k0k18dn46ax4b91f
(andrew) Add inventory-delta streaming for cross-format fetch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_http.py
1
 
# Copyright (C) 2005-2010 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
48
48
    deprecated_in,
49
49
    )
50
50
from bzrlib.tests import (
51
 
    features,
52
51
    http_server,
53
52
    http_utils,
54
53
    )
62
61
    )
63
62
 
64
63
 
65
 
if features.pycurl.available():
 
64
try:
66
65
    from bzrlib.transport.http._pycurl import PyCurlTransport
 
66
    pycurl_present = True
 
67
except errors.DependencyNotPresent:
 
68
    pycurl_present = False
67
69
 
68
70
 
69
71
def load_tests(standard_tests, module, loader):
82
84
                        _server=http_server.HttpServer_urllib,
83
85
                        _qualified_prefix='http+urllib',)),
84
86
        ]
85
 
    if features.pycurl.available():
 
87
    if pycurl_present:
86
88
        transport_scenarios.append(
87
89
            ('pycurl', dict(_transport=PyCurlTransport,
88
90
                            _server=http_server.HttpServer_PyCurl,
89
91
                            _qualified_prefix='http+pycurl',)))
90
92
    tests.multiply_tests(t_tests, transport_scenarios, result)
91
93
 
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
 
 
104
94
    # each implementation tested with each HTTP version
105
95
    tp_tests, remaining_tests = tests.split_suite_by_condition(
106
96
        remaining_tests, tests.condition_isinstance((
115
105
                TestRanges,
116
106
                TestSpecificRequestHandler,
117
107
                )))
 
108
    protocol_scenarios = [
 
109
            ('HTTP/1.0',  dict(_protocol_version='HTTP/1.0')),
 
110
            ('HTTP/1.1',  dict(_protocol_version='HTTP/1.1')),
 
111
            ]
118
112
    tp_scenarios = tests.multiply_scenarios(transport_scenarios,
119
113
                                            protocol_scenarios)
120
114
    tests.multiply_tests(tp_tests, tp_scenarios, result)
162
156
        activity_scenarios.append(
163
157
            ('urllib,https', dict(_activity_server=ActivityHTTPSServer,
164
158
                                  _transport=_urllib.HttpTransport_urllib,)),)
165
 
    if features.pycurl.available():
 
159
    if pycurl_present:
166
160
        activity_scenarios.append(
167
161
            ('pycurl,http', dict(_activity_server=ActivityHTTPServer,
168
162
                                 _transport=PyCurlTransport,)),)
210
204
    It records the bytes sent to it, and replies with a 200.
211
205
    """
212
206
 
213
 
    def __init__(self, expect_body_tail=None, scheme=''):
 
207
    def __init__(self, expect_body_tail=None):
214
208
        """Constructor.
215
209
 
216
210
        :type expect_body_tail: str
221
215
        self.host = None
222
216
        self.port = None
223
217
        self.received_bytes = ''
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):
 
218
 
 
219
    def setUp(self):
230
220
        self._sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
231
221
        self._sock.bind(('127.0.0.1', 0))
232
222
        self.host, self.port = self._sock.getsockname()
255
245
            # The client may have already closed the socket.
256
246
            pass
257
247
 
258
 
    def stop_server(self):
 
248
    def tearDown(self):
259
249
        try:
260
250
            self._sock.close()
261
251
        except socket.error:
275
265
 
276
266
    def test_empty_header(self):
277
267
        scheme, remainder = self.parse_header('')
278
 
        self.assertEqual('', scheme)
 
268
        self.assertEquals('', scheme)
279
269
        self.assertIs(None, remainder)
280
270
 
281
271
    def test_negotiate_header(self):
282
272
        scheme, remainder = self.parse_header('Negotiate')
283
 
        self.assertEqual('negotiate', scheme)
 
273
        self.assertEquals('negotiate', scheme)
284
274
        self.assertIs(None, remainder)
285
275
 
286
276
    def test_basic_header(self):
287
277
        scheme, remainder = self.parse_header(
288
278
            'Basic realm="Thou should not pass"')
289
 
        self.assertEqual('basic', scheme)
290
 
        self.assertEqual('realm="Thou should not pass"', remainder)
 
279
        self.assertEquals('basic', scheme)
 
280
        self.assertEquals('realm="Thou should not pass"', remainder)
291
281
 
292
282
    def test_basic_extract_realm(self):
293
283
        scheme, remainder = self.parse_header(
295
285
            _urllib2_wrappers.BasicAuthHandler)
296
286
        match, realm = self.auth_handler.extract_realm(remainder)
297
287
        self.assertTrue(match is not None)
298
 
        self.assertEqual('Thou should not pass', realm)
 
288
        self.assertEquals('Thou should not pass', realm)
299
289
 
300
290
    def test_digest_header(self):
301
291
        scheme, remainder = self.parse_header(
302
292
            'Digest realm="Thou should not pass"')
303
 
        self.assertEqual('digest', scheme)
304
 
        self.assertEqual('realm="Thou should not pass"', remainder)
 
293
        self.assertEquals('digest', scheme)
 
294
        self.assertEquals('realm="Thou should not pass"', remainder)
305
295
 
306
296
 
307
297
class TestHTTPServer(tests.TestCase):
314
304
 
315
305
        server = http_server.HttpServer(BogusRequestHandler)
316
306
        try:
317
 
            self.assertRaises(httplib.UnknownProtocol, server.start_server)
 
307
            self.assertRaises(httplib.UnknownProtocol,server.setUp)
318
308
        except:
319
 
            server.stop_server()
 
309
            server.tearDown()
320
310
            self.fail('HTTP Server creation did not raise UnknownProtocol')
321
311
 
322
312
    def test_force_invalid_protocol(self):
323
313
        server = http_server.HttpServer(protocol_version='HTTP/0.1')
324
314
        try:
325
 
            self.assertRaises(httplib.UnknownProtocol, server.start_server)
 
315
            self.assertRaises(httplib.UnknownProtocol,server.setUp)
326
316
        except:
327
 
            server.stop_server()
 
317
            server.tearDown()
328
318
            self.fail('HTTP Server creation did not raise UnknownProtocol')
329
319
 
330
320
    def test_server_start_and_stop(self):
331
321
        server = http_server.HttpServer()
332
 
        server.start_server()
333
 
        try:
334
 
            self.assertTrue(server._http_running)
335
 
        finally:
336
 
            server.stop_server()
 
322
        server.setUp()
 
323
        self.assertTrue(server._http_running)
 
324
        server.tearDown()
337
325
        self.assertFalse(server._http_running)
338
326
 
339
327
    def test_create_http_server_one_zero(self):
342
330
            protocol_version = 'HTTP/1.0'
343
331
 
344
332
        server = http_server.HttpServer(RequestHandlerOneZero)
345
 
        self.start_server(server)
 
333
        server.setUp()
 
334
        self.addCleanup(server.tearDown)
346
335
        self.assertIsInstance(server._httpd, http_server.TestingHTTPServer)
347
336
 
348
337
    def test_create_http_server_one_one(self):
351
340
            protocol_version = 'HTTP/1.1'
352
341
 
353
342
        server = http_server.HttpServer(RequestHandlerOneOne)
354
 
        self.start_server(server)
 
343
        server.setUp()
 
344
        self.addCleanup(server.tearDown)
355
345
        self.assertIsInstance(server._httpd,
356
346
                              http_server.TestingThreadingHTTPServer)
357
347
 
362
352
 
363
353
        server = http_server.HttpServer(RequestHandlerOneZero,
364
354
                                        protocol_version='HTTP/1.1')
365
 
        self.start_server(server)
 
355
        server.setUp()
 
356
        self.addCleanup(server.tearDown)
366
357
        self.assertIsInstance(server._httpd,
367
358
                              http_server.TestingThreadingHTTPServer)
368
359
 
373
364
 
374
365
        server = http_server.HttpServer(RequestHandlerOneOne,
375
366
                                        protocol_version='HTTP/1.0')
376
 
        self.start_server(server)
 
367
        server.setUp()
 
368
        self.addCleanup(server.tearDown)
377
369
        self.assertIsInstance(server._httpd,
378
370
                              http_server.TestingHTTPServer)
379
371
 
382
374
    """Test case to inherit from if pycurl is present"""
383
375
 
384
376
    def _get_pycurl_maybe(self):
385
 
        self.requireFeature(features.pycurl)
386
 
        return PyCurlTransport
 
377
        try:
 
378
            from bzrlib.transport.http._pycurl import PyCurlTransport
 
379
            return PyCurlTransport
 
380
        except errors.DependencyNotPresent:
 
381
            raise tests.TestSkipped('pycurl not present')
387
382
 
388
383
    _transport = property(_get_pycurl_maybe)
389
384
 
396
391
    def test_url_parsing(self):
397
392
        f = FakeManager()
398
393
        url = http.extract_auth('http://example.com', f)
399
 
        self.assertEqual('http://example.com', url)
400
 
        self.assertEqual(0, len(f.credentials))
 
394
        self.assertEquals('http://example.com', url)
 
395
        self.assertEquals(0, len(f.credentials))
401
396
        url = http.extract_auth(
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])
 
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])
407
402
 
408
403
 
409
404
class TestHttpTransportUrls(tests.TestCase):
436
431
    def test_http_impl_urls(self):
437
432
        """There are servers which ask for particular clients to connect"""
438
433
        server = self._server()
439
 
        server.start_server()
440
434
        try:
 
435
            server.setUp()
441
436
            url = server.get_url()
442
437
            self.assertTrue(url.startswith('%s://' % self._qualified_prefix))
443
438
        finally:
444
 
            server.stop_server()
 
439
            server.tearDown()
445
440
 
446
441
 
447
442
class TestHttps_pycurl(TestWithTransport_pycurl, tests.TestCase):
456
451
        https by supplying a fake version_info that do not
457
452
        support it.
458
453
        """
459
 
        self.requireFeature(features.pycurl)
460
 
        # Import the module locally now that we now it's available.
461
 
        pycurl = features.pycurl.module
 
454
        try:
 
455
            import pycurl
 
456
        except ImportError:
 
457
            raise tests.TestSkipped('pycurl not present')
462
458
 
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')
 
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
481
482
 
482
483
 
483
484
class TestHTTPConnections(http_utils.TestCaseWithWebserver):
542
543
class TestPost(tests.TestCase):
543
544
 
544
545
    def test_post_body_is_received(self):
545
 
        server = RecordingServer(expect_body_tail='end-of-body',
546
 
            scheme=self._qualified_prefix)
547
 
        self.start_server(server)
548
 
        url = server.get_url()
 
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)
549
551
        http_transport = self._transport(url)
550
552
        code, response = http_transport._post('abc def end-of-body')
551
553
        self.assertTrue(
600
602
                                      protocol_version=self._protocol_version)
601
603
 
602
604
    def _testing_pycurl(self):
603
 
        # TODO: This is duplicated for lots of the classes in this file
604
 
        return (features.pycurl.available()
605
 
                and self._transport == PyCurlTransport)
 
605
        return pycurl_present 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. And pycurl may raise ConnectionReset
629
 
        # instead of ConnectionError too.
630
 
        self.assertRaises(( errors.ConnectionError, errors.ConnectionReset,
631
 
                            errors.InvalidHttpResponse),
 
628
        # InvalidHttpResponse too.
 
629
        self.assertRaises((errors.ConnectionError, errors.InvalidHttpResponse),
632
630
                          t.has, 'foo/bar')
633
631
 
634
632
    def test_http_get(self):
635
633
        server = self.get_readonly_server()
636
634
        t = self._transport(server.get_url())
637
 
        self.assertRaises((errors.ConnectionError, errors.ConnectionReset,
638
 
                           errors.InvalidHttpResponse),
 
635
        self.assertRaises((errors.ConnectionError, errors.InvalidHttpResponse),
639
636
                          t.get, 'foo/bar')
640
637
 
641
638
 
717
714
    _req_handler_class = BadProtocolRequestHandler
718
715
 
719
716
    def setUp(self):
720
 
        if self._testing_pycurl():
 
717
        if pycurl_present and self._transport == PyCurlTransport:
721
718
            raise tests.TestNotApplicable(
722
719
                "pycurl doesn't check the protocol version")
723
720
        super(TestBadProtocolServer, self).setUp()
767
764
        self.assertEqual(None, server.host)
768
765
        self.assertEqual(None, server.port)
769
766
 
770
 
    def test_setUp_and_stop(self):
 
767
    def test_setUp_and_tearDown(self):
771
768
        server = RecordingServer(expect_body_tail=None)
772
 
        server.start_server()
 
769
        server.setUp()
773
770
        try:
774
771
            self.assertNotEqual(None, server.host)
775
772
            self.assertNotEqual(None, server.port)
776
773
        finally:
777
 
            server.stop_server()
 
774
            server.tearDown()
778
775
        self.assertEqual(None, server.host)
779
776
        self.assertEqual(None, server.port)
780
777
 
781
778
    def test_send_receive_bytes(self):
782
 
        server = RecordingServer(expect_body_tail='c', scheme='http')
783
 
        self.start_server(server)
 
779
        server = RecordingServer(expect_body_tail='c')
 
780
        server.setUp()
 
781
        self.addCleanup(server.tearDown)
784
782
        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
785
783
        sock.connect((server.host, server.port))
786
784
        sock.sendall('abc')
1177
1175
        if self._testing_pycurl():
1178
1176
            # Oh my ! pycurl does not check for the port as part of
1179
1177
            # no_proxy :-( So we just test the host part
1180
 
            self.no_proxy_host = self.server.host
 
1178
            self.no_proxy_host = 'localhost'
1181
1179
        else:
1182
1180
            self.no_proxy_host = self.proxy_address
1183
1181
        # The secondary server is the proxy
1186
1184
        self._old_env = {}
1187
1185
 
1188
1186
    def _testing_pycurl(self):
1189
 
        # TODO: This is duplicated for lots of the classes in this file
1190
 
        return (features.pycurl.available()
1191
 
                and self._transport == PyCurlTransport)
 
1187
        return pycurl_present and self._transport == PyCurlTransport
1192
1188
 
1193
1189
    def create_transport_secondary_server(self):
1194
1190
        """Creates an http server that will serve files with
1367
1363
        self.follow_redirections = True
1368
1364
 
1369
1365
 
1370
 
def install_redirected_request(test):
1371
 
    test.overrideAttr(_urllib2_wrappers, 'Request', RedirectedRequest)
1372
 
 
1373
 
 
1374
1366
class TestHTTPSilentRedirections(http_utils.TestCaseWithRedirectedWebserver):
1375
1367
    """Test redirections.
1376
1368
 
1386
1378
    """
1387
1379
 
1388
1380
    def setUp(self):
1389
 
        if (features.pycurl.available()
1390
 
            and self._transport == PyCurlTransport):
 
1381
        if pycurl_present and self._transport == PyCurlTransport:
1391
1382
            raise tests.TestNotApplicable(
1392
1383
                "pycurl doesn't redirect silently annymore")
1393
1384
        super(TestHTTPSilentRedirections, self).setUp()
1394
 
        install_redirected_request(self)
 
1385
        self.setup_redirected_request()
 
1386
        self.addCleanup(self.cleanup_redirected_request)
1395
1387
        self.build_tree_contents([('a','a'),
1396
1388
                                  ('1/',),
1397
1389
                                  ('1/a', 'redirected once'),
1407
1399
 
1408
1400
        self.old_transport = self._transport(self.old_server.get_url())
1409
1401
 
 
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
 
1410
1409
    def create_transport_secondary_server(self):
1411
1410
        """Create the secondary server, redirections are defined in the tests"""
1412
1411
        return http_utils.HTTPServerRedirecting(
1416
1415
        t = self.old_transport
1417
1416
 
1418
1417
        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.assertEqual('redirected once',t._perform(req).read())
 
1423
        self.assertEquals('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
1429
1430
        old_prefix = 'http://%s:%s' % (self.old_server.host,
1430
1431
                                       self.old_server.port)
1431
1432
        new_prefix = 'http://%s:%s' % (self.new_server.host,
1437
1438
            ('/4(.*)', r'%s/5\1' % (new_prefix), 301),
1438
1439
            ('(/[^/]+)', r'%s/1\1' % (old_prefix), 301),
1439
1440
            ]
1440
 
        self.assertEqual('redirected 5 times',t._perform(req).read())
 
1441
        self.assertEquals('redirected 5 times',t._perform(req).read())
1441
1442
 
1442
1443
 
1443
1444
class TestDoCatchRedirections(http_utils.TestCaseWithRedirectedWebserver):
1456
1457
        t = self._transport(self.new_server.get_url())
1457
1458
 
1458
1459
        # We use None for redirected so that we fail if redirected
1459
 
        self.assertEqual('0123456789',
1460
 
                         transport.do_catching_redirections(
 
1460
        self.assertEquals('0123456789',
 
1461
                          transport.do_catching_redirections(
1461
1462
                self.get_a, t, None).read())
1462
1463
 
1463
1464
    def test_one_redirection(self):
1468
1469
            dir, file = urlutils.split(exception.target)
1469
1470
            return self._transport(dir)
1470
1471
 
1471
 
        self.assertEqual('0123456789',
1472
 
                         transport.do_catching_redirections(
 
1472
        self.assertEquals('0123456789',
 
1473
                          transport.do_catching_redirections(
1473
1474
                self.get_a, self.old_transport, redirected).read())
1474
 
        self.assertEqual(1, self.redirections)
 
1475
        self.assertEquals(1, self.redirections)
1475
1476
 
1476
1477
    def test_redirection_loop(self):
1477
1478
 
1505
1506
        return self._auth_server(protocol_version=self._protocol_version)
1506
1507
 
1507
1508
    def _testing_pycurl(self):
1508
 
        # TODO: This is duplicated for lots of the classes in this file
1509
 
        return (features.pycurl.available()
1510
 
                and self._transport == PyCurlTransport)
 
1509
        return pycurl_present and self._transport == PyCurlTransport
1511
1510
 
1512
1511
    def get_user_url(self, user, password):
1513
1512
        """Build an url embedding user and password"""
1578
1577
        self.assertEqual('', ui.ui_factory.stdin.readline())
1579
1578
        stderr.seek(0)
1580
1579
        expected_prompt = self._expected_username_prompt(t._unqualified_scheme)
1581
 
        self.assertEqual(expected_prompt, stderr.read(len(expected_prompt)))
1582
 
        self.assertEqual('', stdout.getvalue())
 
1580
        self.assertEquals(expected_prompt, stderr.read(len(expected_prompt)))
 
1581
        self.assertEquals('', stdout.getvalue())
1583
1582
        self._check_password_prompt(t._unqualified_scheme, 'joe',
1584
1583
                                    stderr.readline())
1585
1584
 
1600
1599
        self.assertEqual('', ui.ui_factory.stdin.readline())
1601
1600
        self._check_password_prompt(t._unqualified_scheme, 'joe',
1602
1601
                                    stderr.getvalue())
1603
 
        self.assertEqual('', stdout.getvalue())
 
1602
        self.assertEquals('', stdout.getvalue())
1604
1603
        # And we shouldn't prompt again for a different request
1605
1604
        # against the same transport.
1606
1605
        self.assertEqual('contents of b\n',t.get('b').read())
1616
1615
                              % (scheme.upper(),
1617
1616
                                 user, self.server.host, self.server.port,
1618
1617
                                 self.server.auth_realm)))
1619
 
        self.assertEqual(expected_prompt, actual_prompt)
 
1618
        self.assertEquals(expected_prompt, actual_prompt)
1620
1619
 
1621
1620
    def _expected_username_prompt(self, scheme):
1622
1621
        return (self._username_prompt_prefix
1636
1635
        self.server.add_user(user, password)
1637
1636
        t = self.get_user_transport(user, None)
1638
1637
        ui.ui_factory = tests.TestUIFactory(stdin=stdin_content,
1639
 
                                            stderr=tests.StringIOWrapper())
 
1638
                                            stdout=tests.StringIOWrapper())
1640
1639
        # Create a minimal config file with the right password
1641
1640
        conf = config.AuthenticationConfig()
1642
1641
        conf._get_config().update(
1854
1853
                             'http://www.example.com/foo/subdir')
1855
1854
        self.assertIsInstance(r, type(t))
1856
1855
        # Both transports share the some connection
1857
 
        self.assertEqual(t._get_connection(), r._get_connection())
 
1856
        self.assertEquals(t._get_connection(), r._get_connection())
1858
1857
 
1859
1858
    def test_redirected_to_self_with_slash(self):
1860
1859
        t = self._transport('http://www.example.com/foo')
1864
1863
        # Both transports share the some connection (one can argue that we
1865
1864
        # should return the exact same transport here, but that seems
1866
1865
        # overkill).
1867
 
        self.assertEqual(t._get_connection(), r._get_connection())
 
1866
        self.assertEquals(t._get_connection(), r._get_connection())
1868
1867
 
1869
1868
    def test_redirected_to_host(self):
1870
1869
        t = self._transport('http://www.example.com/foo')
1889
1888
        r = t._redirected_to('http://www.example.com/foo',
1890
1889
                             'https://foo.example.com/foo')
1891
1890
        self.assertIsInstance(r, type(t))
1892
 
        self.assertEqual(t._user, r._user)
 
1891
        self.assertEquals(t._user, r._user)
1893
1892
 
1894
1893
 
1895
1894
class PredefinedRequestHandler(http_server.TestingHTTPRequestHandler):
1954
1953
        pass
1955
1954
 
1956
1955
 
1957
 
class TestActivityMixin(object):
 
1956
class TestActivity(tests.TestCase):
1958
1957
    """Test socket activity reporting.
1959
1958
 
1960
1959
    We use a special purpose server to control the bytes sent and received and
1964
1963
    def setUp(self):
1965
1964
        tests.TestCase.setUp(self)
1966
1965
        self.server = self._activity_server(self._protocol_version)
1967
 
        self.server.start_server()
 
1966
        self.server.setUp()
1968
1967
        self.activities = {}
1969
1968
        def report_activity(t, bytes, direction):
1970
1969
            count = self.activities.get(direction, 0)
1979
1978
 
1980
1979
    def tearDown(self):
1981
1980
        self._transport._report_activity = self.orig_report_activity
1982
 
        self.server.stop_server()
 
1981
        self.server.tearDown()
1983
1982
        tests.TestCase.tearDown(self)
1984
1983
 
1985
1984
    def get_transport(self):
2098
2097
        code, f = t._post('abc def end-of-body\n')
2099
2098
        self.assertEqual('lalala whatever as long as itsssss\n', f.read())
2100
2099
        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