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