← 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: 2010-09-01 08:02:42 UTC
  • mfrom: (5390.3.3 faster-revert-593560)
  • Revision ID: pqm@pqm.ubuntu.com-20100901080242-esg62ody4frwmy66
(spiv) Avoid repeatedly calling self.target.all_file_ids() in
 InterTree.iter_changes. (Andrew Bennetts)

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
44
44
    ui,
45
45
    urlutils,
46
46
    )
47
 
from bzrlib.symbol_versioning import (
48
 
    deprecated_in,
49
 
    )
50
47
from bzrlib.tests import (
 
48
    features,
51
49
    http_server,
52
50
    http_utils,
 
51
    test_server,
53
52
    )
54
53
from bzrlib.transport import (
55
54
    http,
61
60
    )
62
61
 
63
62
 
64
 
try:
 
63
if features.pycurl.available():
65
64
    from bzrlib.transport.http._pycurl import PyCurlTransport
66
 
    pycurl_present = True
67
 
except errors.DependencyNotPresent:
68
 
    pycurl_present = False
69
65
 
70
66
 
71
67
def load_tests(standard_tests, module, loader):
82
78
    transport_scenarios = [
83
79
        ('urllib', dict(_transport=_urllib.HttpTransport_urllib,
84
80
                        _server=http_server.HttpServer_urllib,
85
 
                        _qualified_prefix='http+urllib',)),
 
81
                        _url_protocol='http+urllib',)),
86
82
        ]
87
 
    if pycurl_present:
 
83
    if features.pycurl.available():
88
84
        transport_scenarios.append(
89
85
            ('pycurl', dict(_transport=PyCurlTransport,
90
86
                            _server=http_server.HttpServer_PyCurl,
91
 
                            _qualified_prefix='http+pycurl',)))
 
87
                            _url_protocol='http+pycurl',)))
92
88
    tests.multiply_tests(t_tests, transport_scenarios, result)
93
89
 
 
90
    protocol_scenarios = [
 
91
            ('HTTP/1.0',  dict(_protocol_version='HTTP/1.0')),
 
92
            ('HTTP/1.1',  dict(_protocol_version='HTTP/1.1')),
 
93
            ]
 
94
 
 
95
    # some tests are parametrized by the protocol version only
 
96
    p_tests, remaining_tests = tests.split_suite_by_condition(
 
97
        remaining_tests, tests.condition_isinstance((
 
98
                TestAuthOnRedirected,
 
99
                )))
 
100
    tests.multiply_tests(p_tests, protocol_scenarios, result)
 
101
 
94
102
    # each implementation tested with each HTTP version
95
103
    tp_tests, remaining_tests = tests.split_suite_by_condition(
96
104
        remaining_tests, tests.condition_isinstance((
105
113
                TestRanges,
106
114
                TestSpecificRequestHandler,
107
115
                )))
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
116
    tp_scenarios = tests.multiply_scenarios(transport_scenarios,
113
117
                                            protocol_scenarios)
114
118
    tests.multiply_tests(tp_tests, tp_scenarios, result)
156
160
        activity_scenarios.append(
157
161
            ('urllib,https', dict(_activity_server=ActivityHTTPSServer,
158
162
                                  _transport=_urllib.HttpTransport_urllib,)),)
159
 
    if pycurl_present:
 
163
    if features.pycurl.available():
160
164
        activity_scenarios.append(
161
165
            ('pycurl,http', dict(_activity_server=ActivityHTTPServer,
162
166
                                 _transport=PyCurlTransport,)),)
204
208
    It records the bytes sent to it, and replies with a 200.
205
209
    """
206
210
 
207
 
    def __init__(self, expect_body_tail=None):
 
211
    def __init__(self, expect_body_tail=None, scheme=''):
208
212
        """Constructor.
209
213
 
210
214
        :type expect_body_tail: str
215
219
        self.host = None
216
220
        self.port = None
217
221
        self.received_bytes = ''
218
 
 
219
 
    def setUp(self):
 
222
        self.scheme = scheme
 
223
 
 
224
    def get_url(self):
 
225
        return '%s://%s:%s/' % (self.scheme, self.host, self.port)
 
226
 
 
227
    def start_server(self):
220
228
        self._sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
221
229
        self._sock.bind(('127.0.0.1', 0))
222
230
        self.host, self.port = self._sock.getsockname()
223
231
        self._ready = threading.Event()
224
 
        self._thread = threading.Thread(target=self._accept_read_and_reply)
225
 
        self._thread.setDaemon(True)
 
232
        self._thread = test_server.ThreadWithException(
 
233
            event=self._ready, target=self._accept_read_and_reply)
226
234
        self._thread.start()
227
 
        self._ready.wait(5)
 
235
        if 'threads' in tests.selftest_debug_flags:
 
236
            sys.stderr.write('Thread started: %s\n' % (self._thread.ident,))
 
237
        self._ready.wait()
228
238
 
229
239
    def _accept_read_and_reply(self):
230
240
        self._sock.listen(1)
231
241
        self._ready.set()
232
 
        self._sock.settimeout(5)
233
 
        try:
234
 
            conn, address = self._sock.accept()
235
 
            # On win32, the accepted connection will be non-blocking to start
236
 
            # with because we're using settimeout.
237
 
            conn.setblocking(True)
 
242
        conn, address = self._sock.accept()
 
243
        if self._expect_body_tail is not None:
238
244
            while not self.received_bytes.endswith(self._expect_body_tail):
239
245
                self.received_bytes += conn.recv(4096)
240
246
            conn.sendall('HTTP/1.1 200 OK\r\n')
241
 
        except socket.timeout:
242
 
            # Make sure the client isn't stuck waiting for us to e.g. accept.
 
247
        try:
243
248
            self._sock.close()
244
249
        except socket.error:
245
250
            # The client may have already closed the socket.
246
251
            pass
247
252
 
248
 
    def tearDown(self):
 
253
    def stop_server(self):
249
254
        try:
250
 
            self._sock.close()
 
255
            # Issue a fake connection to wake up the server and allow it to
 
256
            # finish quickly
 
257
            fake_conn = osutils.connect_socket((self.host, self.port))
 
258
            fake_conn.close()
251
259
        except socket.error:
252
260
            # We might have already closed it.  We don't care.
253
261
            pass
254
262
        self.host = None
255
263
        self.port = None
 
264
        self._thread.join()
 
265
        if 'threads' in tests.selftest_debug_flags:
 
266
            sys.stderr.write('Thread  joined: %s\n' % (self._thread.ident,))
256
267
 
257
268
 
258
269
class TestAuthHeader(tests.TestCase):
265
276
 
266
277
    def test_empty_header(self):
267
278
        scheme, remainder = self.parse_header('')
268
 
        self.assertEquals('', scheme)
 
279
        self.assertEqual('', scheme)
269
280
        self.assertIs(None, remainder)
270
281
 
271
282
    def test_negotiate_header(self):
272
283
        scheme, remainder = self.parse_header('Negotiate')
273
 
        self.assertEquals('negotiate', scheme)
 
284
        self.assertEqual('negotiate', scheme)
274
285
        self.assertIs(None, remainder)
275
286
 
276
287
    def test_basic_header(self):
277
288
        scheme, remainder = self.parse_header(
278
289
            'Basic realm="Thou should not pass"')
279
 
        self.assertEquals('basic', scheme)
