← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_http.py

  • Committer: Vincent Ladeuil
  • Date: 2009-05-15 10:14:51 UTC
  • mto: (4396.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4397.
  • Revision ID: v.ladeuil+lp@free.fr-20090515101451-bffnsywhvaskrz1h
Use stderr for UI prompt to address bug #376582.

* bzrlib/ui/__init__.py:
(CLIUIFactory.prompt): Display prompt on stderr.

* bzrlib/tests/test_ui.py: (UITests.test_text_factory_ascii_password,
UITests.test_text_factory_utf8_password,
UITests.assert_get_bool_acceptance_of_user_input,
UITests.test_text_factory_prompt,
UITests.test_silent_ui_getusername,
UITests.test_text_ui_getusername,
UITests.test_text_ui_getusername_utf8):prompt is now displayed on
stderr.

* bzrlib/tests/test_http.py:
(TestAuth.test_prompt_for_username,
TestAuth.test_prompt_for_password): prompt is now displayed on
stderr.

* bzrlib/tests/test_config.py:
(TestAuthenticationConfig._check_default_password_prompt,
TestAuthenticationConfig._check_default_username_prompt): prompt
is now displayed on stderr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_http.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
48
48
    deprecated_in,
49
49
    )
50
50
from bzrlib.tests import (
51
 
    features,
52
51
    http_server,
53
52
    http_utils,
54
53
    )
62
61
    )
63
62
 
64
63
 
65
 
if features.pycurl.available():
 
64
try:
66
65
    from bzrlib.transport.http._pycurl import PyCurlTransport
 
66
    pycurl_present = True
 
67
except errors.DependencyNotPresent:
 
68
    pycurl_present = False
67
69
 
68
70
 
69
71
def load_tests(standard_tests, module, loader):
82
84
                        _server=http_server.HttpServer_urllib,
83
85
                        _qualified_prefix='http+urllib',)),
84
86
        ]
85
 
    if features.pycurl.available():
 
87
    if pycurl_present:
