← 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-03 07:15:11 UTC
  • mfrom: (4580.1.2 408199-check-2a)
  • Revision ID: pqm@pqm.ubuntu.com-20090803071511-dwb041qzak0vjzdk
(mbp) check blackbox tests now handle the root being included in the
        file-id count

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