280
 
        self.assertEquals('realm="Thou should not pass"', remainder)
 
290
        self.assertEqual('basic', scheme)
 
291
        self.assertEqual('realm="Thou should not pass"', remainder)
281
292
 
282
293
    def test_basic_extract_realm(self):
283
294
        scheme, remainder = self.parse_header(
285
296
            _urllib2_wrappers.BasicAuthHandler)
286
297
        match, realm = self.auth_handler.extract_realm(remainder)
287
298
        self.assertTrue(match is not None)
288
 
        self.assertEquals('Thou should not pass', realm)
 
299
        self.assertEqual('Thou should not pass', realm)
289
300
 
290
301
    def test_digest_header(self):
291
302
        scheme, remainder = self.parse_header(
292
303
            'Digest realm="Thou should not pass"')
293
 
        self.assertEquals('digest', scheme)
294
 
        self.assertEquals('realm="Thou should not pass"', remainder)
 
304
        self.assertEqual('digest', scheme)
 
305
        self.assertEqual('realm="Thou should not pass"', remainder)
295
306
 
296
307
 
297
308
class TestHTTPServer(tests.TestCase):
302
313
 
303
314
            protocol_version = 'HTTP/0.1'
304
315
 
305
 
        server = http_server.HttpServer(BogusRequestHandler)
306
 
        try:
307
 
            self.assertRaises(httplib.UnknownProtocol,server.setUp)
308
 
        except:
309
 
            server.tearDown()
310
 
            self.fail('HTTP Server creation did not raise UnknownProtocol')
 
316
        self.assertRaises(httplib.UnknownProtocol,
 
317
                          http_server.HttpServer, BogusRequestHandler)
311
318
 
312
319
    def test_force_invalid_protocol(self):
313
 
        server = http_server.HttpServer(protocol_version='HTTP/0.1')
314
 
        try:
315
 
            self.assertRaises(httplib.UnknownProtocol,server.setUp)
316
 
        except:
317
 
            server.tearDown()
318
 
            self.fail('HTTP Server creation did not raise UnknownProtocol')
 
320
        self.assertRaises(httplib.UnknownProtocol,
 
321
                          http_server.HttpServer, protocol_version='HTTP/0.1')
319
322
 
320
323
    def test_server_start_and_stop(self):
321
324
        server = http_server.HttpServer()
322
 
        server.setUp()
323
 
        self.assertTrue(server._http_running)
324
 
        server.tearDown()
325
 
        self.assertFalse(server._http_running)
 
325
        self.addCleanup(server.stop_server)
 
326
        server.start_server()
 
327
        self.assertTrue(server.server is not None)
 
328
        self.assertTrue(server.server.serving is not None)
 
329
        self.assertTrue(server.server.serving)
326
330
 
327
331
    def test_create_http_server_one_zero(self):
328
332
        class RequestHandlerOneZero(http_server.TestingHTTPRequestHandler):
330
334
            protocol_version = 'HTTP/1.0'
331
335
 
332
336
        server = http_server.HttpServer(RequestHandlerOneZero)
333
 
        server.setUp()
334
 
        self.addCleanup(server.tearDown)
335
 
        self.assertIsInstance(server._httpd, http_server.TestingHTTPServer)
 
337
        self.start_server(server)
 
338
        self.assertIsInstance(server.server, http_server.TestingHTTPServer)
336
339
 
337
340
    def test_create_http_server_one_one(self):
338
341
        class RequestHandlerOneOne(http_server.TestingHTTPRequestHandler):
340
343
            protocol_version = 'HTTP/1.1'
341
344
 
342
345
        server = http_server.HttpServer(RequestHandlerOneOne)
343
 
        server.setUp()
344
 
        self.addCleanup(server.tearDown)
345
 
        self.assertIsInstance(server._httpd,
 
346
        self.start_server(server)
 
347
        self.assertIsInstance(server.server,
346
348
                              http_server.TestingThreadingHTTPServer)
347
349
 
348
350
    def test_create_http_server_force_one_one(self):
352
354
 
353
355
        server = http_server.HttpServer(RequestHandlerOneZero,
354
356
                                        protocol_version='HTTP/1.1')
355
 
        server.setUp()
356
 
        self.addCleanup(server.tearDown)
357
 
        self.assertIsInstance(server._httpd,
 
357
        self.start_server(server)
 
358
        self.assertIsInstance(server.server,
358
359
                              http_server.TestingThreadingHTTPServer)
359
360
 
360
361
    def test_create_http_server_force_one_zero(self):
364
365
 
365
366
        server = http_server.HttpServer(RequestHandlerOneOne,
366
367
                                        protocol_version='HTTP/1.0')
367
 
        server.setUp()
368
 
        self.addCleanup(server.tearDown)
369
 
        self.assertIsInstance(server._httpd,
 
368
        self.start_server(server)
 
369
        self.assertIsInstance(server.server,
370
370
                              http_server.TestingHTTPServer)
371
371
 
372
372
 
374
374
    """Test case to inherit from if pycurl is present"""
375
375
 
376
376
    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')
 
377
        self.requireFeature(features.pycurl)
 
378
        return PyCurlTransport
382
379
 
383
380
    _transport = property(_get_pycurl_maybe)
384
381
 
391
388
    def test_url_parsing(self):
392
389
        f = FakeManager()
393
390
        url = http.extract_auth('http://example.com', f)
394
 
        self.assertEquals('http://example.com', url)
395
 
        self.assertEquals(0, len(f.credentials))
 
391
        self.assertEqual('http://example.com', url)
 
392
        self.assertEqual(0, len(f.credentials))
396
393
        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])
 
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])
402
399
 
403
400
 
404
401
class TestHttpTransportUrls(tests.TestCase):
431
428
    def test_http_impl_urls(self):
432
429
        """There are servers which ask for particular clients to connect"""
433
430
        server = self._server()
 
431
        server.start_server()
434
432
        try:
435
 
            server.setUp()
436
433
            url = server.get_url()
437
 
            self.assertTrue(url.startswith('%s://' % self._qualified_prefix))
 
434
            self.assertTrue(url.startswith('%s://' % self._url_protocol))
438
435
        finally:
439
 
            server.tearDown()
 
436
            server.stop_server()
440
437
 
441
438
 
442
439
class TestHttps_pycurl(TestWithTransport_pycurl, tests.TestCase):
451
448
        https by supplying a fake version_info that do not
452
449
        support it.