86
88
        transport_scenarios.append(
87
89
            ('pycurl', dict(_transport=PyCurlTransport,
88
90
                            _server=http_server.HttpServer_PyCurl,
141
143
                                             auth_scheme_scenarios)
142
144
    tests.multiply_tests(tpa_tests, tpa_scenarios, result)
143
145
 
144
 
    # activity: on all http[s] versions on all implementations
 
146
    # activity: activity on all http versions on all implementations
145
147
    tpact_tests, remaining_tests = tests.split_suite_by_condition(
146
148
        remaining_tests, tests.condition_isinstance((
147
149
                TestActivity,
148
150
                )))
149
151
    activity_scenarios = [
150
 
        ('urllib,http', dict(_activity_server=ActivityHTTPServer,
151
 
                             _transport=_urllib.HttpTransport_urllib,)),
 
152
        ('http', dict(_activity_server=ActivityHTTPServer)),
152
153
        ]
153
154
    if tests.HTTPSServerFeature.available():
154
155
        activity_scenarios.append(
155
 
            ('urllib,https', dict(_activity_server=ActivityHTTPSServer,
156
 
                                  _transport=_urllib.HttpTransport_urllib,)),)
157
 
    if features.pycurl.available():
158
 
        activity_scenarios.append(
159
 
            ('pycurl,http', dict(_activity_server=ActivityHTTPServer,
160
 
                                 _transport=PyCurlTransport,)),)
161
 
        if tests.HTTPSServerFeature.available():
162
 
            from bzrlib.tests import (
163
 
                ssl_certs,
164
 
                )
165
 
            # FIXME: Until we have a better way to handle self-signed
166
 
            # certificates (like allowing them in a test specific
167
 
            # authentication.conf for example), we need some specialized pycurl
168
 
            # transport for tests.
169
 
            class HTTPS_pycurl_transport(PyCurlTransport):
170
 
 
171
 
                def __init__(self, base, _from_transport=None):
172
 
                    super(HTTPS_pycurl_transport, self).__init__(
173
 
                        base, _from_transport)
174
 
                    self.cabundle = str(ssl_certs.build_path('ca.crt'))
175
 
 
176
 
            activity_scenarios.append(
177
 
                ('pycurl,https', dict(_activity_server=ActivityHTTPSServer,
178
 
                                      _transport=HTTPS_pycurl_transport,)),)
179
 
 
180
 
    tpact_scenarios = tests.multiply_scenarios(activity_scenarios,
181
 
                                               protocol_scenarios)
 
156
            ('https', dict(_activity_server=ActivityHTTPSServer)))
 
157
    tpact_scenarios = tests.multiply_scenarios(tp_scenarios,
 
158
        activity_scenarios)
182
159
    tests.multiply_tests(tpact_tests, tpact_scenarios, result)
183
160
 
184
161
    # No parametrization for the remaining tests
202
179
    It records the bytes sent to it, and replies with a 200.
203
180
    """
204
181
 
205
 
    def __init__(self, expect_body_tail=None, scheme=''):
 
182
    def __init__(self, expect_body_tail=None):
206
183
        """Constructor.
207
184
 
208
185
        :type expect_body_tail: str
213
190
        self.host = None
214
191
        self.port = None
215
192
        self.received_bytes = ''
216
 
        self.scheme = scheme
217
 
 
218
 
    def get_url(self):
219
 
        return '%s://%s:%s/' % (self.scheme, self.host, self.port)
220
 
 
221
 
    def start_server(self):
 
193
 
 
194
    def setUp(self):
222
195
        self._sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
223
196
        self._sock.bind(('127.0.0.1', 0))
224
197
        self.host, self.port = self._sock.getsockname()
247
220
            # The client may have already closed the socket.
248
221
            pass
249
222
 
250
 
    def stop_server(self):
 
223
    def tearDown(self):
251
224
        try:
252
225
            self._sock.close()
253
226
        except socket.error:
267
240
 
268
241
    def test_empty_header(self):
269
242
        scheme, remainder = self.parse_header('')
270
 
        self.assertEqual('', scheme)
 
243
        self.assertEquals('', scheme)
271
244
        self.assertIs(None, remainder)
272
245
 
273
246
    def test_negotiate_header(self):
274
247
        scheme, remainder = self.parse_header('Negotiate')
275
 
        self.assertEqual('negotiate', scheme)
 
248
        self.assertEquals('negotiate', scheme)
276
249
        self.assertIs(None, remainder)
277
250
 
278
251
    def test_basic_header(self):
279
252
        scheme, remainder = self.parse_header(
280
253
            'Basic realm="Thou should not pass"')
281
 
        self.assertEqual('basic', scheme)
282
 
        self.assertEqual('realm="Thou should not pass"', remainder)
 
254
        self.assertEquals('basic', scheme)
 
255
        self.assertEquals('realm="Thou should not pass"', remainder)
283
256
 
284
257
    def test_basic_extract_realm(self):
285
258
        scheme, remainder = self.parse_header(
287
260
            _urllib2_wrappers.BasicAuthHandler)
288
261
        match, realm = self.auth_handler.extract_realm(remainder)
289
262
        self.assertTrue(match is not None)
290
 
        self.assertEqual('Thou should not pass', realm)
 
263
        self.assertEquals('Thou should not pass', realm)
291
264
 
292
265
    def test_digest_header(self):
293
266
        scheme, remainder = self.parse_header(
294
267
            'Digest realm="Thou should not pass"')
295
 
        self.assertEqual('digest', scheme)
296
 
        self.assertEqual('realm="Thou should not pass"', remainder)
 
268
        self.assertEquals('digest', scheme)
 
269
        self.assertEquals('realm="Thou should not pass"', remainder)
297
270
 
298
271
 
299
272
class TestHTTPServer(tests.TestCase):
306
279
 
307
280
        server = http_server.HttpServer(BogusRequestHandler)
308
281
        try:
309
 
            self.assertRaises(httplib.UnknownProtocol, server.start_server)
 
282
            self.assertRaises(httplib.UnknownProtocol,server.setUp)
310
283
        except:
311
 
            server.stop_server()
 
284
            server.tearDown()
312
285
            self.fail('HTTP Server creation did not raise UnknownProtocol')
313
286
 
314
287
    def test_force_invalid_protocol(self):
315
288
        server = http_server.HttpServer(protocol_version='HTTP/0.1')
316
289
        try:
317
 
            self.assertRaises(httplib.UnknownProtocol, server.start_server)
 
290
            self.assertRaises(httplib.UnknownProtocol,server.setUp)
318
291
        except:
319
 
            server.stop_server()
 
292
            server.tearDown()
320
293
            self.fail('HTTP Server creation did not raise UnknownProtocol')
321
294
 
322
295
    def test_server_start_and_stop(self):
323
296
        server = http_server.HttpServer()
324
 
        server.start_server()
325
 
        try:
326
 
            self.assertTrue(server._http_running)
327
 
        finally:
328
 
            server.stop_server()
 
297
        server.setUp()
 
298
        self.assertTrue(server._http_running)
 
299
        server.tearDown()
329
300
        self.assertFalse(server._http_running)
330
301
 
331
302
    def test_create_http_server_one_zero(self):
334
305
            protocol_version = 'HTTP/1.0'
335
306
 
336
307
        server = http_server.HttpServer(RequestHandlerOneZero)
337
 
        self.start_server(server)
 
308
        server.setUp()
 
309
        self.addCleanup(server.tearDown)
338
310
        self.assertIsInstance(server._httpd, http_server.TestingHTTPServer)
339
311
 
340
312
    def test_create_http_server_one_one(self):
343
315
            protocol_version = 'HTTP/1.1'
344
316
 
345
317
        server = http_server.HttpServer(RequestHandlerOneOne)
346
 
        self.start_server(server)
 
318
        server.setUp()
 
319
        self.addCleanup(server.tearDown)
347
320
        self.assertIsInstance(server._httpd,
348
321
                              http_server.TestingThreadingHTTPServer)
349
322
 
354
327
 
355
328
        server = http_server.HttpServer(RequestHandlerOneZero,
356
329
                                        protocol_version='HTTP/1.1')
357
 
        self.start_server(server)
 
330
        server.setUp()
 
331
        self.addCleanup(server.tearDown)
358
332
        self.assertIsInstance(server._httpd,
359
333
                              http_server.TestingThreadingHTTPServer)
360
334
 
365
339
 
366
340
        server = http_server.HttpServer(RequestHandlerOneOne,
367
341
                                        protocol_version='HTTP/1.0')
368
 
        self.start_server(server)
 
342
        server.setUp()
 
343
        self.addCleanup(server.tearDown)
369
344
        self.assertIsInstance(server._httpd,
370
345
                              http_server.TestingHTTPServer)
371
346
 
374
349
    """Test case to inherit from if pycurl is present"""
375
350
 
376
351
    def _get_pycurl_maybe(self):
377
 
        self.requireFeature(features.pycurl)
378
 
        return PyCurlTransport
 
352
        try:
 
353
            from bzrlib.transport.http._pycurl import PyCurlTransport
 
354
            return PyCurlTransport
 
355
        except errors.DependencyNotPresent:
 
356
            raise tests.TestSkipped('pycurl not present')
379
357
 
380
358
    _transport = property(_get_pycurl_maybe)
381
359
 
388
366
    def test_url_parsing(self):
389
367
        f = FakeManager()
390
368
        url = http.extract_auth('http://example.com', f)
391
 
        self.assertEqual('http://example.com', url)
392
 
        self.assertEqual(0, len(f.credentials))
 
369
        self.assertEquals('http://example.com', url)
 
370
        self.assertEquals(0, len(f.credentials))
393
371
        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])
 
