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',)),
83
if features.pycurl.available():
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)
90
protocol_scenarios = [
91
('HTTP/1.0', dict(_protocol_version='HTTP/1.0')),
92
('HTTP/1.1', dict(_protocol_version='HTTP/1.1')),
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((
100
tests.multiply_tests(p_tests, protocol_scenarios, result)
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((
221
217
self.received_bytes = ''
225
return '%s://%s:%s/' % (self.scheme, self.host, self.port)
227
def start_server(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,))
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)
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')
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.
253
def stop_server(self):
255
# Issue a fake connection to wake up the server and allow it to
257
fake_conn = osutils.connect_socket((self.host, self.port))
259
251
except socket.error:
260
252
# We might have already closed it. We don't care.
265
if 'threads' in tests.selftest_debug_flags:
266
sys.stderr.write('Thread joined: %s\n' % (self._thread.ident,))
269
258
class TestAuthHeader(tests.TestCase):
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)
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)
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)
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)
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)
308
297
class TestHTTPServer(tests.TestCase):
314
303
protocol_version = 'HTTP/0.1'
316
self.assertRaises(httplib.UnknownProtocol,
317
http_server.HttpServer, BogusRequestHandler)
305
server = http_server.HttpServer(BogusRequestHandler)
307
self.assertRaises(httplib.UnknownProtocol,server.setUp)
310
self.fail('HTTP Server creation did not raise UnknownProtocol')
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')
315
self.assertRaises(httplib.UnknownProtocol,server.setUp)
318
self.fail('HTTP Server creation did not raise UnknownProtocol')
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)
323
self.assertTrue(server._http_running)
325
self.assertFalse(server._http_running)
331
327
def test_create_http_server_one_zero(self):
332
328
class RequestHandlerOneZero(http_server.TestingHTTPRequestHandler):
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'],
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
404
class TestHttpTransportUrls(tests.TestCase):
448
451
https by supplying a fake version_info that do not
451
self.requireFeature(features.pycurl)
452
# Import the module locally now that we now it's available.
453
pycurl = features.pycurl.module
457
raise tests.TestSkipped('pycurl not present')
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)
466
('ftp', 'gopher', 'telnet',
467
'dict', 'ldap', 'http', 'file'),
471
self.assertRaises(errors.DependencyNotPresent, self._transport,
472
'https://launchpad.net')
459
version_info_orig = pycurl.version_info
461
# Now that we have pycurl imported, we can fake its version_info
462
# This was taken from a windows pycurl without SSL
464
pycurl.version_info = lambda : (2,
472
('ftp', 'gopher', 'telnet',
473
'dict', 'ldap', 'http', 'file'),
477
self.assertRaises(errors.DependencyNotPresent, self._transport,
478
'https://launchpad.net')
480
# Restore the right function
481
pycurl.version_info = version_info_orig
475
484
class TestHTTPConnections(http_utils.TestCaseWithWebserver):
534
543
class TestPost(tests.TestCase):
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')
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')
545
554
server.received_bytes.startswith('POST /.bzr/smart HTTP/1.'))
589
598
_req_handler_class = http_server.TestingHTTPRequestHandler
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
601
return http_server.HttpServer(self._req_handler_class,
602
protocol_version=self._protocol_version)
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
603
608
class WallRequestHandler(http_server.TestingHTTPRequestHandler):
604
609
"""Whatever request comes in, close the connection"""
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
700
717
_req_handler_class = BadProtocolRequestHandler
703
if self._testing_pycurl():
720
if pycurl_present and self._transport == PyCurlTransport:
704
721
raise tests.TestNotApplicable(
705
722
"pycurl doesn't check the protocol version")
706
723
super(TestBadProtocolServer, self).setUp()
708
725
def test_http_has(self):
709
t = self.get_readonly_transport()
726
server = self.get_readonly_server()
727
t = self._transport(server.get_url())
710
728
self.assertRaises(errors.InvalidHttpResponse, t.has, 'foo/bar')
712
730
def test_http_get(self):
713
t = self.get_readonly_transport()
731
server = self.get_readonly_server()
732
t = self._transport(server.get_url())
714
733
self.assertRaises(errors.InvalidHttpResponse, t.get, 'foo/bar')
746
767
self.assertEqual(None, server.host)
747
768
self.assertEqual(None, server.port)
749
def test_setUp_and_stop(self):
770
def test_setUp_and_tearDown(self):
750
771
server = RecordingServer(expect_body_tail=None)
751
server.start_server()
753
774
self.assertNotEqual(None, server.host)
754
775
self.assertNotEqual(None, server.port)
757
778
self.assertEqual(None, server.host)
758
779
self.assertEqual(None, server.port)
760
781
def test_send_receive_bytes(self):
761
server = RecordingServer(expect_body_tail='c', scheme='http')
762
self.start_server(server)
782
server = RecordingServer(expect_body_tail='c')
784
self.addCleanup(server.tearDown)
763
785
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
764
786
sock.connect((server.host, server.port))
765
787
sock.sendall('abc')
1071
1099
self.build_tree_contents([('a', content)],)
1073
1101
def test_few_ranges(self):
1074
t = self.get_readonly_transport()
1102
t = self.get_transport()
1075
1103
l = list(t.readv('a', ((0, 4), (1024, 4), )))
1076
1104
self.assertEqual(l[0], (0, '0000'))
1077
1105
self.assertEqual(l[1], (1024, '0001'))
1078
1106
self.assertEqual(1, self.get_readonly_server().GET_request_nb)
1080
1108
def test_more_ranges(self):
1081
t = self.get_readonly_transport()
1109
t = self.get_transport()
1082
1110
l = list(t.readv('a', ((0, 4), (1024, 4), (4096, 4), (8192, 4))))
1083
1111
self.assertEqual(l[0], (0, '0000'))
1084
1112
self.assertEqual(l[1], (1024, '0001'))
1137
1168
# FIXME: We don't have an https server available, so we don't
1138
# test https connections. --vila toolongago
1169
# test https connections.
1140
1171
def setUp(self):
1141
1172
super(TestProxyHttpServer, self).setUp()
1142
self.transport_secondary_server = http_utils.ProxyServer
1143
1173
self.build_tree_contents([('foo', 'contents of foo\n'),
1144
1174
('foo-proxied', 'proxied contents of foo\n')])
1145
1175
# Let's setup some attributes for tests
1146
server = self.get_readonly_server()
1147
self.server_host_port = '%s:%d' % (server.host, server.port)
1176
self.server = self.get_readonly_server()
1177
self.proxy_address = '%s:%d' % (self.server.host, self.server.port)
1148
1178
if self._testing_pycurl():
1149
1179
# Oh my ! pycurl does not check for the port as part of
1150
1180
# no_proxy :-( So we just test the host part
1151
self.no_proxy_host = server.host
1181
self.no_proxy_host = 'localhost'
1153
self.no_proxy_host = self.server_host_port
1183
self.no_proxy_host = self.proxy_address
1154
1184
# The secondary server is the proxy
1155
self.proxy_url = self.get_secondary_url()
1185
self.proxy = self.get_secondary_server()
1186
self.proxy_url = self.proxy.get_url()
1156
1187
self._old_env = {}
1158
1189
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)
1190
return pycurl_present and self._transport == PyCurlTransport
1192
def create_transport_secondary_server(self):
1193
"""Creates an http server that will serve files with
1194
'-proxied' appended to their names.
1196
return http_utils.ProxyServer(protocol_version=self._protocol_version)
1163
1198
def _install_env(self, env):
1164
1199
for name, value in env.iteritems():
1239
1276
def setUp(self):
1240
1277
http_utils.TestCaseWithWebserver.setUp(self)
1241
1278
self.build_tree_contents([('a', '0123456789')],)
1279
server = self.get_readonly_server()
1280
self.transport = self._transport(server.get_url())
1243
1282
def create_transport_readonly_server(self):
1244
1283
return http_server.HttpServer(protocol_version=self._protocol_version)
1246
1285
def _file_contents(self, relpath, ranges):
1247
t = self.get_readonly_transport()
1248
1286
offsets = [ (start, end - start + 1) for start, end in ranges]
1249
coalesce = t._coalesce_offsets
1287
coalesce = self.transport._coalesce_offsets
1250
1288
coalesced = list(coalesce(offsets, limit=0, fudge_factor=0))
1251
code, data = t._get(relpath, coalesced)
1289
code, data = self.transport._get(relpath, coalesced)
1252
1290
self.assertTrue(code in (200, 206),'_get returns: %d' % code)
1253
1291
for start, end in ranges:
1254
1292
data.seek(start)
1255
1293
yield data.read(end - start + 1)
1257
1295
def _file_tail(self, relpath, tail_amount):
1258
t = self.get_readonly_transport()
1259
code, data = t._get(relpath, [], tail_amount)
1296
code, data = self.transport._get(relpath, [], tail_amount)
1260
1297
self.assertTrue(code in (200, 206),'_get returns: %d' % code)
1261
1298
data.seek(-tail_amount, 2)
1262
1299
return data.read(tail_amount)
1281
1318
class TestHTTPRedirections(http_utils.TestCaseWithRedirectedWebserver):
1282
1319
"""Test redirection between http servers."""
1321
def create_transport_secondary_server(self):
1322
"""Create the secondary server redirecting to the primary server"""
1323
new = self.get_readonly_server()
1325
redirecting = http_utils.HTTPServerRedirecting(
1326
protocol_version=self._protocol_version)
1327
redirecting.redirect_to(new.host, new.port)
1284
1330
def setUp(self):
1285
1331
super(TestHTTPRedirections, self).setUp()
1286
1332
self.build_tree_contents([('a', '0123456789'),
1288
1334
'# Bazaar revision bundle v0.9\n#\n')
1336
# The requests to the old server will be redirected to the new server
1337
self.old_transport = self._transport(self.old_server.get_url())
1291
1339
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())
1340
self.assertRaises(errors.RedirectRequested, self.old_transport.get, 'a')
1341
t = self._transport(self.new_server.get_url())
1342
self.assertEqual('0123456789', t.get('a').read())
1344
def test_read_redirected_bundle_from_url(self):
1345
from bzrlib.bundle import read_bundle_from_url
1346
url = self.old_transport.abspath('bundle')
1347
bundle = self.applyDeprecated(deprecated_in((1, 12, 0)),
1348
read_bundle_from_url, url)
1349
# If read_bundle_from_url was successful we get an empty bundle
1350
self.assertEqual([], bundle.revisions)
1297
1353
class RedirectedRequest(_urllib2_wrappers.Request):
1310
1366
self.follow_redirections = True
1313
def install_redirected_request(test):
1314
test.overrideAttr(_urllib2_wrappers, 'Request', RedirectedRequest)
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):
1322
sock.shutdown(socket.SHUT_RDWR)
1324
except socket.error:
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)
1338
1369
class TestHTTPSilentRedirections(http_utils.TestCaseWithRedirectedWebserver):
1339
1370
"""Test redirections.
1352
1383
def setUp(self):
1353
if (features.pycurl.available()
1354
and self._transport == PyCurlTransport):
1384
if pycurl_present and self._transport == PyCurlTransport:
1355
1385
raise tests.TestNotApplicable(
1356
"pycurl doesn't redirect silently anymore")
1386
"pycurl doesn't redirect silently annymore")
1357
1387
super(TestHTTPSilentRedirections, self).setUp()
1358
install_redirected_request(self)
1359
cleanup_http_redirection_connections(self)
1388
self.setup_redirected_request()
1389
self.addCleanup(self.cleanup_redirected_request)
1360
1390
self.build_tree_contents([('a','a'),
1362
1392
('1/a', 'redirected once'),
1370
1400
('5/a', 'redirected 5 times'),
1403
self.old_transport = self._transport(self.old_server.get_url())
1405
def setup_redirected_request(self):
1406
self.original_class = _urllib2_wrappers.Request
1407
_urllib2_wrappers.Request = RedirectedRequest
1409
def cleanup_redirected_request(self):
1410
_urllib2_wrappers.Request = self.original_class
1412
def create_transport_secondary_server(self):
1413
"""Create the secondary server, redirections are defined in the tests"""
1414
return http_utils.HTTPServerRedirecting(
1415
protocol_version=self._protocol_version)
1373
1417
def test_one_redirection(self):
1374
t = self.get_old_transport()
1375
req = RedirectedRequest('GET', t._remote_path('a'))
1418
t = self.old_transport
1420
req = RedirectedRequest('GET', t.abspath('a'))
1421
req.follow_redirections = True
1376
1422
new_prefix = 'http://%s:%s' % (self.new_server.host,
1377
1423
self.new_server.port)
1378
1424
self.old_server.redirections = \
1379
1425
[('(.*)', r'%s/1\1' % (new_prefix), 301),]
1380
self.assertEqual('redirected once', t._perform(req).read())
1426
self.assertEquals('redirected once',t._perform(req).read())
1382
1428
def test_five_redirections(self):
1383
t = self.get_old_transport()
1384
req = RedirectedRequest('GET', t._remote_path('a'))
1429
t = self.old_transport
1431
req = RedirectedRequest('GET', t.abspath('a'))
1432
req.follow_redirections = True
1385
1433
old_prefix = 'http://%s:%s' % (self.old_server.host,
1386
1434
self.old_server.port)
1387
1435
new_prefix = 'http://%s:%s' % (self.new_server.host,
1402
1450
def setUp(self):
1403
1451
super(TestDoCatchRedirections, self).setUp()
1404
1452
self.build_tree_contents([('a', '0123456789'),],)
1405
cleanup_http_redirection_connections(self)
1407
self.old_transport = self.get_old_transport()
1454
self.old_transport = self._transport(self.old_server.get_url())
1456
def get_a(self, transport):
1457
return transport.get('a')
1412
1459
def test_no_redirection(self):
1413
t = self.get_new_transport()
1460
t = self._transport(self.new_server.get_url())
1415
1462
# We use None for redirected so that we fail if redirected
1416
self.assertEqual('0123456789',
1417
transport.do_catching_redirections(
1463
self.assertEquals('0123456789',
1464
transport.do_catching_redirections(
1418
1465
self.get_a, t, None).read())
1420
1467
def test_one_redirection(self):
1421
1468
self.redirections = 0
1423
def redirected(t, exception, redirection_notice):
1470
def redirected(transport, exception, redirection_notice):
1424
1471
self.redirections += 1
1425
redirected_t = t._redirected_to(exception.source, exception.target)
1472
dir, file = urlutils.split(exception.target)
1473
return self._transport(dir)
1428
self.assertEqual('0123456789',
1429
transport.do_catching_redirections(
1475
self.assertEquals('0123456789',
1476
transport.do_catching_redirections(
1430
1477
self.get_a, self.old_transport, redirected).read())
1431
self.assertEqual(1, self.redirections)
1478
self.assertEquals(1, self.redirections)
1433
1480
def test_redirection_loop(self):
1459
1506
('b', 'contents of b\n'),])
1461
1508
def create_transport_readonly_server(self):
1462
server = self._auth_server(protocol_version=self._protocol_version)
1463
server._url_protocol = self._url_protocol
1509
return self._auth_server(protocol_version=self._protocol_version)
1466
1511
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)
1512
return pycurl_present and self._transport == PyCurlTransport
1471
1514
def get_user_url(self, user, password):
1472
1515
"""Build an url embedding user and password"""
1721
1762
# We use the VFS layer as part of HTTP tunnelling tests.
1722
1763
self._captureVar('BZR_NO_SMART_VFS', None)
1723
1764
self.transport_readonly_server = http_utils.HTTPServerWithSmarts
1724
self.http_server = self.get_readonly_server()
1726
1766
def create_transport_readonly_server(self):
1727
server = http_utils.HTTPServerWithSmarts(
1767
return http_utils.HTTPServerWithSmarts(
1728
1768
protocol_version=self._protocol_version)
1729
server._url_protocol = self._url_protocol
1732
1770
def test_open_bzrdir(self):
1733
1771
branch = self.make_branch('relpath')
1734
url = self.http_server.get_url() + 'relpath'
1772
http_server = self.get_readonly_server()
1773
url = http_server.get_url() + 'relpath'
1735
1774
bd = bzrdir.BzrDir.open(url)
1736
self.addCleanup(bd.transport.disconnect)
1737
1775
self.assertIsInstance(bd, _mod_remote.RemoteBzrDir)
1739
1777
def test_bulk_data(self):
1936
1976
# We override at class level because constructors may propagate the
1937
1977
# bound method and render instance overriding ineffective (an
1938
1978
# 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)
1979
self.orig_report_activity = self._transport._report_activity
1980
self._transport._report_activity = report_activity
1983
self._transport._report_activity = self.orig_report_activity
1984
self.server.tearDown()
1985
tests.TestCase.tearDown(self)
1942
1987
def get_transport(self):
1943
t = self._transport(self.server.get_url())
1944
# FIXME: Needs cleanup -- vila 20100611
1988
return self._transport(self.server.get_url())
1947
1990
def assertActivitiesMatch(self):
1948
1991
self.assertEqual(self.server.bytes_read,
2054
2097
t = self.get_transport()
2055
2098
# We must send a single line of body bytes, see
2056
# PredefinedRequestHandler._handle_one_request
2099
# PredefinedRequestHandler.handle_one_request
2057
2100
code, f = t._post('abc def end-of-body\n')
2058
2101
self.assertEqual('lalala whatever as long as itsssss\n', f.read())
2059
2102
self.assertActivitiesMatch()
2062
class TestActivity(tests.TestCase, TestActivityMixin):
2065
TestActivityMixin.setUp(self)
2068
class TestNoReportActivity(tests.TestCase, TestActivityMixin):
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'
2079
self._transport =_urllib.HttpTransport_urllib
2080
TestActivityMixin.setUp(self)
2082
def assertActivitiesMatch(self):
2083
# Nothing to check here
2087
class TestAuthOnRedirected(http_utils.TestCaseWithRedirectedWebserver):
2088
"""Test authentication on the redirected http server."""
2090
_auth_header = 'Authorization'
2091
_password_prompt_prefix = ''
2092
_username_prompt_prefix = ''
2093
_auth_server = http_utils.HTTPBasicAuthServer
2094
_transport = _urllib.HttpTransport_urllib
2097
super(TestAuthOnRedirected, self).setUp()
2098
self.build_tree_contents([('a','a'),
2100
('1/a', 'redirected once'),
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)
2110
def create_transport_readonly_server(self):
2111
server = self._auth_server(protocol_version=self._protocol_version)
2112
server._url_protocol = self._url_protocol
2118
def test_auth_on_redirected_via_do_catching_redirections(self):
2119
self.redirections = 0
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)
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())
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())