453
450
        """
454
 
        try:
455
 
            import pycurl
456
 
        except ImportError:
457
 
            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
458
454
 
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
 
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')
482
473
 
483
474
 
484
475
class TestHTTPConnections(http_utils.TestCaseWithWebserver):
491
482
 
492
483
    def test_http_has(self):
493
484
        server = self.get_readonly_server()
494
 
        t = self._transport(server.get_url())
 
485
        t = self.get_readonly_transport()
495
486
        self.assertEqual(t.has('foo/bar'), True)
496
487
        self.assertEqual(len(server.logs), 1)
497
488
        self.assertContainsRe(server.logs[0],
499
490
 
500
491
    def test_http_has_not_found(self):
501
492
        server = self.get_readonly_server()
502
 
        t = self._transport(server.get_url())
 
493
        t = self.get_readonly_transport()
503
494
        self.assertEqual(t.has('not-found'), False)
504
495
        self.assertContainsRe(server.logs[1],
505
496
            r'"HEAD /not-found HTTP/1.." 404 - "-" "bzr/')
506
497
 
507
498
    def test_http_get(self):
508
499
        server = self.get_readonly_server()
509
 
        t = self._transport(server.get_url())
 
500
        t = self.get_readonly_transport()
510
501
        fp = t.get('foo/bar')
511
502
        self.assertEqualDiff(
512
503
            fp.read(),
535
526
    """Test registrations of various http implementations"""
536
527
 
537
528
    def test_http_registered(self):
538
 
        t = transport.get_transport('%s://foo.com/' % self._qualified_prefix)
 
529
        t = transport.get_transport('%s://foo.com/' % self._url_protocol)
539
530
        self.assertIsInstance(t, transport.Transport)
540
531
        self.assertIsInstance(t, self._transport)
541
532
 
543
534
class TestPost(tests.TestCase):
544
535
 
545
536
    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)
551
 
        http_transport = self._transport(url)
 
537
        server = RecordingServer(expect_body_tail='end-of-body',
 
538
                                 scheme=self._url_protocol)
 
539
        self.start_server(server)
 
540
        url = server.get_url()
 
541
        # FIXME: needs a cleanup -- vila 20100611
 
542
        http_transport = transport.get_transport(url)
552
543
        code, response = http_transport._post('abc def end-of-body')
553
544
        self.assertTrue(
554
545
            server.received_bytes.startswith('POST /.bzr/smart HTTP/1.'))
598
589
    _req_handler_class = http_server.TestingHTTPRequestHandler
599
590
 
600
591
    def create_transport_readonly_server(self):
601
 
        return http_server.HttpServer(self._req_handler_class,
602
 
                                      protocol_version=self._protocol_version)
 
592
        server = http_server.HttpServer(self._req_handler_class,
 
593
                                        protocol_version=self._protocol_version)
 
594
        server._url_protocol = self._url_protocol
 
595
        return server
603
596
 
604
597
    def _testing_pycurl(self):
605
 
        return pycurl_present and self._transport == PyCurlTransport
 
598
        # TODO: This is duplicated for lots of the classes in this file
 
599
        return (features.pycurl.available()
 
600
                and self._transport == PyCurlTransport)
606
601
 
607
602
 
608
603
class WallRequestHandler(http_server.TestingHTTPRequestHandler):
609
604
    """Whatever request comes in, close the connection"""
610
605
 
611
 
    def handle_one_request(self):
 
606
    def _handle_one_request(self):
612
607
        """Handle a single HTTP request, by abruptly closing the connection"""
613
608
        self.close_connection = 1
614
609
 
619
614
    _req_handler_class = WallRequestHandler
620
615
 
621
616
    def test_http_has(self):
622
 
        server = self.get_readonly_server()
623
 
        t = self._transport(server.get_url())
 
617
        t = self.get_readonly_transport()
624
618
        # Unfortunately httplib (see HTTPResponse._read_status
625
619
        # for details) make no distinction between a closed
626
620
        # socket and badly formatted status line, so we can't
632
626
                          t.has, 'foo/bar')
633
627
 
634
628
    def test_http_get(self):
635
 
        server = self.get_readonly_server()
636
 
        t = self._transport(server.get_url())
 
629
        t = self.get_readonly_transport()
637
630
        self.assertRaises((errors.ConnectionError, errors.ConnectionReset,
638
631
                           errors.InvalidHttpResponse),
639
632
                          t.get, 'foo/bar')
656
649
    _req_handler_class = BadStatusRequestHandler
657
650
 
658
651
    def test_http_has(self):
659
 
        server = self.get_readonly_server()
660
 
        t = self._transport(server.get_url())
 
652
        t = self.get_readonly_transport()
661
653
        self.assertRaises(errors.InvalidHttpResponse, t.has, 'foo/bar')
662
654
 
663
655
    def test_http_get(self):
664
 
        server = self.get_readonly_server()
665
 
        t = self._transport(server.get_url())
 
656
        t = self.get_readonly_transport()
666
657
        self.assertRaises(errors.InvalidHttpResponse, t.get, 'foo/bar')
667
658
 
668
659
 
673
664
        """Fakes handling a single HTTP request, returns a bad status"""
674
665
        ignored = http_server.TestingHTTPRequestHandler.parse_request(self)
675
666
        self.wfile.write("Invalid status line\r\n")
 
667
        # If we don't close the connection pycurl will hang. Since this is a
 
668
        # stress test we don't *have* to respect the protocol, but we don't
 
669
        # have to sabotage it too much either.
 
670
        self.close_connection = True
676
671
        return False
677
672
 
678
673
 
684
679
 
685
680
    _req_handler_class = InvalidStatusRequestHandler
686
681
 
687
 
    def test_http_has(self):
688
 
        if self._testing_pycurl() and self._protocol_version == 'HTTP/1.1':
689
 
            raise tests.KnownFailure(
690
 
                'pycurl hangs if the server send back garbage')
691
 
        super(TestInvalidStatusServer, self).test_http_has()
692
 
 
693
 
    def test_http_get(self):
694
 
        if self._testing_pycurl() and self._protocol_version == 'HTTP/1.1':
695
 
            raise tests.KnownFailure(
696
 
                'pycurl hangs if the server send back garbage')
697
 
        super(TestInvalidStatusServer, self).test_http_get()
698
 
 
699
682
 
700
683
class BadProtocolRequestHandler(http_server.TestingHTTPRequestHandler):
701
684
    """Whatever request comes in, returns a bad protocol version"""
717
700
    _req_handler_class = BadProtocolRequestHandler
718
701
 
719
702
    def setUp(self):
720
 
        if pycurl_present and self._transport == PyCurlTransport:
 
703
        if self._testing_pycurl():
721
704
            raise tests.TestNotApplicable(
722
705
                "pycurl doesn't check the protocol version")
723
706
        super(TestBadProtocolServer, self).setUp()
724
707
 
725
708
    def test_http_has(self):
726
 
        server = self.get_readonly_server()
727
 
        t = self._transport(server.get_url())
 
709
        t = self.get_readonly_transport()
728
710
        self.assertRaises(errors.InvalidHttpResponse, t.has, 'foo/bar')
729
711
 
730
712
    def test_http_get(self):
731
 
        server = self.get_readonly_server()
732
 
        t = self._transport(server.get_url())
 
713
        t = self.get_readonly_transport()
733
714
        self.assertRaises(errors.InvalidHttpResponse, t.get, 'foo/bar')
734
715
 
735
716
 
749
730
    _req_handler_class = ForbiddenRequestHandler
750
731
 
751
732
    def test_http_has(self):
752
 
        server = self.get_readonly_server()
753
 
        t = self._transport(server.get_url())
 
733
        t = self.get_readonly_transport()
754
734
        self.assertRaises(errors.TransportError, t.has, 'foo/bar')
755
735
 
756
736
    def test_http_get(self):
757
 
        server = self.get_readonly_server()
758
 
        t = self._transport(server.get_url())
 
737
        t = self.get_readonly_transport()
759
738
        self.assertRaises(errors.TransportError, t.get, 'foo/bar')
760
739
 
761
740
 
767
746
        self.assertEqual(None, server.host)
768
747
        self.assertEqual(None, server.port)
769
748
 
770
 
    def test_setUp_and_tearDown(self):
 
749
    def test_setUp_and_stop(self):
771
750
        server = RecordingServer(expect_body_tail=None)
772
 
        server.setUp()
 
751
        server.start_server()
773
752
        try:
774
753
            self.assertNotEqual(None, server.host)
775
754
            self.assertNotEqual(None, server.port)
776
755
        finally:
777
 
            server.tearDown()
 
756
            server.stop_server()
778
757
        self.assertEqual(None, server.host)
779
758
        self.assertEqual(None, server.port)
780
759
 
781
760
    def test_send_receive_bytes(self):
782
 
        server = RecordingServer(expect_body_tail='c')
783
 
        server.setUp()
784
 
        self.addCleanup(server.tearDown)
 
761
        server = RecordingServer(expect_body_tail='c', scheme='http')
 
762
        self.start_server(server)
785
763
        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
786
764
        sock.connect((server.host, server.port))
787
765
        sock.sendall('abc')
801
779
        self.build_tree_contents([('a', '0123456789')],)
802
780
 
803
781
    def test_readv(self):
804
 
        server = self.get_readonly_server()
805
 
        t = self._transport(server.get_url())
 
782
        t = self.get_readonly_transport()
806
783
        l = list(t.readv('a', ((0, 1), (1, 1), (3, 2), (9, 1))))
807
784
        self.assertEqual(l[0], (0, '0'))
808
785
        self.assertEqual(l[1], (1, '1'))
810
787
        self.assertEqual(l[3], (9, '9'))
811
788
 
812
789
    def test_readv_out_of_order(self):
813
 
        server = self.get_readonly_server()
814
 
        t = self._transport(server.get_url())
 
790
        t = self.get_readonly_transport()
815
791
        l = list(t.readv('a', ((1, 1), (9, 1), (0, 1), (3, 2))))
816
792
        self.assertEqual(l[0], (1, '1'))
817
793
        self.assertEqual(l[1], (9, '9'))
819
795
        self.assertEqual(l[3], (3, '34'))
820
796
 
821
797
    def test_readv_invalid_ranges(self):
822
 
        server = self.get_readonly_server()
823
 
        t = self._transport(server.get_url())
 
798
        t = self.get_readonly_transport()
824
799
 
825
800
        # This is intentionally reading off the end of the file
826
801
        # since we are sure that it cannot get there
834
809
 
835
810
    def test_readv_multiple_get_requests(self):
836
811
        server = self.get_readonly_server()
837
 
        t = self._transport(server.get_url())
 
812
        t = self.get_readonly_transport()
838
813
        # force transport to issue multiple requests
839
814
        t._max_readv_combine = 1
840
815
        t._max_get_ranges = 1
848
823
 
849
824
    def test_readv_get_max_size(self):
850
825
        server = self.get_readonly_server()
851
 
        t = self._transport(server.get_url())
 
826
        t = self.get_readonly_transport()
852
827
        # force transport to issue multiple requests by limiting the number of
853
828
        # bytes by request. Note that this apply to coalesced offsets only, a
854
829
        # single range will keep its size even if bigger than the limit.
863
838
 
864
839
    def test_complete_readv_leave_pipe_clean(self):
865
840
        server = self.get_readonly_server()
866
 
        t = self._transport(server.get_url())
 
841
        t = self.get_readonly_transport()
867
842
        # force transport to issue multiple requests
868
843
        t._get_max_size = 2
869
844
        l = list(t.readv('a', ((0, 1), (1, 1), (2, 4), (6, 4))))
874
849
 
875
850
    def test_incomplete_readv_leave_pipe_clean(self):
876
851
        server = self.get_readonly_server()
877
 
        t = self._transport(server.get_url())
 
852
        t = self.get_readonly_transport()
878
853
        # force transport to issue multiple requests
879
854
        t._get_max_size = 2
880
855
        # Don't collapse readv results into a list so that we leave unread
1030
1005
 
1031
1006
    def test_readv_with_short_reads(self):
1032
1007
        server = self.get_readonly_server()
1033
 
        t = self._transport(server.get_url())
 
1008
        t = self.get_readonly_transport()
1034
1009
        # Force separate ranges for each offset
1035
1010
        t._bytes_to_read_before_seek = 0
1036
1011
        ireadv = iter(t.readv('a', ((0, 1), (2, 1), (4, 2), (9, 1))))
1087
1062
        return LimitedRangeHTTPServer(range_limit=self.range_limit,
1088
1063
                                      protocol_version=self._protocol_version)
1089
1064
 
1090
 
    def get_transport(self):
1091
 
        return self._transport(self.get_readonly_server().get_url())
1092
 
 
1093
1065
    def setUp(self):
1094
1066
        http_utils.TestCaseWithWebserver.setUp(self)
1095
1067
        # We need to manipulate ranges that correspond to real chunks in the
1099
1071
        self.build_tree_contents([('a', content)],)
1100
1072
 
1101
1073
    def test_few_ranges(self):
1102
 
        t = self.get_transport()
 
1074
        t = self.get_readonly_transport()
1103
1075
        l = list(t.readv('a', ((0, 4), (1024, 4), )))
1104
1076
        self.assertEqual(l[0], (0, '0000'))
1105
1077
        self.assertEqual(l[1], (1024, '0001'))
1106
1078
        self.assertEqual(1, self.get_readonly_server().GET_request_nb)
1107
1079
 
1108
1080
    def test_more_ranges(self):
1109
 
        t = self.get_transport()
 
1081
        t = self.get_readonly_transport()
1110
1082
        l = list(t.readv('a', ((0, 4), (1024, 4), (4096, 4), (8192, 4))))
1111
1083
        self.assertEqual(l[0], (0, '0000'))
1112
1084
        self.assertEqual(l[1], (1024, '0001'))
1126
1098
    def setUp(self):
1127
1099
        tests.TestCase.setUp(self)
1128
1100
        self._old_env = {}
1129
 
 
1130
 
    def tearDown(self):
1131
 
        self._restore_env()
1132
 
        tests.TestCase.tearDown(self)
 
1101
        self.addCleanup(self._restore_env)
1133
1102
 
1134
1103
    def _install_env(self, env):
1135
1104
        for name, value in env.iteritems():
1166
1135
    """