372
            'http://user:pass@www.bazaar-vcs.org/bzr/bzr.dev', f)
 
373
        self.assertEquals('http://www.bazaar-vcs.org/bzr/bzr.dev', url)
 
374
        self.assertEquals(1, len(f.credentials))
 
375
        self.assertEquals([None, 'www.bazaar-vcs.org', 'user', 'pass'],
 
376
                          f.credentials[0])
399
377
 
400
378
 
401
379
class TestHttpTransportUrls(tests.TestCase):
428
406
    def test_http_impl_urls(self):
429
407
        """There are servers which ask for particular clients to connect"""
430
408
        server = self._server()
431
 
        server.start_server()
432
409
        try:
 
410
            server.setUp()
433
411
            url = server.get_url()
434
412
            self.assertTrue(url.startswith('%s://' % self._qualified_prefix))
435
413
        finally:
436
 
            server.stop_server()
 
414
            server.tearDown()
437
415
 
438
416
 
439
417
class TestHttps_pycurl(TestWithTransport_pycurl, tests.TestCase):
448
426
        https by supplying a fake version_info that do not
449
427
        support it.
450
428
        """
451
 
        self.requireFeature(features.pycurl)
452
 
        # Import the module locally now that we now it's available.
453
 
        pycurl = features.pycurl.module
 
429
        try:
 
430
            import pycurl
 
431
        except ImportError:
 
432
            raise tests.TestSkipped('pycurl not present')
454
433
 
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')
 
434
        version_info_orig = pycurl.version_info
 
435
        try:
 
436
            # Now that we have pycurl imported, we can fake its version_info
 
437
            # This was taken from a windows pycurl without SSL
 
438
            # (thanks to bialix)
 
439
            pycurl.version_info = lambda : (2,
 
440
                                            '7.13.2',
 
441
                                            462082,
 
442
                                            'i386-pc-win32',
 
443
                                            2576,
 
444
                                            None,
 
445
                                            0,
 
446
                                            None,
 
447
                                            ('ftp', 'gopher', 'telnet',
 
448
                                             'dict', 'ldap', 'http', 'file'),
 
449
                                            None,
 
450
                                            0,
 
451
                                            None)
 
452
            self.assertRaises(errors.DependencyNotPresent, self._transport,
 
453
                              'https://launchpad.net')
 
454
        finally:
 
455
            # Restore the right function
 
456
            pycurl.version_info = version_info_orig
473
457
 
474
458
 
475
459
class TestHTTPConnections(http_utils.TestCaseWithWebserver):
534
518
class TestPost(tests.TestCase):
535
519
 
536
520
    def test_post_body_is_received(self):
537
 
        server = RecordingServer(expect_body_tail='end-of-body',
538
 
            scheme=self._qualified_prefix)
539
 
        self.start_server(server)
540
 
        url = server.get_url()
 
521
        server = RecordingServer(expect_body_tail='end-of-body')
 
522
        server.setUp()
 
523
        self.addCleanup(server.tearDown)
 
524
        scheme = self._qualified_prefix
 
525
        url = '%s://%s:%s/' % (scheme, server.host, server.port)
541
526
        http_transport = self._transport(url)
542
527
        code, response = http_transport._post('abc def end-of-body')
543
528
        self.assertTrue(
592
577
                                      protocol_version=self._protocol_version)
593
578
 
594
579
    def _testing_pycurl(self):
595
 
        # TODO: This is duplicated for lots of the classes in this file
596
 
        return (features.pycurl.available()
597
 
                and self._transport == PyCurlTransport)
 
580
        return pycurl_present and self._transport == PyCurlTransport
598
581
 
599
582
 
600
583
class WallRequestHandler(http_server.TestingHTTPRequestHandler):
617
600
        # for details) make no distinction between a closed
618
601
        # socket and badly formatted status line, so we can't
619
602
        # just test for ConnectionError, we have to test
620
 
        # InvalidHttpResponse too. And pycurl may raise ConnectionReset
621
 
        # instead of ConnectionError too.
622
 
        self.assertRaises(( errors.ConnectionError, errors.ConnectionReset,
623
 
                            errors.InvalidHttpResponse),
 
603
        # InvalidHttpResponse too.
 
604
        self.assertRaises((errors.ConnectionError, errors.InvalidHttpResponse),
624
605
                          t.has, 'foo/bar')
625
606
 
626
607
    def test_http_get(self):
627
608
        server = self.get_readonly_server()
628
609
        t = self._transport(server.get_url())
629
 
        self.assertRaises((errors.ConnectionError, errors.ConnectionReset,
630
 
                           errors.InvalidHttpResponse),
 
610
        self.assertRaises((errors.ConnectionError, errors.InvalidHttpResponse),
631
611
                          t.get, 'foo/bar')
632
612
 
633
613
 
709
689
    _req_handler_class = BadProtocolRequestHandler
710
690
 
711
691
    def setUp(self):
712
 
        if self._testing_pycurl():
 
692
        if pycurl_present and self._transport == PyCurlTransport:
713
693
            raise tests.TestNotApplicable(
714
694
                "pycurl doesn't check the protocol version")
715
695
        super(TestBadProtocolServer, self).setUp()
759
739
        self.assertEqual(None, server.host)
760
740
        self.assertEqual(None, server.port)
761
741
 
762
 
    def test_setUp_and_stop(self):
 
742
    def test_setUp_and_tearDown(self):
763
743
        server = RecordingServer(expect_body_tail=None)
764
 
        server.start_server()
 
744
        server.setUp()
765
745
        try:
766
746
            self.assertNotEqual(None, server.host)
767
747
            self.assertNotEqual(None, server.port)
768
748
        finally:
769
 
            server.stop_server()
 
749
            server.tearDown()
770
750
        self.assertEqual(None, server.host)
771
751
        self.assertEqual(None, server.port)
772
752
 
773
753
    def test_send_receive_bytes(self):
774
 
        server = RecordingServer(expect_body_tail='c', scheme='http')
775
 
        self.start_server(server)
 
754
        server = RecordingServer(expect_body_tail='c')
 
755
        server.setUp()
 
756
        self.addCleanup(server.tearDown)
776
757
        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
777
758
        sock.connect((server.host, server.port))
778
759
        sock.sendall('abc')
1169
1150
        if self._testing_pycurl():
1170
1151
            # Oh my ! pycurl does not check for the port as part of
1171
1152
            # no_proxy :-( So we just test the host part
1172
 
            self.no_proxy_host = self.server.host
 
1153
            self.no_proxy_host = 'localhost'
1173
1154
        else:
1174
1155
            self.no_proxy_host = self.proxy_address
1175
1156
        # The secondary server is the proxy
1178
1159
        self._old_env = {}
1179
1160
 
1180
1161
    def _testing_pycurl(self):
1181
 
        # TODO: This is duplicated for lots of the classes in this file
1182
 
        return (features.pycurl.available()
1183
 
                and self._transport == PyCurlTransport)
 
1162
        return pycurl_present and self._transport == PyCurlTransport
1184
1163
 
1185
1164
    def create_transport_secondary_server(self):
1186
1165
        """Creates an http server that will serve files with
