18
18
"""Tests of the bzr serve command."""
26
28
from bzrlib import (
31
32
revision as _mod_revision,
36
34
from bzrlib.branch import Branch
37
from bzrlib.controldir import ControlDir
35
from bzrlib.bzrdir import BzrDir
38
36
from bzrlib.smart import client, medium
39
from bzrlib.smart.server import (
37
from bzrlib.smart.server import BzrServerFactory, SmartTCPServer
43
38
from bzrlib.tests import (
44
40
TestCaseWithMemoryTransport,
45
41
TestCaseWithTransport,
47
from bzrlib.transport import remote
50
class TestBzrServeBase(TestCaseWithTransport):
52
def run_bzr_serve_then_func(self, serve_args, retcode=0, func=None,
53
*func_args, **func_kwargs):
54
"""Run 'bzr serve', and run the given func in a thread once the server
57
When 'func' terminates, the server will be terminated too.
59
Returns stdout and stderr.
61
def on_server_start_thread(tcp_server):
62
"""This runs concurrently with the server thread.
64
The server is interrupted as soon as ``func`` finishes, even if an
65
exception is encountered.
69
self.tcp_server = tcp_server
72
func(*func_args, **func_kwargs)
74
# Log errors to make some test failures a little less
76
trace.mutter('func broke: %r', e)
78
# Then stop the server
79
trace.mutter('interrupting...')
80
thread.interrupt_main()
81
# When the hook is fired, it just starts ``on_server_start_thread`` and
83
def on_server_start(backing_urls, tcp_server):
85
target=on_server_start_thread, args=(tcp_server,))
88
SmartTCPServer.hooks.install_named_hook(
89
'server_started_ex', on_server_start,
90
'run_bzr_serve_then_func hook')
91
# It seesm thread.interrupt_main() will not raise KeyboardInterrupt
92
# until after socket.accept returns. So we set the timeout low to make
94
self.overrideAttr(SmartTCPServer, '_ACCEPT_TIMEOUT', 0.1)
97
out, err = self.run_bzr(['serve'] + list(serve_args),
99
except KeyboardInterrupt, e:
104
class TestBzrServe(TestBzrServeBase):
44
from bzrlib.trace import mutter
45
from bzrlib.transport import get_transport, remote
48
class TestBzrServe(TestCaseWithTransport):
107
51
super(TestBzrServe, self).setUp()
108
52
self.disable_missing_extensions_warning()
110
def test_server_exception_with_hook(self):
111
"""Catch exception from the server in the server_exception hook.
113
We use ``run_bzr_serve_then_func`` without a ``func`` so the server
114
will receive a KeyboardInterrupt exception we want to catch.
117
if exception[0] is KeyboardInterrupt:
118
sys.stderr.write('catching KeyboardInterrupt\n')
122
SmartTCPServer.hooks.install_named_hook(
123
'server_exception', hook,
124
'test_server_except_hook hook')
125
args = ['--listen', 'localhost', '--port', '0', '--quiet']
126
out, err = self.run_bzr_serve_then_func(args, retcode=0)
127
self.assertEqual('catching KeyboardInterrupt\n', err)
129
def test_server_exception_no_hook(self):
130
"""test exception without hook returns error"""
132
out, err = self.run_bzr_serve_then_func(args, retcode=3)
134
54
def assertInetServerShutsdownCleanly(self, process):
135
55
"""Shutdown the server process looking for errors."""
136
56
# Shutdown the server: the server should shut down when it cannot read
221
132
process, transport = self.start_server_inet(['--allow-writes'])
223
# We get a working branch, and can create a directory
224
branch = ControlDir.open_from_transport(transport).open_branch()
134
# We get a working branch
135
branch = BzrDir.open_from_transport(transport).open_branch()
225
136
self.make_read_requests(branch)
226
transport.mkdir('adir')
227
137
self.assertInetServerShutsdownCleanly(process)
229
139
def test_bzr_serve_port_readonly(self):
230
140
"""bzr server should provide a read only filesystem by default."""
231
141
process, url = self.start_server_port()
232
t = transport.get_transport_from_url(url)
233
self.assertRaises(errors.TransportNotPossible, t.mkdir, 'adir')
142
transport = get_transport(url)
143
self.assertRaises(errors.TransportNotPossible, transport.mkdir, 'adir')
234
144
self.assertServerFinishesCleanly(process)
236
146
def test_bzr_serve_port_readwrite(self):
256
166
self.make_read_requests(branch)
257
167
self.assertServerFinishesCleanly(process)
259
def test_bzr_serve_dhpss(self):
260
# This is a smoke test that the server doesn't crash when run with
261
# -Dhpss, and does drop some hpss logging to the file.
262
self.make_branch('.')
263
log_fname = os.getcwd() + '/server.log'
264
self.overrideEnv('BZR_LOG', log_fname)
265
process, transport = self.start_server_inet(['-Dhpss'])
266
branch = ControlDir.open_from_transport(transport).open_branch()
267
self.make_read_requests(branch)
268
self.assertInetServerShutsdownCleanly(process)
269
f = open(log_fname, 'rb')
272
self.assertContainsRe(content, r'hpss request: \[[0-9-]+\]')
274
def test_bzr_serve_supports_configurable_timeout(self):
275
gs = config.GlobalStack()
276
gs.set('serve.client_timeout', 0.2)
277
process, url = self.start_server_port()
278
self.build_tree_contents([('a_file', 'contents\n')])
279
# We can connect and issue a request
280
t = transport.get_transport_from_url(url)
281
self.assertEqual('contents\n', t.get_bytes('a_file'))
282
# However, if we just wait for more content from the server, it will
283
# eventually disconnect us.
284
# TODO: Use something like signal.alarm() so that if the server doesn't
285
# properly handle the timeout, we end up failing the test instead
286
# of hanging forever.
287
m = t.get_smart_medium()
289
# Now, we wait for timeout to trigger
290
err = process.stderr.readline()
292
'Connection Timeout: disconnecting client after 0.2 seconds\n',
294
self.assertServerFinishesCleanly(process)
296
def test_bzr_serve_supports_client_timeout(self):
297
process, url = self.start_server_port(['--client-timeout=0.1'])
298
self.build_tree_contents([('a_file', 'contents\n')])
299
# We can connect and issue a request
300
t = transport.get_transport_from_url(url)
301
self.assertEqual('contents\n', t.get_bytes('a_file'))
302
# However, if we just wait for more content from the server, it will
303
# eventually disconnect us.
304
# TODO: Use something like signal.alarm() so that if the server doesn't
305
# properly handle the timeout, we end up failing the test instead
306
# of hanging forever.
307
m = t.get_smart_medium()
309
# Now, we wait for timeout to trigger
310
err = process.stderr.readline()
312
'Connection Timeout: disconnecting client after 0.1 seconds\n',
314
self.assertServerFinishesCleanly(process)
316
def test_bzr_serve_graceful_shutdown(self):
317
big_contents = 'a'*64*1024
318
self.build_tree_contents([('bigfile', big_contents)])
319
process, url = self.start_server_port(['--client-timeout=1.0'])
320
t = transport.get_transport_from_url(url)
321
m = t.get_smart_medium()
322
c = client._SmartClient(m)
323
# Start, but don't finish a response
324
resp, response_handler = c.call_expecting_body('get', 'bigfile')
325
self.assertEqual(('ok',), resp)
326
# Note: process.send_signal is a Python 2.6ism
327
process.send_signal(signal.SIGHUP)
328
# Wait for the server to notice the signal, and then read the actual
329
# body of the response. That way we know that it is waiting for the
331
self.assertEqual('Requested to stop gracefully\n',
332
process.stderr.readline())
333
self.assertEqual('Waiting for 1 client(s) to finish\n',
334
process.stderr.readline())
335
body = response_handler.read_body_bytes()
336
if body != big_contents:
337
self.fail('Failed to properly read the contents of "bigfile"')
338
# Now that our request is finished, the medium should notice it has
340
self.assertEqual('', m.read_bytes(1))
341
# And the server should be stopping
342
self.assertEqual(0, process.wait())
345
class TestCmdServeChrooting(TestBzrServeBase):
170
class TestCmdServeChrooting(TestCaseWithTransport):
347
172
def test_serve_tcp(self):
348
173
"""'bzr serve' wraps the given --directory in a ChrootServer.
354
179
t = self.get_transport()
355
180
t.mkdir('server-root')
356
181
self.run_bzr_serve_then_func(
357
['--listen', '127.0.0.1', '--port', '0',
182
['--port', '127.0.0.1:0',
358
183
'--directory', t.local_abspath('server-root'),
359
184
'--allow-writes'],
360
func=self.when_server_started)
185
self.when_server_started)
361
186
# The when_server_started method issued a find_repositoryV3 that should
362
187
# fail with 'norepository' because there are no repositories inside the
364
189
self.assertEqual(('norepository',), self.client_resp)
191
def run_bzr_serve_then_func(self, serve_args, func, *func_args,
193
"""Run 'bzr serve', and run the given func in a thread once the server
196
When 'func' terminates, the server will be terminated too.
199
def on_server_start(backing_urls, tcp_server):
200
t = threading.Thread(
201
target=on_server_start_thread, args=(tcp_server,))
203
def on_server_start_thread(tcp_server):
206
self.tcp_server = tcp_server
208
func(*func_args, **func_kwargs)
210
# Log errors to make some test failures a little less
212
mutter('func broke: %r', e)
214
# Then stop the server
215
mutter('interrupting...')
216
thread.interrupt_main()
217
SmartTCPServer.hooks.install_named_hook(
218
'server_started_ex', on_server_start,
219
'run_bzr_serve_then_func hook')
222
self.run_bzr(['serve'] + list(serve_args))
223
except KeyboardInterrupt:
366
226
def when_server_started(self):
367
227
# Connect to the TCP server and issue some requests and see what comes
397
256
def make_test_server(self, base_path='/'):
398
"""Make and start a BzrServerFactory, backed by a memory transport, and
257
"""Make and setUp a BzrServerFactory, backed by a memory transport, and
399
258
creat '/home/user' in that transport.
401
260
bzr_server = BzrServerFactory(
402
261
self.fake_expanduser, lambda t: base_path)
403
262
mem_transport = self.get_transport()
404
263
mem_transport.mkdir_multi(['home', 'home/user'])
405
bzr_server.set_up(mem_transport, None, None, inet=True, timeout=4.0)
264
bzr_server.set_up(mem_transport, None, None, inet=True)
406
265
self.addCleanup(bzr_server.tear_down)
407
266
return bzr_server
419
278
(optionally decorated with 'readonly+'). BzrServerFactory can
420
279
determine the original --directory from that transport.
422
# URLs always include the trailing slash, and get_base_path returns it
423
base_dir = osutils.abspath('/a/b/c') + '/'
424
base_url = urlutils.local_path_to_url(base_dir) + '/'
425
281
# Define a fake 'protocol' to capture the transport that cmd_serve
426
282
# passes to serve_bzr.
427
def capture_transport(transport, host, port, inet, timeout):
283
def capture_transport(transport, host, port, inet):
428
284
self.bzr_serve_transport = transport
429
285
cmd = builtins.cmd_serve()
431
cmd.run(directory=base_dir, protocol=capture_transport)
287
cmd.run(directory='/a/b/c', protocol=capture_transport)
432
288
server_maker = BzrServerFactory()
433
289
self.assertEqual(
434
'readonly+%s' % base_url, self.bzr_serve_transport.base)
290
'readonly+file:///a/b/c/', self.bzr_serve_transport.base)
435
291
self.assertEqual(
436
base_dir, server_maker.get_base_path(self.bzr_serve_transport))
292
u'/a/b/c/', server_maker.get_base_path(self.bzr_serve_transport))
438
cmd.run(directory=base_dir, protocol=capture_transport,
294
cmd.run(directory='/a/b/c', protocol=capture_transport,
439
295
allow_writes=True)
440
296
server_maker = BzrServerFactory()
441
self.assertEqual(base_url, self.bzr_serve_transport.base)
442
self.assertEqual(base_dir,
443
server_maker.get_base_path(self.bzr_serve_transport))
444
# Read-only, from a URL
445
cmd.run(directory=base_url, protocol=capture_transport)
446
server_maker = BzrServerFactory()
448
'readonly+%s' % base_url, self.bzr_serve_transport.base)
450
base_dir, server_maker.get_base_path(self.bzr_serve_transport))
297
self.assertEqual('file:///a/b/c/', self.bzr_serve_transport.base)
299
u'/a/b/c/', server_maker.get_base_path(self.bzr_serve_transport))
added
removed
bzrlib/tests/blackbox/test_serve.py