1167
1136
 
1168
1137
    # FIXME: We don't have an https server available, so we don't
1169
 
    # test https connections.
 
1138
    # test https connections. --vila toolongago
1170
1139
 
1171
1140
    def setUp(self):
1172
1141
        super(TestProxyHttpServer, self).setUp()
 
1142
        self.transport_secondary_server = http_utils.ProxyServer
1173
1143
        self.build_tree_contents([('foo', 'contents of foo\n'),
1174
1144
                                  ('foo-proxied', 'proxied contents of foo\n')])
1175
1145
        # Let's setup some attributes for tests
1176
 
        self.server = self.get_readonly_server()
1177
 
        self.proxy_address = '%s:%d' % (self.server.host, self.server.port)
 
1146
        server = self.get_readonly_server()
 
1147
        self.server_host_port = '%s:%d' % (server.host, server.port)
1178
1148
        if self._testing_pycurl():
1179
1149
            # Oh my ! pycurl does not check for the port as part of
1180
1150
            # no_proxy :-( So we just test the host part
1181
 
            self.no_proxy_host = 'localhost'
 
1151
            self.no_proxy_host = server.host
1182
1152
        else:
1183
 
            self.no_proxy_host = self.proxy_address
 
1153
            self.no_proxy_host = self.server_host_port
1184
1154
        # The secondary server is the proxy
