66
65
from bzrlib.transport.http._pycurl import PyCurlTransport
69
def load_tests(standard_tests, module, loader):
70
"""Multiply tests for http clients and protocol versions."""
71
result = loader.suiteClass()
73
# one for each transport implementation
74
t_tests, remaining_tests = tests.split_suite_by_condition(
75
standard_tests, tests.condition_isinstance((
76
TestHttpTransportRegistration,
77
TestHttpTransportUrls,
68
load_tests = load_tests_apply_scenarios
71
def vary_by_http_client_implementation():
72
"""Test the two libraries we can use, pycurl and urllib."""
80
73
transport_scenarios = [
81
74
('urllib', dict(_transport=_urllib.HttpTransport_urllib,
82
75
_server=http_server.HttpServer_urllib,
83
_qualified_prefix='http+urllib',)),
76
_url_protocol='http+urllib',)),
85
78
if features.pycurl.available():
86
79
transport_scenarios.append(
87
80
('pycurl', dict(_transport=PyCurlTransport,
88
81
_server=http_server.HttpServer_PyCurl,
89
_qualified_prefix='http+pycurl',)))
90
tests.multiply_tests(t_tests, transport_scenarios, result)
92
# each implementation tested with each HTTP version
93
tp_tests, remaining_tests = tests.split_suite_by_condition(
94
remaining_tests, tests.condition_isinstance((
95
SmartHTTPTunnellingTest,
96
TestDoCatchRedirections,
99
TestHTTPSilentRedirections,
100
TestLimitedRangeRequestServer,
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')),
110
tp_scenarios = tests.multiply_scenarios(transport_scenarios,
112
tests.multiply_tests(tp_tests, tp_scenarios, result)
114
# proxy auth: each auth scheme on all http versions on all implementations.
115
tppa_tests, remaining_tests = tests.split_suite_by_condition(
116
remaining_tests, tests.condition_isinstance((
119
proxy_auth_scheme_scenarios = [
82
_url_protocol='http+pycurl',)))
83
return transport_scenarios
86
def vary_by_http_protocol_version():
87
"""Test on http/1.0 and 1.1"""
89
('HTTP/1.0', dict(_protocol_version='HTTP/1.0')),
90
('HTTP/1.1', dict(_protocol_version='HTTP/1.1')),
94
def vary_by_http_proxy_auth_scheme():
120
96
('basic', dict(_auth_server=http_utils.ProxyBasicAuthServer)),
121
97
('digest', dict(_auth_server=http_utils.ProxyDigestAuthServer)),
123
dict(_auth_server=http_utils.ProxyBasicAndDigestAuthServer)),
99
dict(_auth_server=http_utils.ProxyBasicAndDigestAuthServer)),
125
tppa_scenarios = tests.multiply_scenarios(tp_scenarios,
126
proxy_auth_scheme_scenarios)
127
tests.multiply_tests(tppa_tests, tppa_scenarios, result)
129
# auth: each auth scheme on all http versions on all implementations.
130
tpa_tests, remaining_tests = tests.split_suite_by_condition(
131
remaining_tests, tests.condition_isinstance((
134
auth_scheme_scenarios = [
103
def vary_by_http_auth_scheme():
135
105
('basic', dict(_auth_server=http_utils.HTTPBasicAuthServer)),
136
106
('digest', dict(_auth_server=http_utils.HTTPDigestAuthServer)),
138
dict(_auth_server=http_utils.HTTPBasicAndDigestAuthServer)),
108
dict(_auth_server=http_utils.HTTPBasicAndDigestAuthServer)),
140
tpa_scenarios = tests.multiply_scenarios(tp_scenarios,
141
auth_scheme_scenarios)
142
tests.multiply_tests(tpa_tests, tpa_scenarios, result)
144
# activity: on all http[s] versions on all implementations
145
tpact_tests, remaining_tests = tests.split_suite_by_condition(
146
remaining_tests, tests.condition_isinstance((
112
def vary_by_http_activity():
149
113
activity_scenarios = [
150
114
('urllib,http', dict(_activity_server=ActivityHTTPServer,
151
_transport=_urllib.HttpTransport_urllib,)),
115
_transport=_urllib.HttpTransport_urllib,)),
153
117
if tests.HTTPSServerFeature.available():
154
118
activity_scenarios.append(
155
119
('urllib,https', dict(_activity_server=ActivityHTTPSServer,
156
_transport=_urllib.HttpTransport_urllib,)),)
120
_transport=_urllib.HttpTransport_urllib,)),)
157
121
if features.pycurl.available():
158
122
activity_scenarios.append(
159
123
('pycurl,http', dict(_activity_server=ActivityHTTPServer,
160
_transport=PyCurlTransport,)),)
124
_transport=PyCurlTransport,)),)
161
125
if tests.HTTPSServerFeature.available():
162
126
from bzrlib.tests import (
223
179
self._sock.bind(('127.0.0.1', 0))
224
180
self.host, self.port = self._sock.getsockname()
225
181
self._ready = threading.Event()
226
self._thread = threading.Thread(target=self._accept_read_and_reply)
227
self._thread.setDaemon(True)
182
self._thread = test_server.TestThread(
183
sync_event=self._ready, target=self._accept_read_and_reply)
228
184
self._thread.start()
185
if 'threads' in tests.selftest_debug_flags:
186
sys.stderr.write('Thread started: %s\n' % (self._thread.ident,))
231
189
def _accept_read_and_reply(self):
232
190
self._sock.listen(1)
233
191
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)
192
conn, address = self._sock.accept()
193
if self._expect_body_tail is not None:
240
194
while not self.received_bytes.endswith(self._expect_body_tail):
241
195
self.received_bytes += conn.recv(4096)
242
196
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
198
self._sock.close()
246
199
except socket.error:
247
200
# The client may have already closed the socket.
296
255
self.assertEqual('realm="Thou should not pass"', remainder)
258
class TestHTTPRangeParsing(tests.TestCase):
261
super(TestHTTPRangeParsing, self).setUp()
262
# We focus on range parsing here and ignore everything else
263
class RequestHandler(http_server.TestingHTTPRequestHandler):
264
def setup(self): pass
265
def handle(self): pass
266
def finish(self): pass
268
self.req_handler = RequestHandler(None, None, None)
270
def assertRanges(self, ranges, header, file_size):
271
self.assertEquals(ranges,
272
self.req_handler._parse_ranges(header, file_size))
274
def test_simple_range(self):
275
self.assertRanges([(0,2)], 'bytes=0-2', 12)
278
self.assertRanges([(8, 11)], 'bytes=-4', 12)
280
def test_tail_bigger_than_file(self):
281
self.assertRanges([(0, 11)], 'bytes=-99', 12)
283
def test_range_without_end(self):
284
self.assertRanges([(4, 11)], 'bytes=4-', 12)
286
def test_invalid_ranges(self):
287
self.assertRanges(None, 'bytes=12-22', 12)
288
self.assertRanges(None, 'bytes=1-3,12-22', 12)
289
self.assertRanges(None, 'bytes=-', 12)
299
292
class TestHTTPServer(tests.TestCase):
300
293
"""Test the HTTP servers implementations."""
305
298
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')
300
self.assertRaises(httplib.UnknownProtocol,
301
http_server.HttpServer, BogusRequestHandler)
314
303
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')
304
self.assertRaises(httplib.UnknownProtocol,
305
http_server.HttpServer, protocol_version='HTTP/0.1')
322
307
def test_server_start_and_stop(self):
323
308
server = http_server.HttpServer()
309
self.addCleanup(server.stop_server)
324
310
server.start_server()
326
self.assertTrue(server._http_running)
329
self.assertFalse(server._http_running)
311
self.assertTrue(server.server is not None)
312
self.assertTrue(server.server.serving is not None)
313
self.assertTrue(server.server.serving)
331
315
def test_create_http_server_one_zero(self):
332
316
class RequestHandlerOneZero(http_server.TestingHTTPRequestHandler):
401
385
class TestHttpTransportUrls(tests.TestCase):
402
386
"""Test the http urls."""
388
scenarios = vary_by_http_client_implementation()
404
390
def test_abs_url(self):
405
391
"""Construction of absolute http URLs"""
406
t = self._transport('http://bazaar-vcs.org/bzr/bzr.dev/')
392
t = self._transport('http://example.com/bzr/bzr.dev/')
407
393
eq = self.assertEqualDiff
408
eq(t.abspath('.'), 'http://bazaar-vcs.org/bzr/bzr.dev')
409
eq(t.abspath('foo/bar'), 'http://bazaar-vcs.org/bzr/bzr.dev/foo/bar')
410
eq(t.abspath('.bzr'), 'http://bazaar-vcs.org/bzr/bzr.dev/.bzr')
394
eq(t.abspath('.'), 'http://example.com/bzr/bzr.dev')
395
eq(t.abspath('foo/bar'), 'http://example.com/bzr/bzr.dev/foo/bar')
396
eq(t.abspath('.bzr'), 'http://example.com/bzr/bzr.dev/.bzr')
411
397
eq(t.abspath('.bzr/1//2/./3'),
412
'http://bazaar-vcs.org/bzr/bzr.dev/.bzr/1/2/3')
398
'http://example.com/bzr/bzr.dev/.bzr/1/2/3')
414
400
def test_invalid_http_urls(self):
415
401
"""Trap invalid construction of urls"""
416
t = self._transport('http://bazaar-vcs.org/bzr/bzr.dev/')
402
self._transport('http://example.com/bzr/bzr.dev/')
417
403
self.assertRaises(errors.InvalidURL,
419
'http://http://bazaar-vcs.org/bzr/bzr.dev/')
405
'http://http://example.com/bzr/bzr.dev/')
421
407
def test_http_root_urls(self):
422
408
"""Construction of URLs from server root"""
423
t = self._transport('http://bzr.ozlabs.org/')
409
t = self._transport('http://example.com/')
424
410
eq = self.assertEqualDiff
425
411
eq(t.abspath('.bzr/tree-version'),
426
'http://bzr.ozlabs.org/.bzr/tree-version')
412
'http://example.com/.bzr/tree-version')
428
414
def test_http_impl_urls(self):
429
415
"""There are servers which ask for particular clients to connect"""
525
516
class TestHttpTransportRegistration(tests.TestCase):
526
517
"""Test registrations of various http implementations"""
519
scenarios = vary_by_http_client_implementation()
528
521
def test_http_registered(self):
529
t = transport.get_transport('%s://foo.com/' % self._qualified_prefix)
522
t = transport.get_transport('%s://foo.com/' % self._url_protocol)
530
523
self.assertIsInstance(t, transport.Transport)
531
524
self.assertIsInstance(t, self._transport)
534
527
class TestPost(tests.TestCase):
529
scenarios = multiply_scenarios(
530
vary_by_http_client_implementation(),
531
vary_by_http_protocol_version(),
536
534
def test_post_body_is_received(self):
537
535
server = RecordingServer(expect_body_tail='end-of-body',
538
scheme=self._qualified_prefix)
536
scheme=self._url_protocol)
539
537
self.start_server(server)
540
538
url = server.get_url()
541
http_transport = self._transport(url)
539
# FIXME: needs a cleanup -- vila 20100611
540
http_transport = transport.get_transport(url)
542
541
code, response = http_transport._post('abc def end-of-body')
544
543
server.received_bytes.startswith('POST /.bzr/smart HTTP/1.'))
545
544
self.assertTrue('content-length: 19\r' in server.received_bytes.lower())
545
self.assertTrue('content-type: application/octet-stream\r'
546
in server.received_bytes.lower())
546
547
# The transport should not be assuming that the server can accept
547
548
# chunked encoding the first time it connects, because HTTP/1.1, so we
548
549
# check for the literal string.
1090
1084
self.build_tree_contents([('a', content)],)
1092
1086
def test_few_ranges(self):
1093
t = self.get_transport()
1087
t = self.get_readonly_transport()
1094
1088
l = list(t.readv('a', ((0, 4), (1024, 4), )))
1095
1089
self.assertEqual(l[0], (0, '0000'))
1096
1090
self.assertEqual(l[1], (1024, '0001'))
1097
1091
self.assertEqual(1, self.get_readonly_server().GET_request_nb)
1099
1093
def test_more_ranges(self):
1100
t = self.get_transport()
1094
t = self.get_readonly_transport()
1101
1095
l = list(t.readv('a', ((0, 4), (1024, 4), (4096, 4), (8192, 4))))
1102
1096
self.assertEqual(l[0], (0, '0000'))
1103
1097
self.assertEqual(l[1], (1024, '0001'))
1114
1108
Only the urllib implementation is tested here.
1118
tests.TestCase.setUp(self)
1123
tests.TestCase.tearDown(self)
1125
def _install_env(self, env):
1126
for name, value in env.iteritems():
1127
self._old_env[name] = osutils.set_or_unset_env(name, value)
1129
def _restore_env(self):
1130
for name, value in self._old_env.iteritems():
1131
osutils.set_or_unset_env(name, value)
1133
1111
def _proxied_request(self):
1134
1112
handler = _urllib2_wrappers.ProxyHandler()
1135
request = _urllib2_wrappers.Request('GET','http://baz/buzzle')
1113
request = _urllib2_wrappers.Request('GET', 'http://baz/buzzle')
1136
1114
handler.set_proxy(request, 'http')
1117
def assertEvaluateProxyBypass(self, expected, host, no_proxy):
1118
handler = _urllib2_wrappers.ProxyHandler()
1119
self.assertEquals(expected,
1120
handler.evaluate_proxy_bypass(host, no_proxy))
1139
1122
def test_empty_user(self):
1140
self._install_env({'http_proxy': 'http://bar.com'})
1123
self.overrideEnv('http_proxy', 'http://bar.com')
1124
request = self._proxied_request()
1125
self.assertFalse(request.headers.has_key('Proxy-authorization'))
1127
def test_user_with_at(self):
1128
self.overrideEnv('http_proxy',
1129
'http://username@domain:password@proxy_host:1234')
1141
1130
request = self._proxied_request()
1142
1131
self.assertFalse(request.headers.has_key('Proxy-authorization'))
1144
1133
def test_invalid_proxy(self):
1145
1134
"""A proxy env variable without scheme"""
1146
self._install_env({'http_proxy': 'host:1234'})
1135
self.overrideEnv('http_proxy', 'host:1234')
1147
1136
self.assertRaises(errors.InvalidURL, self._proxied_request)
1138
def test_evaluate_proxy_bypass_true(self):
1139
"""The host is not proxied"""
1140
self.assertEvaluateProxyBypass(True, 'example.com', 'example.com')
1141
self.assertEvaluateProxyBypass(True, 'bzr.example.com', '*example.com')
1143
def test_evaluate_proxy_bypass_false(self):
1144
"""The host is proxied"""
1145
self.assertEvaluateProxyBypass(False, 'bzr.example.com', None)
1147
def test_evaluate_proxy_bypass_unknown(self):
1148
"""The host is not explicitly proxied"""
1149
self.assertEvaluateProxyBypass(None, 'example.com', 'not.example.com')
1150
self.assertEvaluateProxyBypass(None, 'bzr.example.com', 'example.com')
1152
def test_evaluate_proxy_bypass_empty_entries(self):
1153
"""Ignore empty entries"""
1154
self.assertEvaluateProxyBypass(None, 'example.com', '')
1155
self.assertEvaluateProxyBypass(None, 'example.com', ',')
1156
self.assertEvaluateProxyBypass(None, 'example.com', 'foo,,bar')
1150
1159
class TestProxyHttpServer(http_utils.TestCaseWithTwoWebservers):
1151
1160
"""Tests proxy server.
1156
1165
to the file names).
1168
scenarios = multiply_scenarios(
1169
vary_by_http_client_implementation(),
1170
vary_by_http_protocol_version(),
1159
1173
# FIXME: We don't have an https server available, so we don't
1160
# test https connections.
1174
# test https connections. --vila toolongago
1162
1176
def setUp(self):
1163
1177
super(TestProxyHttpServer, self).setUp()
1178
self.transport_secondary_server = http_utils.ProxyServer
1164
1179
self.build_tree_contents([('foo', 'contents of foo\n'),
1165
1180
('foo-proxied', 'proxied contents of foo\n')])
1166
1181
# 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)
1182
server = self.get_readonly_server()
1183
self.server_host_port = '%s:%d' % (server.host, server.port)
1169
1184
if self._testing_pycurl():
1170
1185
# Oh my ! pycurl does not check for the port as part of
1171
1186
# no_proxy :-( So we just test the host part
1172
self.no_proxy_host = self.server.host
1187
self.no_proxy_host = server.host
1174
self.no_proxy_host = self.proxy_address
1189
self.no_proxy_host = self.server_host_port
1175
1190
# The secondary server is the proxy
1176
self.proxy = self.get_secondary_server()
1177
self.proxy_url = self.proxy.get_url()
1191
self.proxy_url = self.get_secondary_url()
1180
1193
def _testing_pycurl(self):
1181
1194
# TODO: This is duplicated for lots of the classes in this file
1182
1195
return (features.pycurl.available()
1183
1196
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
def _install_env(self, env):
1192
for name, value in env.iteritems():
1193
self._old_env[name] = osutils.set_or_unset_env(name, value)
1195
def _restore_env(self):
1196
for name, value in self._old_env.iteritems():
1197
osutils.set_or_unset_env(name, value)
1199
def proxied_in_env(self, env):
1200
self._install_env(env)
1201
url = self.server.get_url()
1202
t = self._transport(url)
1204
self.assertEqual('proxied contents of foo\n', t.get('foo').read())
1208
def not_proxied_in_env(self, env):
1209
self._install_env(env)
1210
url = self.server.get_url()
1211
t = self._transport(url)
1213
self.assertEqual('contents of foo\n', t.get('foo').read())
1198
def assertProxied(self):
1199
t = self.get_readonly_transport()
1200
self.assertEqual('proxied contents of foo\n', t.get('foo').read())
1202
def assertNotProxied(self):
1203
t = self.get_readonly_transport()
1204
self.assertEqual('contents of foo\n', t.get('foo').read())
1217
1206
def test_http_proxy(self):
1218
self.proxied_in_env({'http_proxy': self.proxy_url})
1207
self.overrideEnv('http_proxy', self.proxy_url)
1208
self.assertProxied()
1220
1210
def test_HTTP_PROXY(self):
1221
1211
if self._testing_pycurl():
1224
1214
# about. Should we ?)
1225
1215
raise tests.TestNotApplicable(
1226
1216
'pycurl does not check HTTP_PROXY for security reasons')
1227
self.proxied_in_env({'HTTP_PROXY': self.proxy_url})
1217
self.overrideEnv('HTTP_PROXY', self.proxy_url)
1218
self.assertProxied()
1229
1220
def test_all_proxy(self):
1230
self.proxied_in_env({'all_proxy': self.proxy_url})
1221
self.overrideEnv('all_proxy', self.proxy_url)
1222
self.assertProxied()
1232
1224
def test_ALL_PROXY(self):
1233
self.proxied_in_env({'ALL_PROXY': self.proxy_url})
1225
self.overrideEnv('ALL_PROXY', self.proxy_url)
1226
self.assertProxied()
1235
1228
def test_http_proxy_with_no_proxy(self):
1236
self.not_proxied_in_env({'http_proxy': self.proxy_url,
1237
'no_proxy': self.no_proxy_host})
1229
self.overrideEnv('no_proxy', self.no_proxy_host)
1230
self.overrideEnv('http_proxy', self.proxy_url)
1231
self.assertNotProxied()
1239
1233
def test_HTTP_PROXY_with_NO_PROXY(self):
1240
1234
if self._testing_pycurl():
1241
1235
raise tests.TestNotApplicable(
1242
1236
'pycurl does not check HTTP_PROXY for security reasons')
1243
self.not_proxied_in_env({'HTTP_PROXY': self.proxy_url,
1244
'NO_PROXY': self.no_proxy_host})
1237
self.overrideEnv('NO_PROXY', self.no_proxy_host)
1238
self.overrideEnv('HTTP_PROXY', self.proxy_url)
1239
self.assertNotProxied()
1246
1241
def test_all_proxy_with_no_proxy(self):
1247
self.not_proxied_in_env({'all_proxy': self.proxy_url,
1248
'no_proxy': self.no_proxy_host})
1242
self.overrideEnv('no_proxy', self.no_proxy_host)
1243
self.overrideEnv('all_proxy', self.proxy_url)
1244
self.assertNotProxied()
1250
1246
def test_ALL_PROXY_with_NO_PROXY(self):
1251
self.not_proxied_in_env({'ALL_PROXY': self.proxy_url,
1252
'NO_PROXY': self.no_proxy_host})
1247
self.overrideEnv('NO_PROXY', self.no_proxy_host)
1248
self.overrideEnv('ALL_PROXY', self.proxy_url)
1249
self.assertNotProxied()
1254
1251
def test_http_proxy_without_scheme(self):
1252
self.overrideEnv('http_proxy', self.server_host_port)
1255
1253
if self._testing_pycurl():
1256
1254
# pycurl *ignores* invalid proxy env variables. If that ever change
1257
1255
# in the future, this test will fail indicating that pycurl do not
1258
1256
# ignore anymore such variables.
1259
self.not_proxied_in_env({'http_proxy': self.proxy_address})
1257
self.assertNotProxied()
1261
self.assertRaises(errors.InvalidURL,
1262
self.proxied_in_env,
1263
{'http_proxy': self.proxy_address})
1259
self.assertRaises(errors.InvalidURL, self.assertProxied)
1266
1262
class TestRanges(http_utils.TestCaseWithWebserver):
1267
1263
"""Test the Range header in GET methods."""
1265
scenarios = multiply_scenarios(
1266
vary_by_http_client_implementation(),
1267
vary_by_http_protocol_version(),
1269
1270
def setUp(self):
1270
1271
http_utils.TestCaseWithWebserver.setUp(self)
1271
1272
self.build_tree_contents([('a', '0123456789')],)
1272
server = self.get_readonly_server()
1273
self.transport = self._transport(server.get_url())
1275
1274
def create_transport_readonly_server(self):
1276
1275
return http_server.HttpServer(protocol_version=self._protocol_version)
1278
1277
def _file_contents(self, relpath, ranges):
1278
t = self.get_readonly_transport()
1279
1279
offsets = [ (start, end - start + 1) for start, end in ranges]
1280
coalesce = self.transport._coalesce_offsets
1280
coalesce = t._coalesce_offsets
1281
1281
coalesced = list(coalesce(offsets, limit=0, fudge_factor=0))
1282
code, data = self.transport._get(relpath, coalesced)
1282
code, data = t._get(relpath, coalesced)
1283
1283
self.assertTrue(code in (200, 206),'_get returns: %d' % code)
1284
1284
for start, end in ranges:
1285
1285
data.seek(start)
1286
1286
yield data.read(end - start + 1)
1288
1288
def _file_tail(self, relpath, tail_amount):
1289
code, data = self.transport._get(relpath, [], tail_amount)
1289
t = self.get_readonly_transport()
1290
code, data = t._get(relpath, [], tail_amount)
1290
1291
self.assertTrue(code in (200, 206),'_get returns: %d' % code)
1291
1292
data.seek(-tail_amount, 2)
1292
1293
return data.read(tail_amount)
1327
1324
'# 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
1327
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)
1328
self.assertRaises(errors.RedirectRequested,
1329
self.get_old_transport().get, 'a')
1330
self.assertEqual('0123456789', self.get_new_transport().get('a').read())
1346
1333
class RedirectedRequest(_urllib2_wrappers.Request):
1397
1411
('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
1414
def test_one_redirection(self):
1408
t = self.old_transport
1410
req = RedirectedRequest('GET', t.abspath('a'))
1415
t = self.get_old_transport()
1416
req = RedirectedRequest('GET', t._remote_path('a'))
1411
1417
new_prefix = 'http://%s:%s' % (self.new_server.host,
1412
1418
self.new_server.port)
1413
1419
self.old_server.redirections = \
1414
1420
[('(.*)', r'%s/1\1' % (new_prefix), 301),]
1415
self.assertEqual('redirected once',t._perform(req).read())
1421
self.assertEqual('redirected once', t._perform(req).read())
1417
1423
def test_five_redirections(self):
1418
t = self.old_transport
1420
req = RedirectedRequest('GET', t.abspath('a'))
1424
t = self.get_old_transport()
1425
req = RedirectedRequest('GET', t._remote_path('a'))
1421
1426
old_prefix = 'http://%s:%s' % (self.old_server.host,
1422
1427
self.old_server.port)
1423
1428
new_prefix = 'http://%s:%s' % (self.new_server.host,
1429
1434
('/4(.*)', r'%s/5\1' % (new_prefix), 301),
1430
1435
('(/[^/]+)', r'%s/1\1' % (old_prefix), 301),
1432
self.assertEqual('redirected 5 times',t._perform(req).read())
1437
self.assertEqual('redirected 5 times', t._perform(req).read())
1435
1440
class TestDoCatchRedirections(http_utils.TestCaseWithRedirectedWebserver):
1436
1441
"""Test transport.do_catching_redirections."""
1443
scenarios = multiply_scenarios(
1444
vary_by_http_client_implementation(),
1445
vary_by_http_protocol_version(),
1438
1448
def setUp(self):
1439
1449
super(TestDoCatchRedirections, self).setUp()
1440
1450
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')
1451
cleanup_http_redirection_connections(self)
1453
self.old_transport = self.get_old_transport()
1447
1458
def test_no_redirection(self):
1448
t = self._transport(self.new_server.get_url())
1459
t = self.get_new_transport()
1450
1461
# We use None for redirected so that we fail if redirected
1451
1462
self.assertEqual('0123456789',
1642
1662
# Only one 'Authentication Required' error should occur
1643
1663
self.assertEqual(1, self.server.auth_required_errors)
1645
def test_user_from_auth_conf(self):
1646
if self._testing_pycurl():
1647
raise tests.TestNotApplicable(
1648
'pycurl does not support authentication.conf')
1651
self.server.add_user(user, password)
1652
# Create a minimal config file with the right password
1653
conf = config.AuthenticationConfig()
1654
conf._get_config().update(
1655
{'httptest': {'scheme': 'http', 'port': self.server.port,
1656
'user': user, 'password': password}})
1658
t = self.get_user_transport(None, None)
1659
# Issue a request to the server to connect
1660
self.assertEqual('contents of a\n', t.get('a').read())
1661
# Only one 'Authentication Required' error should occur
1662
self.assertEqual(1, self.server.auth_required_errors)
1664
1665
def test_changing_nonce(self):
1665
1666
if self._auth_server not in (http_utils.HTTPDigestAuthServer,
1666
1667
http_utils.ProxyDigestAuthServer):
1682
1683
# initial 'who are you' and a second 'who are you' with the new nonce)
1683
1684
self.assertEqual(2, self.server.auth_required_errors)
1686
def test_user_from_auth_conf(self):
1687
if self._testing_pycurl():
1688
raise tests.TestNotApplicable(
1689
'pycurl does not support authentication.conf')
1692
self.server.add_user(user, password)
1693
_setup_authentication_config(
1695
port=self.server.port,
1698
t = self.get_user_transport(None, None)
1699
# Issue a request to the server to connect
1700
self.assertEqual('contents of a\n', t.get('a').read())
1701
# Only one 'Authentication Required' error should occur
1702
self.assertEqual(1, self.server.auth_required_errors)
1705
def _setup_authentication_config(**kwargs):
1706
conf = config.AuthenticationConfig()
1707
conf._get_config().update({'httptest': kwargs})
1712
class TestUrllib2AuthHandler(tests.TestCaseWithTransport):
1713
"""Unit tests for glue by which urllib2 asks us for authentication"""
1715
def test_get_user_password_without_port(self):
1716
"""We cope if urllib2 doesn't tell us the port.
1718
See https://bugs.launchpad.net/bzr/+bug/654684
1722
_setup_authentication_config(
1727
handler = _urllib2_wrappers.HTTPAuthHandler()
1728
got_pass = handler.get_user_password(dict(
1735
self.assertEquals((user, password), got_pass)
1687
1738
class TestProxyAuth(TestAuth):
1688
1739
"""Test proxy authentication schemes."""
1741
scenarios = multiply_scenarios(
1742
vary_by_http_client_implementation(),
1743
vary_by_http_protocol_version(),
1744
vary_by_http_proxy_auth_scheme(),
1690
1747
_auth_header = 'Proxy-authorization'
1691
1748
_password_prompt_prefix = 'Proxy '
1692
1749
_username_prompt_prefix = 'Proxy '
1694
1751
def setUp(self):
1695
1752
super(TestProxyAuth, self).setUp()
1697
self.addCleanup(self._restore_env)
1698
1753
# Override the contents to avoid false positives
1699
1754
self.build_tree_contents([('a', 'not proxied contents of a\n'),
1700
1755
('b', 'not proxied contents of b\n'),
1748
1796
class SmartHTTPTunnellingTest(tests.TestCaseWithTransport):
1798
scenarios = multiply_scenarios(
1799
vary_by_http_client_implementation(),
1800
vary_by_http_protocol_version(),
1750
1803
def setUp(self):
1751
1804
super(SmartHTTPTunnellingTest, self).setUp()
1752
1805
# We use the VFS layer as part of HTTP tunnelling tests.
1753
self._captureVar('BZR_NO_SMART_VFS', None)
1806
self.overrideEnv('BZR_NO_SMART_VFS', None)
1754
1807
self.transport_readonly_server = http_utils.HTTPServerWithSmarts
1808
self.http_server = self.get_readonly_server()
1756
1810
def create_transport_readonly_server(self):
1757
return http_utils.HTTPServerWithSmarts(
1811
server = http_utils.HTTPServerWithSmarts(
1758
1812
protocol_version=self._protocol_version)
1813
server._url_protocol = self._url_protocol
1760
1816
def test_open_bzrdir(self):
1761
1817
branch = self.make_branch('relpath')
1762
http_server = self.get_readonly_server()
1763
url = http_server.get_url() + 'relpath'
1818
url = self.http_server.get_url() + 'relpath'
1764
1819
bd = bzrdir.BzrDir.open(url)
1820
self.addCleanup(bd.transport.disconnect)
1765
1821
self.assertIsInstance(bd, _mod_remote.RemoteBzrDir)
1767
1823
def test_bulk_data(self):
2095
2148
class TestActivity(tests.TestCase, TestActivityMixin):
2150
scenarios = multiply_scenarios(
2151
vary_by_http_activity(),
2152
vary_by_http_protocol_version(),
2097
2155
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)
2156
TestActivityMixin.setUp(self)
2119
2159
class TestNoReportActivity(tests.TestCase, TestActivityMixin):
2161
# Unlike TestActivity, we are really testing ReportingFileSocket and
2162
# ReportingSocket, so we don't need all the parametrization. Since
2163
# ReportingFileSocket and ReportingSocket are wrappers, it's easier to
2164
# test them through their use by the transport than directly (that's a
2165
# bit less clean but far more simpler and effective).
2166
_activity_server = ActivityHTTPServer
2167
_protocol_version = 'HTTP/1.1'
2121
2169
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)
2170
self._transport =_urllib.HttpTransport_urllib
2171
TestActivityMixin.setUp(self)
2144
2173
def assertActivitiesMatch(self):
2145
2174
# Nothing to check here
2176
2196
self.new_server.port)
2177
2197
self.old_server.redirections = [
2178
2198
('(.*)', r'%s/1\1' % (new_prefix), 301),]
2179
self.old_transport = self._transport(self.old_server.get_url())
2199
self.old_transport = self.get_old_transport()
2180
2200
self.new_server.add_user('joe', 'foo')
2182
def get_a(self, transport):
2183
return transport.get('a')
2201
cleanup_http_redirection_connections(self)
2203
def create_transport_readonly_server(self):
2204
server = self._auth_server(protocol_version=self._protocol_version)
2205
server._url_protocol = self._url_protocol
2185
2211
def test_auth_on_redirected_via_do_catching_redirections(self):
2186
2212
self.redirections = 0
2188
def redirected(transport, exception, redirection_notice):
2214
def redirected(t, exception, redirection_notice):
2189
2215
self.redirections += 1
2190
dir, file = urlutils.split(exception.target)
2191
return self._transport(dir)
2216
redirected_t = t._redirected_to(exception.source, exception.target)
2217
self.addCleanup(redirected_t.disconnect)
2193
2220
stdout = tests.StringIOWrapper()
2194
2221
stderr = tests.StringIOWrapper()
added
removed
bzrlib/tests/test_http.py
