80
78
transport_scenarios = [
81
79
('urllib', dict(_transport=_urllib.HttpTransport_urllib,
82
80
_server=http_server.HttpServer_urllib,
83
_qualified_prefix='http+urllib',)),
81
_url_protocol='http+urllib',)),
85
83
if features.pycurl.available():
86
84
transport_scenarios.append(
87
85
('pycurl', dict(_transport=PyCurlTransport,
88
86
_server=http_server.HttpServer_PyCurl,
89
_qualified_prefix='http+pycurl',)))
87
_url_protocol='http+pycurl',)))
90
88
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)
92
102
# each implementation tested with each HTTP version
93
103
tp_tests, remaining_tests = tests.split_suite_by_condition(
94
104
remaining_tests, tests.condition_isinstance((
104
114
TestSpecificRequestHandler,
106
protocol_scenarios = [
107
('HTTP/1.0', dict(_protocol_version='HTTP/1.0')),
108
('HTTP/1.1', dict(_protocol_version='HTTP/1.1')),
110
116
tp_scenarios = tests.multiply_scenarios(transport_scenarios,
111
117
protocol_scenarios)
112
118
tests.multiply_tests(tp_tests, tp_scenarios, result)
223
229
self._sock.bind(('127.0.0.1', 0))
224
230
self.host, self.port = self._sock.getsockname()
225
231
self._ready = threading.Event()
226
self._thread = threading.Thread(target=self._accept_read_and_reply)
227
self._thread.setDaemon(True)
232
self._thread = test_server.ThreadWithException(
233
event=self._ready, target=self._accept_read_and_reply)
228
234
self._thread.start()
235
if 'threads' in tests.selftest_debug_flags:
236
sys.stderr.write('Thread started: %s\n' % (self._thread.ident,))
231
239
def _accept_read_and_reply(self):
232
240
self._sock.listen(1)
233
241
self._ready.set()
234
self._sock.settimeout(5)
236
conn, address = self._sock.accept()
237
# On win32, the accepted connection will be non-blocking to start
238
# with because we're using settimeout.
239
conn.setblocking(True)
242
conn, address = self._sock.accept()
243
if self._expect_body_tail is not None:
240
244
while not self.received_bytes.endswith(self._expect_body_tail):
241
245
self.received_bytes += conn.recv(4096)
242
246
conn.sendall('HTTP/1.1 200 OK\r\n')
243
except socket.timeout:
244
# Make sure the client isn't stuck waiting for us to e.g. accept.
245
248
self._sock.close()
246
249
except socket.error:
247
250
# The client may have already closed the socket.
250
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))
253
259
except socket.error:
254
260
# 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,))
260
269
class TestAuthHeader(tests.TestCase):
305
314
protocol_version = 'HTTP/0.1'
307
server = http_server.HttpServer(BogusRequestHandler)
309
self.assertRaises(httplib.UnknownProtocol, server.start_server)
312
self.fail('HTTP Server creation did not raise UnknownProtocol')
316
self.assertRaises(httplib.UnknownProtocol,
317
http_server.HttpServer, BogusRequestHandler)
314
319
def test_force_invalid_protocol(self):
315
server = http_server.HttpServer(protocol_version='HTTP/0.1')
317
self.assertRaises(httplib.UnknownProtocol, server.start_server)
320
self.fail('HTTP Server creation did not raise UnknownProtocol')
320
self.assertRaises(httplib.UnknownProtocol,
321
http_server.HttpServer, protocol_version='HTTP/0.1')
322
323
def test_server_start_and_stop(self):
323
324
server = http_server.HttpServer()
325
self.addCleanup(server.stop_server)
324
326
server.start_server()
326
self.assertTrue(server._http_running)
329
self.assertFalse(server._http_running)
327
self.assertTrue(server.server is not None)
328
self.assertTrue(server.server.serving is not None)
329
self.assertTrue(server.server.serving)
331
331
def test_create_http_server_one_zero(self):
332
332
class RequestHandlerOneZero(http_server.TestingHTTPRequestHandler):
336
336
server = http_server.HttpServer(RequestHandlerOneZero)
337
337
self.start_server(server)
338
self.assertIsInstance(server._httpd, http_server.TestingHTTPServer)
338
self.assertIsInstance(server.server, http_server.TestingHTTPServer)
340
340
def test_create_http_server_one_one(self):
341
341
class RequestHandlerOneOne(http_server.TestingHTTPRequestHandler):
345
345
server = http_server.HttpServer(RequestHandlerOneOne)
346
346
self.start_server(server)
347
self.assertIsInstance(server._httpd,
347
self.assertIsInstance(server.server,
348
348
http_server.TestingThreadingHTTPServer)
350
350
def test_create_http_server_force_one_one(self):
355
355
server = http_server.HttpServer(RequestHandlerOneZero,
356
356
protocol_version='HTTP/1.1')
357
357
self.start_server(server)
358
self.assertIsInstance(server._httpd,
358
self.assertIsInstance(server.server,
359
359
http_server.TestingThreadingHTTPServer)
361
361
def test_create_http_server_force_one_zero(self):
366
366
server = http_server.HttpServer(RequestHandlerOneOne,
367
367
protocol_version='HTTP/1.0')
368
368
self.start_server(server)
369
self.assertIsInstance(server._httpd,
369
self.assertIsInstance(server.server,
370
370
http_server.TestingHTTPServer)
483
483
def test_http_has(self):
484
484
server = self.get_readonly_server()
485
t = self._transport(server.get_url())
485
t = self.get_readonly_transport()
486
486
self.assertEqual(t.has('foo/bar'), True)
487
487
self.assertEqual(len(server.logs), 1)
488
488
self.assertContainsRe(server.logs[0],
491
491
def test_http_has_not_found(self):
492
492
server = self.get_readonly_server()
493
t = self._transport(server.get_url())
493
t = self.get_readonly_transport()
494
494
self.assertEqual(t.has('not-found'), False)
495
495
self.assertContainsRe(server.logs[1],
496
496
r'"HEAD /not-found HTTP/1.." 404 - "-" "bzr/')
498
498
def test_http_get(self):
499
499
server = self.get_readonly_server()
500
t = self._transport(server.get_url())
500
t = self.get_readonly_transport()
501
501
fp = t.get('foo/bar')
502
502
self.assertEqualDiff(
526
526
"""Test registrations of various http implementations"""
528
528
def test_http_registered(self):
529
t = transport.get_transport('%s://foo.com/' % self._qualified_prefix)
529
t = transport.get_transport('%s://foo.com/' % self._url_protocol)
530
530
self.assertIsInstance(t, transport.Transport)
531
531
self.assertIsInstance(t, self._transport)
536
536
def test_post_body_is_received(self):
537
537
server = RecordingServer(expect_body_tail='end-of-body',
538
scheme=self._qualified_prefix)
538
scheme=self._url_protocol)
539
539
self.start_server(server)
540
540
url = server.get_url()
541
http_transport = self._transport(url)
541
# FIXME: needs a cleanup -- vila 20100611
542
http_transport = transport.get_transport(url)
542
543
code, response = http_transport._post('abc def end-of-body')
544
545
server.received_bytes.startswith('POST /.bzr/smart HTTP/1.'))
588
589
_req_handler_class = http_server.TestingHTTPRequestHandler
590
591
def create_transport_readonly_server(self):
591
return http_server.HttpServer(self._req_handler_class,
592
protocol_version=self._protocol_version)
592
server = http_server.HttpServer(self._req_handler_class,
593
protocol_version=self._protocol_version)
594
server._url_protocol = self._url_protocol
594
597
def _testing_pycurl(self):
595
598
# TODO: This is duplicated for lots of the classes in this file
600
603
class WallRequestHandler(http_server.TestingHTTPRequestHandler):
601
604
"""Whatever request comes in, close the connection"""
603
def handle_one_request(self):
606
def _handle_one_request(self):
604
607
"""Handle a single HTTP request, by abruptly closing the connection"""
605
608
self.close_connection = 1
611
614
_req_handler_class = WallRequestHandler
613
616
def test_http_has(self):
614
server = self.get_readonly_server()
615
t = self._transport(server.get_url())
617
t = self.get_readonly_transport()
616
618
# Unfortunately httplib (see HTTPResponse._read_status
617
619
# for details) make no distinction between a closed
618
620
# socket and badly formatted status line, so we can't
648
649
_req_handler_class = BadStatusRequestHandler
650
651
def test_http_has(self):
651
server = self.get_readonly_server()
652
t = self._transport(server.get_url())
652
t = self.get_readonly_transport()
653
653
self.assertRaises(errors.InvalidHttpResponse, t.has, 'foo/bar')
655
655
def test_http_get(self):
656
server = self.get_readonly_server()
657
t = self._transport(server.get_url())
656
t = self.get_readonly_transport()
658
657
self.assertRaises(errors.InvalidHttpResponse, t.get, 'foo/bar')
665
664
"""Fakes handling a single HTTP request, returns a bad status"""
666
665
ignored = http_server.TestingHTTPRequestHandler.parse_request(self)
667
666
self.wfile.write("Invalid status line\r\n")
667
# If we don't close the connection pycurl will hang. Since this is a
668
# stress test we don't *have* to respect the protocol, but we don't
669
# have to sabotage it too much either.
670
self.close_connection = True
677
680
_req_handler_class = InvalidStatusRequestHandler
679
def test_http_has(self):
680
if self._testing_pycurl() and self._protocol_version == 'HTTP/1.1':
681
raise tests.KnownFailure(
682
'pycurl hangs if the server send back garbage')
683
super(TestInvalidStatusServer, self).test_http_has()
685
def test_http_get(self):
686
if self._testing_pycurl() and self._protocol_version == 'HTTP/1.1':
687
raise tests.KnownFailure(
688
'pycurl hangs if the server send back garbage')
689
super(TestInvalidStatusServer, self).test_http_get()
692
683
class BadProtocolRequestHandler(http_server.TestingHTTPRequestHandler):
693
684
"""Whatever request comes in, returns a bad protocol version"""
715
706
super(TestBadProtocolServer, self).setUp()
717
708
def test_http_has(self):
718
server = self.get_readonly_server()
719
t = self._transport(server.get_url())
709
t = self.get_readonly_transport()
720
710
self.assertRaises(errors.InvalidHttpResponse, t.has, 'foo/bar')
722
712
def test_http_get(self):
723
server = self.get_readonly_server()
724
t = self._transport(server.get_url())
713
t = self.get_readonly_transport()
725
714
self.assertRaises(errors.InvalidHttpResponse, t.get, 'foo/bar')
741
730
_req_handler_class = ForbiddenRequestHandler
743
732
def test_http_has(self):
744
server = self.get_readonly_server()
745
t = self._transport(server.get_url())
733
t = self.get_readonly_transport()
746
734
self.assertRaises(errors.TransportError, t.has, 'foo/bar')
748
736
def test_http_get(self):
749
server = self.get_readonly_server()
750
t = self._transport(server.get_url())
737
t = self.get_readonly_transport()
751
738
self.assertRaises(errors.TransportError, t.get, 'foo/bar')
792
779
self.build_tree_contents([('a', '0123456789')],)
794
781
def test_readv(self):
795
server = self.get_readonly_server()
796
t = self._transport(server.get_url())
782
t = self.get_readonly_transport()
797
783
l = list(t.readv('a', ((0, 1), (1, 1), (3, 2), (9, 1))))
798
784
self.assertEqual(l[0], (0, '0'))
799
785
self.assertEqual(l[1], (1, '1'))
801
787
self.assertEqual(l[3], (9, '9'))
803
789
def test_readv_out_of_order(self):
804
server = self.get_readonly_server()
805
t = self._transport(server.get_url())
790
t = self.get_readonly_transport()
806
791
l = list(t.readv('a', ((1, 1), (9, 1), (0, 1), (3, 2))))
807
792
self.assertEqual(l[0], (1, '1'))
808
793
self.assertEqual(l[1], (9, '9'))
810
795
self.assertEqual(l[3], (3, '34'))
812
797
def test_readv_invalid_ranges(self):
813
server = self.get_readonly_server()
814
t = self._transport(server.get_url())
798
t = self.get_readonly_transport()
816
800
# This is intentionally reading off the end of the file
817
801
# since we are sure that it cannot get there
840
824
def test_readv_get_max_size(self):
841
825
server = self.get_readonly_server()
842
t = self._transport(server.get_url())
826
t = self.get_readonly_transport()
843
827
# force transport to issue multiple requests by limiting the number of
844
828
# bytes by request. Note that this apply to coalesced offsets only, a
845
829
# single range will keep its size even if bigger than the limit.
855
839
def test_complete_readv_leave_pipe_clean(self):
856
840
server = self.get_readonly_server()
857
t = self._transport(server.get_url())
841
t = self.get_readonly_transport()
858
842
# force transport to issue multiple requests
859
843
t._get_max_size = 2
860
844
l = list(t.readv('a', ((0, 1), (1, 1), (2, 4), (6, 4))))
1022
1006
def test_readv_with_short_reads(self):
1023
1007
server = self.get_readonly_server()
1024
t = self._transport(server.get_url())
1008
t = self.get_readonly_transport()
1025
1009
# Force separate ranges for each offset
1026
1010
t._bytes_to_read_before_seek = 0
1027
1011
ireadv = iter(t.readv('a', ((0, 1), (2, 1), (4, 2), (9, 1))))
1090
1071
self.build_tree_contents([('a', content)],)
1092
1073
def test_few_ranges(self):
1093
t = self.get_transport()
1074
t = self.get_readonly_transport()
1094
1075
l = list(t.readv('a', ((0, 4), (1024, 4), )))
1095
1076
self.assertEqual(l[0], (0, '0000'))
1096
1077
self.assertEqual(l[1], (1024, '0001'))
1097
1078
self.assertEqual(1, self.get_readonly_server().GET_request_nb)
1099
1080
def test_more_ranges(self):
1100
t = self.get_transport()
1081
t = self.get_readonly_transport()
1101
1082
l = list(t.readv('a', ((0, 4), (1024, 4), (4096, 4), (8192, 4))))
1102
1083
self.assertEqual(l[0], (0, '0000'))
1103
1084
self.assertEqual(l[1], (1024, '0001'))
1159
1137
# FIXME: We don't have an https server available, so we don't
1160
# test https connections.
1138
# test https connections. --vila toolongago
1162
1140
def setUp(self):
1163
1141
super(TestProxyHttpServer, self).setUp()
1142
self.transport_secondary_server = http_utils.ProxyServer
1164
1143
self.build_tree_contents([('foo', 'contents of foo\n'),
1165
1144
('foo-proxied', 'proxied contents of foo\n')])
1166
1145
# Let's setup some attributes for tests
1167
self.server = self.get_readonly_server()
1168
self.proxy_address = '%s:%d' % (self.server.host, self.server.port)
1146
server = self.get_readonly_server()
1147
self.server_host_port = '%s:%d' % (server.host, server.port)
1169
1148
if self._testing_pycurl():
1170
1149
# Oh my ! pycurl does not check for the port as part of
1171
1150
# no_proxy :-( So we just test the host part
1172
self.no_proxy_host = self.server.host
1151
self.no_proxy_host = server.host
1174
self.no_proxy_host = self.proxy_address
1153
self.no_proxy_host = self.server_host_port
1175
1154
# The secondary server is the proxy
1176
self.proxy = self.get_secondary_server()
1177
self.proxy_url = self.proxy.get_url()
1155
self.proxy_url = self.get_secondary_url()
1178
1156
self._old_env = {}
1180
1158
def _testing_pycurl(self):
1182
1160
return (features.pycurl.available()
1183
1161
and self._transport == PyCurlTransport)
1185
def create_transport_secondary_server(self):
1186
"""Creates an http server that will serve files with
1187
'-proxied' appended to their names.
1189
return http_utils.ProxyServer(protocol_version=self._protocol_version)
1191
1163
def _install_env(self, env):
1192
1164
for name, value in env.iteritems():
1193
1165
self._old_env[name] = osutils.set_or_unset_env(name, value)
1256
1226
# pycurl *ignores* invalid proxy env variables. If that ever change
1257
1227
# in the future, this test will fail indicating that pycurl do not
1258
1228
# ignore anymore such variables.
1259
self.not_proxied_in_env({'http_proxy': self.proxy_address})
1229
self.not_proxied_in_env({'http_proxy': self.server_host_port})
1261
1231
self.assertRaises(errors.InvalidURL,
1262
1232
self.proxied_in_env,
1263
{'http_proxy': self.proxy_address})
1233
{'http_proxy': self.server_host_port})
1266
1236
class TestRanges(http_utils.TestCaseWithWebserver):
1269
1239
def setUp(self):
1270
1240
http_utils.TestCaseWithWebserver.setUp(self)
1271
1241
self.build_tree_contents([('a', '0123456789')],)
1272
server = self.get_readonly_server()
1273
self.transport = self._transport(server.get_url())
1275
1243
def create_transport_readonly_server(self):
1276
1244
return http_server.HttpServer(protocol_version=self._protocol_version)
1278
1246
def _file_contents(self, relpath, ranges):
1247
t = self.get_readonly_transport()
1279
1248
offsets = [ (start, end - start + 1) for start, end in ranges]
1280
coalesce = self.transport._coalesce_offsets
1249
coalesce = t._coalesce_offsets
1281
1250
coalesced = list(coalesce(offsets, limit=0, fudge_factor=0))
1282
code, data = self.transport._get(relpath, coalesced)
1251
code, data = t._get(relpath, coalesced)
1283
1252
self.assertTrue(code in (200, 206),'_get returns: %d' % code)
1284
1253
for start, end in ranges:
1285
1254
data.seek(start)
1286
1255
yield data.read(end - start + 1)
1288
1257
def _file_tail(self, relpath, tail_amount):
1289
code, data = self.transport._get(relpath, [], tail_amount)
1258
t = self.get_readonly_transport()
1259
code, data = t._get(relpath, [], tail_amount)
1290
1260
self.assertTrue(code in (200, 206),'_get returns: %d' % code)
1291
1261
data.seek(-tail_amount, 2)
1292
1262
return data.read(tail_amount)
1311
1281
class TestHTTPRedirections(http_utils.TestCaseWithRedirectedWebserver):
1312
1282
"""Test redirection between http servers."""
1314
def create_transport_secondary_server(self):
1315
"""Create the secondary server redirecting to the primary server"""
1316
new = self.get_readonly_server()
1318
redirecting = http_utils.HTTPServerRedirecting(
1319
protocol_version=self._protocol_version)
1320
redirecting.redirect_to(new.host, new.port)
1323
1284
def setUp(self):
1324
1285
super(TestHTTPRedirections, self).setUp()
1325
1286
self.build_tree_contents([('a', '0123456789'),
1327
1288
'# Bazaar revision bundle v0.9\n#\n')
1329
# The requests to the old server will be redirected to the new server
1330
self.old_transport = self._transport(self.old_server.get_url())
1332
1291
def test_redirected(self):
1333
self.assertRaises(errors.RedirectRequested, self.old_transport.get, 'a')
1334
t = self._transport(self.new_server.get_url())
1335
self.assertEqual('0123456789', t.get('a').read())
1337
def test_read_redirected_bundle_from_url(self):
1338
from bzrlib.bundle import read_bundle_from_url
1339
url = self.old_transport.abspath('bundle')
1340
bundle = self.applyDeprecated(deprecated_in((1, 12, 0)),
1341
read_bundle_from_url, url)
1342
# If read_bundle_from_url was successful we get an empty bundle
1343
self.assertEqual([], bundle.revisions)
1292
self.assertRaises(errors.RedirectRequested,
1293
self.get_old_transport().get, 'a')
1294
self.assertEqual('0123456789', self.get_new_transport().get('a').read())
1346
1297
class RedirectedRequest(_urllib2_wrappers.Request):
1363
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)
1366
1338
class TestHTTPSilentRedirections(http_utils.TestCaseWithRedirectedWebserver):
1367
1339
"""Test redirections.
1381
1353
if (features.pycurl.available()
1382
1354
and self._transport == PyCurlTransport):
1383
1355
raise tests.TestNotApplicable(
1384
"pycurl doesn't redirect silently annymore")
1356
"pycurl doesn't redirect silently anymore")
1385
1357
super(TestHTTPSilentRedirections, self).setUp()
1386
1358
install_redirected_request(self)
1359
cleanup_http_redirection_connections(self)
1387
1360
self.build_tree_contents([('a','a'),
1389
1362
('1/a', 'redirected once'),
1397
1370
('5/a', 'redirected 5 times'),
1400
self.old_transport = self._transport(self.old_server.get_url())
1402
def create_transport_secondary_server(self):
1403
"""Create the secondary server, redirections are defined in the tests"""
1404
return http_utils.HTTPServerRedirecting(
1405
protocol_version=self._protocol_version)
1407
1373
def test_one_redirection(self):
1408
t = self.old_transport
1410
req = RedirectedRequest('GET', t.abspath('a'))
1374
t = self.get_old_transport()
1375
req = RedirectedRequest('GET', t._remote_path('a'))
1411
1376
new_prefix = 'http://%s:%s' % (self.new_server.host,
1412
1377
self.new_server.port)
1413
1378
self.old_server.redirections = \
1414
1379
[('(.*)', r'%s/1\1' % (new_prefix), 301),]
1415
self.assertEqual('redirected once',t._perform(req).read())
1380
self.assertEqual('redirected once', t._perform(req).read())
1417
1382
def test_five_redirections(self):
1418
t = self.old_transport
1420
req = RedirectedRequest('GET', t.abspath('a'))
1383
t = self.get_old_transport()
1384
req = RedirectedRequest('GET', t._remote_path('a'))
1421
1385
old_prefix = 'http://%s:%s' % (self.old_server.host,
1422
1386
self.old_server.port)
1423
1387
new_prefix = 'http://%s:%s' % (self.new_server.host,
1429
1393
('/4(.*)', r'%s/5\1' % (new_prefix), 301),
1430
1394
('(/[^/]+)', r'%s/1\1' % (old_prefix), 301),
1432
self.assertEqual('redirected 5 times',t._perform(req).read())
1396
self.assertEqual('redirected 5 times', t._perform(req).read())
1435
1399
class TestDoCatchRedirections(http_utils.TestCaseWithRedirectedWebserver):
1438
1402
def setUp(self):
1439
1403
super(TestDoCatchRedirections, self).setUp()
1440
1404
self.build_tree_contents([('a', '0123456789'),],)
1442
self.old_transport = self._transport(self.old_server.get_url())
1444
def get_a(self, transport):
1445
return transport.get('a')
1405
cleanup_http_redirection_connections(self)
1407
self.old_transport = self.get_old_transport()
1447
1412
def test_no_redirection(self):
1448
t = self._transport(self.new_server.get_url())
1413
t = self.get_new_transport()
1450
1415
# We use None for redirected so that we fail if redirected
1451
1416
self.assertEqual('0123456789',
1455
1420
def test_one_redirection(self):
1456
1421
self.redirections = 0
1458
def redirected(transport, exception, redirection_notice):
1423
def redirected(t, exception, redirection_notice):
1459
1424
self.redirections += 1
1460
dir, file = urlutils.split(exception.target)
1461
return self._transport(dir)
1425
redirected_t = t._redirected_to(exception.source, exception.target)
1463
1428
self.assertEqual('0123456789',
1464
1429
transport.do_catching_redirections(
1494
1459
('b', 'contents of b\n'),])
1496
1461
def create_transport_readonly_server(self):
1497
return self._auth_server(protocol_version=self._protocol_version)
1462
server = self._auth_server(protocol_version=self._protocol_version)
1463
server._url_protocol = self._url_protocol
1499
1466
def _testing_pycurl(self):
1500
1467
# TODO: This is duplicated for lots of the classes in this file
1705
1673
def get_user_transport(self, user, password):
1706
1674
self._install_env({'all_proxy': self.get_user_url(user, password)})
1707
return self._transport(self.server.get_url())
1675
return TestAuth.get_user_transport(self, user, password)
1709
1677
def _install_env(self, env):
1710
1678
for name, value in env.iteritems():
1752
1721
# We use the VFS layer as part of HTTP tunnelling tests.
1753
1722
self._captureVar('BZR_NO_SMART_VFS', None)
1754
1723
self.transport_readonly_server = http_utils.HTTPServerWithSmarts
1724
self.http_server = self.get_readonly_server()
1756
1726
def create_transport_readonly_server(self):
1757
return http_utils.HTTPServerWithSmarts(
1727
server = http_utils.HTTPServerWithSmarts(
1758
1728
protocol_version=self._protocol_version)
1729
server._url_protocol = self._url_protocol
1760
1732
def test_open_bzrdir(self):
1761
1733
branch = self.make_branch('relpath')
1762
http_server = self.get_readonly_server()
1763
url = http_server.get_url() + 'relpath'
1734
url = self.http_server.get_url() + 'relpath'
1764
1735
bd = bzrdir.BzrDir.open(url)
1736
self.addCleanup(bd.transport.disconnect)
1765
1737
self.assertIsInstance(bd, _mod_remote.RemoteBzrDir)
1767
1739
def test_bulk_data(self):
1769
1741
# The 'readv' command in the smart protocol both sends and receives
1770
1742
# bulk data, so we use that.
1771
1743
self.build_tree(['data-file'])
1772
http_server = self.get_readonly_server()
1773
http_transport = self._transport(http_server.get_url())
1744
http_transport = transport.get_transport(self.http_server.get_url())
1774
1745
medium = http_transport.get_smart_medium()
1775
1746
# Since we provide the medium, the url below will be mostly ignored
1776
1747
# during the test, as long as the path is '/'.
1784
1755
post_body = 'hello\n'
1785
1756
expected_reply_body = 'ok\x012\n'
1787
http_server = self.get_readonly_server()
1788
http_transport = self._transport(http_server.get_url())
1758
http_transport = transport.get_transport(self.http_server.get_url())
1789
1759
medium = http_transport.get_smart_medium()
1790
1760
response = medium.send_http_smart_request(post_body)
1791
1761
reply_body = response.read()
1792
1762
self.assertEqual(expected_reply_body, reply_body)
1794
1764
def test_smart_http_server_post_request_handler(self):
1795
httpd = self.get_readonly_server()._get_httpd()
1765
httpd = self.http_server.server
1797
1767
socket = SampleSocket(
1798
1768
'POST /.bzr/smart %s \r\n' % self._protocol_version
1831
1801
def test_probe_smart_server(self):
1832
1802
"""Test error handling against server refusing smart requests."""
1833
server = self.get_readonly_server()
1834
t = self._transport(server.get_url())
1803
t = self.get_readonly_transport()
1835
1804
# No need to build a valid smart request here, the server will not even
1836
1805
# try to interpret it.
1837
1806
self.assertRaises(errors.SmartProtocolError,
1838
1807
t.get_smart_medium().send_http_smart_request,
1841
1811
class Test_redirected_to(tests.TestCase):
1843
1813
def test_redirected_to_subdir(self):
1966
1936
# We override at class level because constructors may propagate the
1967
1937
# bound method and render instance overriding ineffective (an
1968
1938
# alternative would be to define a specific ui factory instead...)
1969
self.orig_report_activity = self._transport._report_activity
1970
self._transport._report_activity = report_activity
1973
self._transport._report_activity = self.orig_report_activity
1974
self.server.stop_server()
1975
tests.TestCase.tearDown(self)
1939
self.overrideAttr(self._transport, '_report_activity', report_activity)
1940
self.addCleanup(self.server.stop_server)
1977
1942
def get_transport(self):
1978
return self._transport(self.server.get_url())
1943
t = self._transport(self.server.get_url())
1944
# FIXME: Needs cleanup -- vila 20100611
1980
1947
def assertActivitiesMatch(self):
1981
1948
self.assertEqual(self.server.bytes_read,
2087
2054
t = self.get_transport()
2088
2055
# We must send a single line of body bytes, see
2089
# PredefinedRequestHandler.handle_one_request
2056
# PredefinedRequestHandler._handle_one_request
2090
2057
code, f = t._post('abc def end-of-body\n')
2091
2058
self.assertEqual('lalala whatever as long as itsssss\n', f.read())
2092
2059
self.assertActivitiesMatch()
2095
2062
class TestActivity(tests.TestCase, TestActivityMixin):
2097
2064
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)
2105
self.activities[direction] = count
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
2114
self._transport._report_activity = self.orig_report_activity
2115
self.server.stop_server()
2116
tests.TestCase.tearDown(self)
2065
TestActivityMixin.setUp(self)
2119
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'
2121
2078
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
2131
self.server.start_server()
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
2140
self._transport._report_activity = self.orig_report_activity
2141
self.server.stop_server()
2142
tests.TestCase.tearDown(self)
2079
self._transport =_urllib.HttpTransport_urllib
2080
TestActivityMixin.setUp(self)
2144
2082
def assertActivitiesMatch(self):
2145
2083
# Nothing to check here
2155
2093
_auth_server = http_utils.HTTPBasicAuthServer
2156
2094
_transport = _urllib.HttpTransport_urllib
2158
def create_transport_readonly_server(self):
2159
return self._auth_server()
2161
def create_transport_secondary_server(self):
2162
"""Create the secondary server redirecting to the primary server"""
2163
new = self.get_readonly_server()
2165
redirecting = http_utils.HTTPServerRedirecting()
2166
redirecting.redirect_to(new.host, new.port)
2169
2096
def setUp(self):
2170
2097
super(TestAuthOnRedirected, self).setUp()
2171
2098
self.build_tree_contents([('a','a'),
2176
2103
self.new_server.port)
2177
2104
self.old_server.redirections = [
2178
2105
('(.*)', r'%s/1\1' % (new_prefix), 301),]
2179
self.old_transport = self._transport(self.old_server.get_url())
2106
self.old_transport = self.get_old_transport()
2180
2107
self.new_server.add_user('joe', 'foo')
2182
def get_a(self, transport):
2183
return transport.get('a')
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
2185
2118
def test_auth_on_redirected_via_do_catching_redirections(self):
2186
2119
self.redirections = 0
2188
def redirected(transport, exception, redirection_notice):
2121
def redirected(t, exception, redirection_notice):
2189
2122
self.redirections += 1
2190
dir, file = urlutils.split(exception.target)
2191
return self._transport(dir)
2123
redirected_t = t._redirected_to(exception.source, exception.target)
2124
self.addCleanup(redirected_t.disconnect)
2193
2127
stdout = tests.StringIOWrapper()
2194
2128
stderr = tests.StringIOWrapper()
2215
2149
self.new_server.port)
2216
2150
self.old_server.redirections = [
2217
2151
('(.*)', r'%s/1\1' % (new_prefix), 301),]
2218
self.assertEqual('redirected once',t._perform(req).read())
2152
self.assertEqual('redirected once', t._perform(req).read())
2219
2153
# stdin should be empty
2220
2154
self.assertEqual('', ui.ui_factory.stdin.readline())
2221
2155
# stdout should be empty, stderr will contains the prompts
added
removed
bzrlib/tests/test_http.py