1185
 
        self.proxy = self.get_secondary_server()
1186
 
        self.proxy_url = self.proxy.get_url()
 
1155
        self.proxy_url = self.get_secondary_url()
1187
1156
        self._old_env = {}
1188
1157
 
1189
1158
    def _testing_pycurl(self):
1190
 
        return pycurl_present and self._transport == PyCurlTransport
1191
 
 
1192
 
    def create_transport_secondary_server(self):
1193
 
        """Creates an http server that will serve files with
1194
 
        '-proxied' appended to their names.
1195
 
        """
1196
 
        return http_utils.ProxyServer(protocol_version=self._protocol_version)
 
1159
        # TODO: This is duplicated for lots of the classes in this file
 
1160
        return (features.pycurl.available()
 
1161
                and self._transport == PyCurlTransport)
1197
1162
 
1198
1163
    def _install_env(self, env):
1199
1164
        for name, value in env.iteritems():
1205
1170
 
1206
1171
    def proxied_in_env(self, env):
1207
1172
        self._install_env(env)
1208
 
        url = self.server.get_url()
1209
 
        t = self._transport(url)
 
1173
        t = self.get_readonly_transport()
1210
1174
        try:
1211
1175
            self.assertEqual('proxied contents of foo\n', t.get('foo').read())
1212
1176
        finally:
1214
1178
 
1215
1179
    def not_proxied_in_env(self, env):
1216
1180
        self._install_env(env)
1217
 
        url = self.server.get_url()
1218
 
        t = self._transport(url)
 
1181
        t = self.get_readonly_transport()
1219
1182
        try:
1220
1183
            self.assertEqual('contents of foo\n', t.get('foo').read())
1221
1184
        finally:
1263
1226
            # pycurl *ignores* invalid proxy env variables. If that ever change
1264
1227
            # in the future, this test will fail indicating that pycurl do not
1265
1228
            # ignore anymore such variables.
1266
 
            self.not_proxied_in_env({'http_proxy': self.proxy_address})
 
1229
            self.not_proxied_in_env({'http_proxy': self.server_host_port})
1267
1230
        else:
1268
1231
            self.assertRaises(errors.InvalidURL,
1269
1232
                              self.proxied_in_env,
1270
 
                              {'http_proxy': self.proxy_address})
 
1233
                              {'http_proxy': self.server_host_port})
1271
1234
 
1272
1235
 
1273
1236
class TestRanges(http_utils.TestCaseWithWebserver):
1276
1239
    def setUp(self):
1277
1240
        http_utils.TestCaseWithWebserver.setUp(self)
1278
1241
        self.build_tree_contents([('a', '0123456789')],)
1279
 
        server = self.get_readonly_server()
1280
 
        self.transport = self._transport(server.get_url())
1281
1242
 
1282
1243
    def create_transport_readonly_server(self):
1283
1244
        return http_server.HttpServer(protocol_version=self._protocol_version)
1284
1245
 
1285
1246
    def _file_contents(self, relpath, ranges):
 
1247
        t = self.get_readonly_transport()
1286
1248
        offsets = [ (start, end - start + 1) for start, end in ranges]
1287
 
        coalesce = self.transport._coalesce_offsets
 
1249
        coalesce = t._coalesce_offsets
1288
1250
        coalesced = list(coalesce(offsets, limit=0, fudge_factor=0))
1289
 
        code, data = self.transport._get(relpath, coalesced)
 
1251
        code, data = t._get(relpath, coalesced)
1290
1252
        self.assertTrue(code in (200, 206),'_get returns: %d' % code)
1291
1253
        for start, end in ranges:
1292
1254
            data.seek(start)
1293
1255
            yield data.read(end - start + 1)
1294
1256
 
1295
1257
    def _file_tail(self, relpath, tail_amount):
1296
 
        code, data = self.transport._get(relpath, [], tail_amount)
 
1258
        t = self.get_readonly_transport()
 
1259
        code, data = t._get(relpath, [], tail_amount)
1297
1260
        self.assertTrue(code in (200, 206),'_get returns: %d' % code)
1298
1261
        data.seek(-tail_amount, 2)
1299
1262
        return data.read(tail_amount)
1318
1281
class TestHTTPRedirections(http_utils.TestCaseWithRedirectedWebserver):
1319
1282
    """Test redirection between http servers."""
1320
1283
 
1321
 
    def create_transport_secondary_server(self):
1322
 
        """Create the secondary server redirecting to the primary server"""
1323
 
        new = self.get_readonly_server()
1324
 
 
1325
 
        redirecting = http_utils.HTTPServerRedirecting(
1326
 
            protocol_version=self._protocol_version)
1327
 
        redirecting.redirect_to(new.host, new.port)
1328
 
        return redirecting
1329
 
 
1330
1284
    def setUp(self):
1331
1285
        super(TestHTTPRedirections, self).setUp()
1332
1286
        self.build_tree_contents([('a', '0123456789'),
1333
1287
                                  ('bundle',
1334
1288
                                  '# Bazaar revision bundle v0.9\n#\n')
1335
1289
                                  ],)
1336
 
        # The requests to the old server will be redirected to the new server
1337
 
        self.old_transport = self._transport(self.old_server.get_url())
1338
1290
 
1339
1291
    def test_redirected(self):
1340
 
        self.assertRaises(errors.RedirectRequested, self.old_transport.get, 'a')
1341
 
        t = self._transport(self.new_server.get_url())
1342
 
        self.assertEqual('0123456789', t.get('a').read())
1343
 
 
1344
 
    def test_read_redirected_bundle_from_url(self):
1345
 
        from bzrlib.bundle import read_bundle_from_url
1346
 
        url = self.old_transport.abspath('bundle')
1347
 
        bundle = self.applyDeprecated(deprecated_in((1, 12, 0)),
1348
 
                read_bundle_from_url, url)
1349
 
        # If read_bundle_from_url was successful we get an empty bundle
1350
 
        self.assertEqual([], bundle.revisions)
 
1292
        self.assertRaises(errors.RedirectRequested,
 
1293
                          self.get_old_transport().get, 'a')
 
1294
        self.assertEqual('0123456789', self.get_new_transport().get('a').read())
1351
1295
 
1352
1296
 
1353
1297
class RedirectedRequest(_urllib2_wrappers.Request):
1366
1310
        self.follow_redirections = True
1367
1311
 
1368
1312
 
 
1313
def install_redirected_request(test):
 
1314
    test.overrideAttr(_urllib2_wrappers, 'Request', RedirectedRequest)
 
1315
 
 
1316
 
 
1317
def cleanup_http_redirection_connections(test):
 
1318
    # Some sockets are opened but never seen by _urllib, so we trap them at
 
1319
    # the _urllib2_wrappers level to be able to clean them up.
 
1320
    def socket_disconnect(sock):
 
1321
        try:
 
1322
            sock.shutdown(socket.SHUT_RDWR)
 
1323
            sock.close()
 
1324
        except socket.error:
 
1325
            pass
 
1326
    def connect(connection):
 
1327
        test.http_connect_orig(connection)
 
1328
        test.addCleanup(socket_disconnect, connection.sock)
 
1329
    test.http_connect_orig = test.overrideAttr(
 
1330
        _urllib2_wrappers.HTTPConnection, 'connect', connect)
 
1331
    def connect(connection):
 
1332
        test.https_connect_orig(connection)
 
1333
        test.addCleanup(socket_disconnect, connection.sock)
 