1359
1338
        self.follow_redirections = True
1360
1339
 
1361
1340
 
1362
 
def install_redirected_request(test):
1363
 
    test.overrideAttr(_urllib2_wrappers, 'Request', RedirectedRequest)
1364
 
 
1365
 
 
1366
1341
class TestHTTPSilentRedirections(http_utils.TestCaseWithRedirectedWebserver):
1367
1342
    """Test redirections.
1368
1343
 
1378
1353
    """
1379
1354
 
1380
1355
    def setUp(self):
1381
 
        if (features.pycurl.available()
1382
 
            and self._transport == PyCurlTransport):
 
1356
        if pycurl_present and self._transport == PyCurlTransport:
1383
1357
            raise tests.TestNotApplicable(
1384
1358
                "pycurl doesn't redirect silently annymore")
1385
1359
        super(TestHTTPSilentRedirections, self).setUp()
1386
 
        install_redirected_request(self)
 
1360
        self.setup_redirected_request()
 
1361
        self.addCleanup(self.cleanup_redirected_request)
1387
1362
        self.build_tree_contents([('a','a'),
1388
1363
                                  ('1/',),
1389
1364
                                  ('1/a', 'redirected once'),
1399
1374
 
1400
1375
        self.old_transport = self._transport(self.old_server.get_url())
1401
1376
 
 
1377
    def setup_redirected_request(self):
 
1378
        self.original_class = _urllib2_wrappers.Request
 
1379
        _urllib2_wrappers.Request = RedirectedRequest
 
1380
 
 
1381
    def cleanup_redirected_request(self):
 
1382
        _urllib2_wrappers.Request = self.original_class
 
1383
 
1402
1384
    def create_transport_secondary_server(self):
1403
1385
        """Create the secondary server, redirections are defined in the tests"""
1404
1386
        return http_utils.HTTPServerRedirecting(
1408
1390
        t = self.old_transport
1409
1391
 
1410
1392
        req = RedirectedRequest('GET', t.abspath('a'))
 
1393
        req.follow_redirections = True
1411
1394
        new_prefix = 'http://%s:%s' % (self.new_server.host,
1412
1395
                                       self.new_server.port)
1413
1396
        self.old_server.redirections = \
1414
1397
            [('(.*)', r'%s/1\1' % (new_prefix), 301),]
1415
 
        self.assertEqual('redirected once',t._perform(req).read())
 
1398
        self.assertEquals('redirected once',t._perform(req).read())
1416
1399
 
1417
1400
    def test_five_redirections(self):
1418
1401
        t = self.old_transport
1419
1402
 
1420
1403
        req = RedirectedRequest('GET', t.abspath('a'))
 
1404
        req.follow_redirections = True
1421
1405
        old_prefix = 'http://%s:%s' % (self.old_server.host,
1422
1406
                                       self.old_server.port)
1423
1407
        new_prefix = 'http://%s:%s' % (self.new_server.host,
1429
1413
            ('/4(.*)', r'%s/5\1' % (new_prefix), 301),
1430
1414
            ('(/[^/]+)', r'%s/1\1' % (old_prefix), 301),
1431
1415
            ]
1432
 
        self.assertEqual('redirected 5 times',t._perform(req).read())
 
1416
        self.assertEquals('redirected 5 times',t._perform(req).read())
1433
1417
 
1434
1418
 
1435
1419
class TestDoCatchRedirections(http_utils.TestCaseWithRedirectedWebserver):
1448
1432
        t = self._transport(self.new_server.get_url())
1449
1433
 
1450
1434
        # We use None for redirected so that we fail if redirected
1451
 
        self.assertEqual('0123456789',
1452
 
                         transport.do_catching_redirections(
 
1435
        self.assertEquals('0123456789',
 
1436
                          transport.do_catching_redirections(
1453
1437
                self.get_a, t, None).read())
1454
1438
 
1455
1439
    def test_one_redirection(self):
1460
1444
            dir, file = urlutils.split(exception.target)
1461
1445
            return self._transport(dir)
1462
1446
 
1463
 
        self.assertEqual('0123456789',
1464
 
                         transport.do_catching_redirections(
 
1447
        self.assertEquals('0123456789',
 
1448
                          transport.do_catching_redirections(
1465
1449
                self.get_a, self.old_transport, redirected).read())
1466
 
        self.assertEqual(1, self.redirections)
 
1450
        self.assertEquals(1, self.redirections)
1467
1451
 
1468
1452
    def test_redirection_loop(self):
1469
1453
 
1497
1481
        return self._auth_server(protocol_version=self._protocol_version)
1498
1482
 
1499
1483
    def _testing_pycurl(self):
1500
 
        # TODO: This is duplicated for lots of the classes in this file
1501
 
        return (features.pycurl.available()
1502
 
                and self._transport == PyCurlTransport)
 
1484
        return pycurl_present and self._transport == PyCurlTransport
1503
1485
 
1504
1486
    def get_user_url(self, user, password):
1505
1487
        """Build an url embedding user and password"""
1570
1552
        self.assertEqual('', ui.ui_factory.stdin.readline())
1571
1553
        stderr.seek(0)
1572
1554
        expected_prompt = self._expected_username_prompt(t._unqualified_scheme)
1573
 
        self.assertEqual(expected_prompt, stderr.read(len(expected_prompt)))
1574
 
        self.assertEqual('', stdout.getvalue())
 
1555
        self.assertEquals(expected_prompt, stderr.read(len(expected_prompt)))
 
1556
        self.assertEquals('', stdout.getvalue())
1575
1557
        self._check_password_prompt(t._unqualified_scheme, 'joe',
1576
1558
                                    stderr.readline())
1577
1559
 
1592
1574
        self.assertEqual('', ui.ui_factory.stdin.readline())
1593
1575
        self._check_password_prompt(t._unqualified_scheme, 'joe',
1594
1576
                                    stderr.getvalue())
1595
 
        self.assertEqual('', stdout.getvalue())
 
1577
        self.assertEquals('', stdout.getvalue())
1596
1578
        # And we shouldn't prompt again for a different request
1597
1579
        # against the same transport.
1598
1580
        self.assertEqual('contents of b\n',t.get('b').read())
1608
1590
                              % (scheme.upper(),
1609
1591
                                 user, self.server.host, self.server.port,
1610
1592
                                 self.server.auth_realm)))
1611
 
        self.assertEqual(expected_prompt, actual_prompt)
 
1593
        self.assertEquals(expected_prompt, actual_prompt)
1612
1594
 
1613
1595
    def _expected_username_prompt(self, scheme):
1614
1596
        return (self._username_prompt_prefix
1628
1610
        self.server.add_user(user, password)
1629
1611
        t = self.get_user_transport(user, None)
1630
1612
        ui.ui_factory = tests.TestUIFactory(stdin=stdin_content,
1631
 
                                            stderr=tests.StringIOWrapper())
 
1613
                                            stdout=tests.StringIOWrapper())
1632
1614
        # Create a minimal config file with the right password
1633
1615
        conf = config.AuthenticationConfig()
1634
1616
        conf._get_config().update(
1846
1828
                             'http://www.example.com/foo/subdir')
1847
1829
        self.assertIsInstance(r, type(t))
1848
1830
        # Both transports share the some connection
1849
 
        self.assertEqual(t._get_connection(), r._get_connection())
 
1831
        self.assertEquals(t._get_connection(), r._get_connection())
1850
1832
 
1851
1833
    def test_redirected_to_self_with_slash(self):
1852
1834
        t = self._transport('http://www.example.com/foo')
1856
1838
        # Both transports share the some connection (one can argue that we
1857
1839
        # should return the exact same transport here, but that seems
1858
1840
        # overkill).
1859
 
        self.assertEqual(t._get_connection(), r._get_connection())
 
1841
        self.assertEquals(t._get_connection(), r._get_connection())
1860
1842
 
1861
1843
    def test_redirected_to_host(self):
1862
1844
        t = self._transport('http://www.example.com/foo')
1881
1863
        r = t._redirected_to('http://www.example.com/foo',
1882
1864
                             'https://foo.example.com/foo')
1883
1865
        self.assertIsInstance(r, type(t))
1884
 
        self.assertEqual(t._user, r._user)
 
1866
        self.assertEquals(t._user, r._user)
1885
1867
 
1886
1868
 
1887
1869
class PredefinedRequestHandler(http_server.TestingHTTPRequestHandler):
1946
1928
        pass
1947
1929
 
1948
1930
 
1949
 
class TestActivityMixin(object):
 
1931
class TestActivity(tests.TestCase):
1950
1932
    """Test socket activity reporting.
1951
1933
 
1952
1934
    We use a special purpose server to control the bytes sent and received and
1956
1938
    def setUp(self):
1957
1939
        tests.TestCase.setUp(self)
1958
1940
        self.server = self._activity_server(self._protocol_version)
1959
 
        self.server.start_server()
 
1941
        self.server.setUp()
1960
1942
        self.activities = {}
1961
1943
        def report_activity(t, bytes, direction):
1962
1944
            count = self.activities.get(direction, 0)
1971
1953
 
1972
1954
    def tearDown(self):
1973
1955
        self._transport._report_activity = self.orig_report_activity
1974
 
        self.server.stop_server()
 
1956
        self.server.tearDown()
1975
1957
        tests.TestCase.tearDown(self)
1976
1958
 
1977
1959
    def get_transport(self):
2090
2072
        code, f = t._post('abc def end-of-body\n')
2091
2073
        self.assertEqual('lalala whatever as long as itsssss\n', f.read())
2092
2074
        self.assertActivitiesMatch()
2093
 
 
2094
 
 
2095
 
class TestActivity(tests.TestCase, TestActivityMixin):
2096
 
 
2097
 
    def setUp(self):
2098
 
        tests.TestCase.setUp(self)
2099
 
        self.server = self._activity_server(self._protocol_version)
2100
 
        self.server.start_server()
2101
 
        self.activities = {}
2102
 
        def report_activity(t, bytes, direction):
2103
 
            count = self.activities.get(direction, 0)
2104
 
            count += bytes
2105
 
            self.activities[direction] = count
2106
 
 
2107
 
        # We override at class level because constructors may propagate the
2108
 
        # bound method and render instance overriding ineffective (an
2109
 
        # alternative would be to define a specific ui factory instead...)
2110
 
        self.orig_report_activity = self._transport._report_activity
2111
 
        self._transport._report_activity = report_activity
2112
 
 
2113
 
    def tearDown(self):
2114
 
        self._transport._report_activity = self.orig_report_activity
2115
 
        self.server.stop_server()
2116
 
        tests.TestCase.tearDown(self)
2117
 
 
2118
 
 
2119
 
class TestNoReportActivity(tests.TestCase, TestActivityMixin):
2120
 
 
2121
 
    def setUp(self):
2122
 
        tests.TestCase.setUp(self)
2123
 
        # Unlike TestActivity, we are really testing ReportingFileSocket and
2124
 
        # ReportingSocket, so we don't need all the parametrization. Since
2125
 
        # ReportingFileSocket and ReportingSocket are wrappers, it's easier to
2126
 
        # test them through their use by the transport than directly (that's a
2127
 
        # bit less clean but far more simpler and effective).
2128
 
        self.server = ActivityHTTPServer('HTTP/1.1')
2129
 
        self._transport=_urllib.HttpTransport_urllib
2130
 
 
2131
 
        self.server.start_server()
2132
 
 
2133
 
        # We override at class level because constructors may propagate the
2134
 
        # bound method and render instance overriding ineffective (an
2135
 
        # alternative would be to define a specific ui factory instead...)
2136
 
        self.orig_report_activity = self._transport._report_activity
2137
 
        self._transport._report_activity = None
2138
 
 
2139
 
    def tearDown(self):
2140
 
        self._transport._report_activity = self.orig_report_activity
2141
 
        self.server.stop_server()
2142
 
        tests.TestCase.tearDown(self)
2143
 
 
2144
 
    def assertActivitiesMatch(self):
2145
 
        # Nothing to check here
2146
 
        pass
2147
 
 
2148
 
 
2149
 
class TestAuthOnRedirected(http_utils.TestCaseWithRedirectedWebserver):
2150
 
    """Test authentication on the redirected http server."""
2151
 
 
2152
 
    _auth_header = 'Authorization'
2153
 
    _password_prompt_prefix = ''
2154
 
    _username_prompt_prefix = ''
2155
 
    _auth_server = http_utils.HTTPBasicAuthServer
2156
 
    _transport = _urllib.HttpTransport_urllib
2157
 
 
2158
 
    def create_transport_readonly_server(self):
2159
 
        return self._auth_server()
2160
 
 
2161
 
    def create_transport_secondary_server(self):
2162
 
        """Create the secondary server redirecting to the primary server"""
2163
 
        new = self.get_readonly_server()
2164
 
 
2165
 
        redirecting = http_utils.HTTPServerRedirecting()
2166
 
        redirecting.redirect_to(new.host, new.port)
2167
 
        return redirecting
2168
 
 
2169
 
    def setUp(self):
2170
 
        super(TestAuthOnRedirected, self).setUp()
2171
 
        self.build_tree_contents([('a','a'),
2172
 
                                  ('1/',),
2173
 
                                  ('1/a', 'redirected once'),
2174
 
                                  ],)
2175
 
        new_prefix = 'http://%s:%s' % (self.new_server.host,
2176
 
                                       self.new_server.port)
2177
 
        self.old_server.redirections = [
2178
 
            ('(.*)', r'%s/1\1' % (new_prefix), 301),]
2179
 
        self.old_transport = self._transport(self.old_server.get_url())
2180
 
        self.new_server.add_user('joe', 'foo')
2181
 
 
2182
 
    def get_a(self, transport):
2183
 
        return transport.get('a')
2184
 
 
2185
 
    def test_auth_on_redirected_via_do_catching_redirections(self):
2186
 
        self.redirections = 0
2187
 
 
2188
 
        def redirected(transport, exception, redirection_notice):
2189
 
            self.redirections += 1
2190
 
            dir, file = urlutils.split(exception.target)
2191
 
            return self._transport(dir)
2192
 
 
2193
 
        stdout = tests.StringIOWrapper()
2194
 
        stderr = tests.StringIOWrapper()
2195
 
        ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n',
2196
 
                                            stdout=stdout, stderr=stderr)
2197
 
        self.assertEqual('redirected once',
2198
 
                         transport.do_catching_redirections(
2199
 
                self.get_a, self.old_transport, redirected).read())
2200
 
        self.assertEqual(1, self.redirections)
2201
 
        # stdin should be empty
2202
 
        self.assertEqual('', ui.ui_factory.stdin.readline())
2203
 
        # stdout should be empty, stderr will contains the prompts
2204
 
        self.assertEqual('', stdout.getvalue())
2205
 
 
2206
 
    def test_auth_on_redirected_via_following_redirections(self):
2207
 
        self.new_server.add_user('joe', 'foo')
2208
 
        stdout = tests.StringIOWrapper()
2209
 
        stderr = tests.StringIOWrapper()
2210
 
        ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n',
2211
 
                                            stdout=stdout, stderr=stderr)
2212
 
        t = self.old_transport
2213
 
        req = RedirectedRequest('GET', t.abspath('a'))
2214
 
        new_prefix = 'http://%s:%s' % (self.new_server.host,
2215
 
                                       self.new_server.port)
2216
 
        self.old_server.redirections = [
2217
 
            ('(.*)', r'%s/1\1' % (new_prefix), 301),]
2218
 
        self.assertEqual('redirected once',t._perform(req).read())
2219
 
        # stdin should be empty
2220
 
        self.assertEqual('', ui.ui_factory.stdin.readline())
2221
 
        # stdout should be empty, stderr will contains the prompts
2222
 
        self.assertEqual('', stdout.getvalue())
2223
 
 
2224