1334
    test.https_connect_orig = test.overrideAttr(
 
1335
        _urllib2_wrappers.HTTPSConnection, 'connect', connect)
 
1336
 
 
1337
 
1369
1338
class TestHTTPSilentRedirections(http_utils.TestCaseWithRedirectedWebserver):
1370
1339
    """Test redirections.
1371
1340
 
1381
1350
    """
1382
1351
 
1383
1352
    def setUp(self):
1384
 
        if pycurl_present and self._transport == PyCurlTransport:
 
1353
        if (features.pycurl.available()
 
1354
            and self._transport == PyCurlTransport):
1385
1355
            raise tests.TestNotApplicable(
1386
 
                "pycurl doesn't redirect silently annymore")
 
1356
                "pycurl doesn't redirect silently anymore")
1387
1357
        super(TestHTTPSilentRedirections, self).setUp()
1388
 
        self.setup_redirected_request()
1389
 
        self.addCleanup(self.cleanup_redirected_request)
 
1358
        install_redirected_request(self)
 
1359
        cleanup_http_redirection_connections(self)
1390
1360
        self.build_tree_contents([('a','a'),
1391
1361
                                  ('1/',),
1392
1362
                                  ('1/a', 'redirected once'),
1400
1370
                                  ('5/a', 'redirected 5 times'),
1401
1371
                                  ],)
1402
1372
 
1403
 
        self.old_transport = self._transport(self.old_server.get_url())
1404
 
 
1405
 
    def setup_redirected_request(self):
1406
 
        self.original_class = _urllib2_wrappers.Request
1407
 
        _urllib2_wrappers.Request = RedirectedRequest
1408
 
 
1409
 
    def cleanup_redirected_request(self):
1410
 
        _urllib2_wrappers.Request = self.original_class
1411
 
 
1412
 
    def create_transport_secondary_server(self):
1413
 
        """Create the secondary server, redirections are defined in the tests"""
1414
 
        return http_utils.HTTPServerRedirecting(
1415
 
            protocol_version=self._protocol_version)
1416
 
 
1417
1373
    def test_one_redirection(self):
1418
 
        t = self.old_transport
1419
 
 
1420
 
        req = RedirectedRequest('GET', t.abspath('a'))
1421
 
        req.follow_redirections = True
 
1374
        t = self.get_old_transport()
 
1375
        req = RedirectedRequest('GET', t._remote_path('a'))
1422
1376
        new_prefix = 'http://%s:%s' % (self.new_server.host,
1423
1377
                                       self.new_server.port)
1424
1378
        self.old_server.redirections = \
1425
1379
            [('(.*)', r'%s/1\1' % (new_prefix), 301),]
1426
 
        self.assertEquals('redirected once',t._perform(req).read())
 
1380
        self.assertEqual('redirected once', t._perform(req).read())
1427
1381
 
1428
1382
    def test_five_redirections(self):
1429
 
        t = self.old_transport
1430
 
 
1431
 
        req = RedirectedRequest('GET', t.abspath('a'))
1432
 
        req.follow_redirections = True
 
1383
        t = self.get_old_transport()
 
1384
        req = RedirectedRequest('GET', t._remote_path('a'))
1433
1385
        old_prefix = 'http://%s:%s' % (self.old_server.host,
1434
1386
                                       self.old_server.port)
1435
1387
        new_prefix = 'http://%s:%s' % (self.new_server.host,
1441
1393
            ('/4(.*)', r'%s/5\1' % (new_prefix), 301),
1442
1394
            ('(/[^/]+)', r'%s/1\1' % (old_prefix), 301),
1443
1395
            ]
1444
 
        self.assertEquals('redirected 5 times',t._perform(req).read())
 
1396
        self.assertEqual('redirected 5 times', t._perform(req).read())
1445
1397
 
1446
1398
 
1447
1399
class TestDoCatchRedirections(http_utils.TestCaseWithRedirectedWebserver):
1450
1402
    def setUp(self):
1451
1403
        super(TestDoCatchRedirections, self).setUp()
1452
1404
        self.build_tree_contents([('a', '0123456789'),],)
1453
 
 
1454
 
        self.old_transport = self._transport(self.old_server.get_url())
1455
 
 
1456
 
    def get_a(self, transport):
1457
 
        return transport.get('a')
 
1405
        cleanup_http_redirection_connections(self)
 
1406
 
 
1407
        self.old_transport = self.get_old_transport()
 
1408
 
 
1409
    def get_a(self, t):
 
1410
        return t.get('a')
1458
1411
 
1459
1412
    def test_no_redirection(self):
1460
 
        t = self._transport(self.new_server.get_url())
 
1413
        t = self.get_new_transport()
1461
1414
 
1462
1415
        # We use None for redirected so that we fail if redirected
1463
 
        self.assertEquals('0123456789',
1464
 
                          transport.do_catching_redirections(
 
1416
        self.assertEqual('0123456789',
 
1417
                         transport.do_catching_redirections(
1465
1418
                self.get_a, t, None).read())
1466
1419
 
1467
1420
    def test_one_redirection(self):
1468
1421
        self.redirections = 0
1469
1422
 
1470
 
        def redirected(transport, exception, redirection_notice):
 
1423
        def redirected(t, exception, redirection_notice):
1471
1424
            self.redirections += 1
1472
 
            dir, file = urlutils.split(exception.target)
1473
 
            return self._transport(dir)
 
1425
            redirected_t = t._redirected_to(exception.source, exception.target)
 
1426
            return redirected_t
1474
1427
 
1475
 
        self.assertEquals('0123456789',
1476
 
                          transport.do_catching_redirections(
 
1428
        self.assertEqual('0123456789',
 
1429
                         transport.do_catching_redirections(
1477
1430
                self.get_a, self.old_transport, redirected).read())
1478
 
        self.assertEquals(1, self.redirections)
 
1431
        self.assertEqual(1, self.redirections)
1479
1432
 
1480
1433
    def test_redirection_loop(self):
1481
1434
 
1506
1459
                                  ('b', 'contents of b\n'),])
1507
1460
 
1508
1461
    def create_transport_readonly_server(self):
1509
 
        return self._auth_server(protocol_version=self._protocol_version)
 
1462
        server = self._auth_server(protocol_version=self._protocol_version)
 
1463
        server._url_protocol = self._url_protocol
 
1464
        return server
1510
1465
 
1511
1466
    def _testing_pycurl(self):
1512
 
        return pycurl_present and self._transport == PyCurlTransport
 
1467
        # TODO: This is duplicated for lots of the classes in this file
 
1468
        return (features.pycurl.available()
 
1469
                and self._transport == PyCurlTransport)
1513
1470
 
1514
1471
    def get_user_url(self, user, password):
1515
1472
        """Build an url embedding user and password"""
1523
1480
        return url
1524
1481
 
1525
1482
    def get_user_transport(self, user, password):
1526
 
        return self._transport(self.get_user_url(user, password))
 
1483
        t = transport.get_transport(self.get_user_url(user, password))
 
1484
        return t
1527
1485
 
1528
1486
    def test_no_user(self):
1529
1487
        self.server.add_user('joe', 'foo')
1580
1538
        self.assertEqual('', ui.ui_factory.stdin.readline())
1581
1539
        stderr.seek(0)
1582
1540
        expected_prompt = self._expected_username_prompt(t._unqualified_scheme)
1583
 
        self.assertEquals(expected_prompt, stderr.read(len(expected_prompt)))
1584
 
        self.assertEquals('', stdout.getvalue())
 
1541
        self.assertEqual(expected_prompt, stderr.read(len(expected_prompt)))
 
1542
        self.assertEqual('', stdout.getvalue())
1585
1543
        self._check_password_prompt(t._unqualified_scheme, 'joe',
1586
1544
                                    stderr.readline())
1587
1545
 
1602
1560
        self.assertEqual('', ui.ui_factory.stdin.readline())
1603
1561
        self._check_password_prompt(t._unqualified_scheme, 'joe',
1604
1562
                                    stderr.getvalue())
1605
 
        self.assertEquals('', stdout.getvalue())
 
1563
        self.assertEqual('', stdout.getvalue())
1606
1564
        # And we shouldn't prompt again for a different request
1607
1565
        # against the same transport.
1608
1566
        self.assertEqual('contents of b\n',t.get('b').read())
1618
1576
                              % (scheme.upper(),
1619
1577
                                 user, self.server.host, self.server.port,
1620
1578
                                 self.server.auth_realm)))
1621
 
        self.assertEquals(expected_prompt, actual_prompt)
 
1579
        self.assertEqual(expected_prompt, actual_prompt)
1622
1580
 
1623
1581
    def _expected_username_prompt(self, scheme):
1624
1582
        return (self._username_prompt_prefix
1638
1596
        self.server.add_user(user, password)
1639
1597
        t = self.get_user_transport(user, None)
1640
1598
        ui.ui_factory = tests.TestUIFactory(stdin=stdin_content,
1641
 
                                            stdout=tests.StringIOWrapper())
 
1599
                                            stderr=tests.StringIOWrapper())
1642
1600
        # Create a minimal config file with the right password
1643
1601
        conf = config.AuthenticationConfig()
1644
1602
        conf._get_config().update(
1714
1672
 
1715
1673
    def get_user_transport(self, user, password):
1716
1674
        self._install_env({'all_proxy': self.get_user_url(user, password)})
1717
 
        return self._transport(self.server.get_url())
 
1675
        return TestAuth.get_user_transport(self, user, password)
1718
1676
 
1719
1677
    def _install_env(self, env):
1720
1678
        for name, value in env.iteritems():
1747
1705
        self.readfile = StringIO(socket_read_content)
1748
1706
        self.writefile = StringIO()
1749
1707
        self.writefile.close = lambda: None
 
1708
        self.close = lambda: None
1750
1709
 
1751
1710
    def makefile(self, mode='r', bufsize=None):
1752
1711
        if 'r' in mode:
1762
1721
        # We use the VFS layer as part of HTTP tunnelling tests.
1763
1722
        self._captureVar('BZR_NO_SMART_VFS', None)
1764
1723
        self.transport_readonly_server = http_utils.HTTPServerWithSmarts
 
1724
        self.http_server = self.get_readonly_server()
1765
1725
 
1766
1726
    def create_transport_readonly_server(self):
1767
 
        return http_utils.HTTPServerWithSmarts(
 
1727
        server = http_utils.HTTPServerWithSmarts(
1768
1728
            protocol_version=self._protocol_version)
 
1729
        server._url_protocol = self._url_protocol
 
1730
        return server
1769
1731
 
1770
1732
    def test_open_bzrdir(self):
1771
1733
        branch = self.make_branch('relpath')
1772
 
        http_server = self.get_readonly_server()
1773
 
        url = http_server.get_url() + 'relpath'
 
1734
        url = self.http_server.get_url() + 'relpath'
1774
1735
        bd = bzrdir.BzrDir.open(url)
 
1736
        self.addCleanup(bd.transport.disconnect)
1775
1737
        self.assertIsInstance(bd, _mod_remote.RemoteBzrDir)
1776
1738
 
1777
1739
    def test_bulk_data(self):
1779
1741
        # The 'readv' command in the smart protocol both sends and receives
1780
1742
        # bulk data, so we use that.
1781
1743
        self.build_tree(['data-file'])
1782
 
        http_server = self.get_readonly_server()
1783
 
        http_transport = self._transport(http_server.get_url())
 
1744
        http_transport = transport.get_transport(self.http_server.get_url())
1784
1745
        medium = http_transport.get_smart_medium()
1785
1746
        # Since we provide the medium, the url below will be mostly ignored
1786
1747
        # during the test, as long as the path is '/'.
1794
1755
        post_body = 'hello\n'
1795
1756
        expected_reply_body = 'ok\x012\n'
1796
1757
 
1797
 
        http_server = self.get_readonly_server()
1798
 
        http_transport = self._transport(http_server.get_url())
 
1758
        http_transport = transport.get_transport(self.http_server.get_url())
1799
1759
        medium = http_transport.get_smart_medium()
1800
1760
        response = medium.send_http_smart_request(post_body)
1801
1761
        reply_body = response.read()
1802
1762
        self.assertEqual(expected_reply_body, reply_body)
1803
1763
 
1804
1764
    def test_smart_http_server_post_request_handler(self):
1805
 
        httpd = self.get_readonly_server()._get_httpd()
 
1765
        httpd = self.http_server.server
1806
1766
 
1807
1767
        socket = SampleSocket(
1808
1768
            'POST /.bzr/smart %s \r\n' % self._protocol_version
1840
1800
 
1841
1801
    def test_probe_smart_server(self):
1842
1802
        """Test error handling against server refusing smart requests."""
1843
 
        server = self.get_readonly_server()
1844
 
        t = self._transport(server.get_url())
 
1803
        t = self.get_readonly_transport()
1845
1804
        # No need to build a valid smart request here, the server will not even
1846
1805
        # try to interpret it.
1847
1806
        self.assertRaises(errors.SmartProtocolError,
1848
1807
                          t.get_smart_medium().send_http_smart_request,
1849
1808
                          'whatever')
1850
1809
 
 
1810
 
1851
1811
class Test_redirected_to(tests.TestCase):
1852
1812
 
1853
1813
    def test_redirected_to_subdir(self):
1856
1816
                             'http://www.example.com/foo/subdir')
1857
1817
        self.assertIsInstance(r, type(t))
1858
1818
        # Both transports share the some connection
1859
 
        self.assertEquals(t._get_connection(), r._get_connection())
 
1819
        self.assertEqual(t._get_connection(), r._get_connection())
1860
1820
 
1861
1821
    def test_redirected_to_self_with_slash(self):
1862
1822
        t = self._transport('http://www.example.com/foo')
1866
1826
        # Both transports share the some connection (one can argue that we
1867
1827
        # should return the exact same transport here, but that seems
1868
1828
        # overkill).
1869
 
        self.assertEquals(t._get_connection(), r._get_connection())
 
1829
        self.assertEqual(t._get_connection(), r._get_connection())
1870
1830
 
1871
1831
    def test_redirected_to_host(self):
1872
1832
        t = self._transport('http://www.example.com/foo')
1891
1851
        r = t._redirected_to('http://www.example.com/foo',
1892
1852
                             'https://foo.example.com/foo')
1893
1853
        self.assertIsInstance(r, type(t))
1894
 
        self.assertEquals(t._user, r._user)
 
1854
        self.assertEqual(t._user, r._user)
1895
1855
 
1896
1856
 
1897
1857
class PredefinedRequestHandler(http_server.TestingHTTPRequestHandler):
1906
1866
    line.
1907
1867
    """
1908
1868
 
1909
 
    def handle_one_request(self):
 
1869
    def _handle_one_request(self):
1910
1870
        tcs = self.server.test_case_server
1911
1871
        requestline = self.rfile.readline()
1912
1872
        headers = self.MessageClass(self.rfile, 0)
1956
1916
        pass
1957
1917
 
1958
1918
 
1959
 
class TestActivity(tests.TestCase):
 
1919
class TestActivityMixin(object):
1960
1920
    """Test socket activity reporting.
1961
1921
 
1962
1922
    We use a special purpose server to control the bytes sent and received and
1966
1926
    def setUp(self):
1967
1927
        tests.TestCase.setUp(self)
1968
1928
        self.server = self._activity_server(self._protocol_version)
1969
 
        self.server.setUp()
 
1929
        self.server.start_server()
1970
1930
        self.activities = {}
1971
1931
        def report_activity(t, bytes, direction):
1972
1932
            count = self.activities.get(direction, 0)
1976
1936
        # We override at class level because constructors may propagate the
1977
1937
        # bound method and render instance overriding ineffective (an
1978
1938
        # alternative would be to define a specific ui factory instead...)
1979
 
        self.orig_report_activity = self._transport._report_activity
1980
 
        self._transport._report_activity = report_activity
1981
 
 
1982
 
    def tearDown(self):
1983
 
        self._transport._report_activity = self.orig_report_activity
1984
 
        self.server.tearDown()
1985
 
        tests.TestCase.tearDown(self)
 
1939
        self.overrideAttr(self._transport, '_report_activity', report_activity)
 
1940
        self.addCleanup(self.server.stop_server)
1986
1941
 
1987
1942
    def get_transport(self):
1988
 
        return self._transport(self.server.get_url())
 
1943
        t = self._transport(self.server.get_url())
 
1944
        # FIXME: Needs cleanup -- vila 20100611
 
1945
        return t
1989
1946
 
1990
1947
    def assertActivitiesMatch(self):
1991
1948
        self.assertEqual(self.server.bytes_read,
2096
2053
'''
2097
2054
        t = self.get_transport()
2098
2055
        # We must send a single line of body bytes, see
2099
 
        # PredefinedRequestHandler.handle_one_request
 
2056
        # PredefinedRequestHandler._handle_one_request
2100
2057
        code, f = t._post('abc def end-of-body\n')
2101
2058
        self.assertEqual('lalala whatever as long as itsssss\n', f.read())
2102
2059
        self.assertActivitiesMatch()
 
2060
 
 
2061
 
 
2062
class TestActivity(tests.TestCase, TestActivityMixin):
 
2063
 
 
2064
    def setUp(self):
 
2065
        TestActivityMixin.setUp(self)
 
2066
 
 
2067
 
 
2068
class TestNoReportActivity(tests.TestCase, TestActivityMixin):
 
2069
 
 
2070
    # Unlike TestActivity, we are really testing ReportingFileSocket and
 
2071
    # ReportingSocket, so we don't need all the parametrization. Since
 
2072
    # ReportingFileSocket and ReportingSocket are wrappers, it's easier to
 
2073
    # test them through their use by the transport than directly (that's a
 
2074
    # bit less clean but far more simpler and effective).
 
2075
    _activity_server = ActivityHTTPServer
 
2076
    _protocol_version = 'HTTP/1.1'
 
2077
 
 
2078
    def setUp(self):
 
2079
        self._transport =_urllib.HttpTransport_urllib
 
2080
        TestActivityMixin.setUp(self)
 
2081
 
 
2082
    def assertActivitiesMatch(self):
 
2083
        # Nothing to check here
 
2084
        pass
 
2085
 
 
2086
 
 
2087
class TestAuthOnRedirected(http_utils.TestCaseWithRedirectedWebserver):
 
2088
    """Test authentication on the redirected http server."""
 
2089
 
 
2090
    _auth_header = 'Authorization'
 
2091
    _password_prompt_prefix = ''
 
2092
    _username_prompt_prefix = ''
 
2093
    _auth_server = http_utils.HTTPBasicAuthServer
 
2094
    _transport = _urllib.HttpTransport_urllib
 
2095
 
 
2096
    def setUp(self):
 
2097
        super(TestAuthOnRedirected, self).setUp()
 
2098
        self.build_tree_contents([('a','a'),
 
2099
                                  ('1/',),
 
2100
                                  ('1/a', 'redirected once'),
 
2101
                                  ],)
 
2102
        new_prefix = 'http://%s:%s' % (self.new_server.host,
 
2103
                                       self.new_server.port)
 
2104
        self.old_server.redirections = [
 
2105
            ('(.*)', r'%s/1\1' % (new_prefix), 301),]
 
2106
        self.old_transport = self.get_old_transport()
 
2107
        self.new_server.add_user('joe', 'foo')
 
2108
        cleanup_http_redirection_connections(self)
 
2109
 
 
2110
    def create_transport_readonly_server(self):
 
2111
        server = self._auth_server(protocol_version=self._protocol_version)
 
2112
        server._url_protocol = self._url_protocol
 
2113
        return server
 
2114
 
 
2115
    def get_a(self, t):
 
2116
        return t.get('a')
 
2117
 
 
2118
    def test_auth_on_redirected_via_do_catching_redirections(self):
 
2119
        self.redirections = 0
 
2120
 
 
2121
        def redirected(t, exception, redirection_notice):
 
2122
            self.redirections += 1
 
2123
            redirected_t = t._redirected_to(exception.source, exception.target)
 
2124
            self.addCleanup(redirected_t.disconnect)
 
2125
            return redirected_t
 
2126
 
 
2127
        stdout = tests.StringIOWrapper()
 
2128
        stderr = tests.StringIOWrapper()
 
2129
        ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n',
 
2130
                                            stdout=stdout, stderr=stderr)
 
2131
        self.assertEqual('redirected once',
 
2132
                         transport.do_catching_redirections(
 
2133
                self.get_a, self.old_transport, redirected).read())
 
2134
        self.assertEqual(1, self.redirections)
 
2135
        # stdin should be empty
 
2136
        self.assertEqual('', ui.ui_factory.stdin.readline())
 
2137
        # stdout should be empty, stderr will contains the prompts
 
2138
        self.assertEqual('', stdout.getvalue())
 
2139
 
 
2140
    def test_auth_on_redirected_via_following_redirections(self):
 
2141
        self.new_server.add_user('joe', 'foo')
 
2142
        stdout = tests.StringIOWrapper()
 
2143
        stderr = tests.StringIOWrapper()
 
2144
        ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n',
 
2145
                                            stdout=stdout, stderr=stderr)
 
2146
        t = self.old_transport
 
2147
        req = RedirectedRequest('GET', t.abspath('a'))
 
2148
        new_prefix = 'http://%s:%s' % (self.new_server.host,
 
2149
                                       self.new_server.port)
 
2150
        self.old_server.redirections = [
 
2151
            ('(.*)', r'%s/1\1' % (new_prefix), 301),]
 
2152
        self.assertEqual('redirected once', t._perform(req).read())
 
2153
        # stdin should be empty
 
2154
        self.assertEqual('', ui.ui_factory.stdin.readline())
 
2155
        # stdout should be empty, stderr will contains the prompts
 
2156
        self.assertEqual('', stdout.getvalue())
 
2157
 
 
2158