30
32
revision as _mod_revision,
35
34
from bzrlib.branch import Branch
36
35
from bzrlib.bzrdir import BzrDir
37
36
from bzrlib.smart import client, medium
38
from bzrlib.smart.server import (
37
from bzrlib.smart.server import BzrServerFactory, SmartTCPServer
42
38
from bzrlib.tests import (
43
40
TestCaseWithMemoryTransport,
44
41
TestCaseWithTransport,
46
from bzrlib.transport import remote
49
class TestBzrServeBase(TestCaseWithTransport):
51
def run_bzr_serve_then_func(self, serve_args, retcode=0, func=None,
52
*func_args, **func_kwargs):
53
"""Run 'bzr serve', and run the given func in a thread once the server
56
When 'func' terminates, the server will be terminated too.
58
Returns stdout and stderr.
60
def on_server_start_thread(tcp_server):
61
"""This runs concurrently with the server thread.
63
The server is interrupted as soon as ``func`` finishes, even if an
64
exception is encountered.
68
self.tcp_server = tcp_server
71
func(*func_args, **func_kwargs)
73
# Log errors to make some test failures a little less
75
trace.mutter('func broke: %r', e)
77
# Then stop the server
78
trace.mutter('interrupting...')
79
thread.interrupt_main()
80
# When the hook is fired, it just starts ``on_server_start_thread`` and
82
def on_server_start(backing_urls, tcp_server):
84
target=on_server_start_thread, args=(tcp_server,))
87
SmartTCPServer.hooks.install_named_hook(
88
'server_started_ex', on_server_start,
89
'run_bzr_serve_then_func hook')
92
out, err = self.run_bzr(['serve'] + list(serve_args),
94
except KeyboardInterrupt, e:
99
class TestBzrServe(TestBzrServeBase):
44
from bzrlib.trace import mutter
45
from bzrlib.transport import get_transport, remote
48
class TestBzrServe(TestCaseWithTransport):
102
51
super(TestBzrServe, self).setUp()
103
52
self.disable_missing_extensions_warning()
105
def test_server_exception_with_hook(self):
106
"""Catch exception from the server in the server_exception hook.
108
We use ``run_bzr_serve_then_func`` without a ``func`` so the server
109
will receive a KeyboardInterrupt exception we want to catch.
112
if exception[0] is KeyboardInterrupt:
113
sys.stderr.write('catching KeyboardInterrupt\n')
117
SmartTCPServer.hooks.install_named_hook(
118
'server_exception', hook,
119
'test_server_except_hook hook')
120
args = ['--port', 'localhost:0', '--quiet']
121
out, err = self.run_bzr_serve_then_func(args, retcode=0)
122
self.assertEqual('catching KeyboardInterrupt\n', err)
124
def test_server_exception_no_hook(self):
125
"""test exception without hook returns error"""
127
out, err = self.run_bzr_serve_then_func(args, retcode=3)
129
54
def assertInetServerShutsdownCleanly(self, process):
130
55
"""Shutdown the server process looking for errors."""
131
56
# Shutdown the server: the server should shut down when it cannot read
196
119
self.permit_url(url)
197
120
return process, url
199
def test_bzr_serve_quiet(self):
200
self.make_branch('.')
201
args = ['--port', 'localhost:0', '--quiet']
202
out, err = self.run_bzr_serve_then_func(args, retcode=3)
203
self.assertEqual('', out)
204
self.assertEqual('', err)
206
122
def test_bzr_serve_inet_readonly(self):
207
123
"""bzr server should provide a read only filesystem by default."""
208
124
process, transport = self.start_server_inet()
216
132
process, transport = self.start_server_inet(['--allow-writes'])
218
# We get a working branch, and can create a directory
134
# We get a working branch
219
135
branch = BzrDir.open_from_transport(transport).open_branch()
220
136
self.make_read_requests(branch)
221
transport.mkdir('adir')
222
137
self.assertInetServerShutsdownCleanly(process)
224
139
def test_bzr_serve_port_readonly(self):
225
140
"""bzr server should provide a read only filesystem by default."""
226
141
process, url = self.start_server_port()
227
t = transport.get_transport(url)
228
self.assertRaises(errors.TransportNotPossible, t.mkdir, 'adir')
142
transport = get_transport(url)
143
self.assertRaises(errors.TransportNotPossible, transport.mkdir, 'adir')
229
144
self.assertServerFinishesCleanly(process)
231
146
def test_bzr_serve_port_readwrite(self):
251
166
self.make_read_requests(branch)
252
167
self.assertServerFinishesCleanly(process)
254
def test_bzr_serve_dhpss(self):
255
# This is a smoke test that the server doesn't crash when run with
256
# -Dhpss, and does drop some hpss logging to the file.
257
self.make_branch('.')
258
log_fname = os.getcwd() + '/server.log'
259
self.overrideEnv('BZR_LOG', log_fname)
260
process, transport = self.start_server_inet(['-Dhpss'])
261
branch = BzrDir.open_from_transport(transport).open_branch()
262
self.make_read_requests(branch)
263
self.assertInetServerShutsdownCleanly(process)
264
f = open(log_fname, 'rb')
267
self.assertContainsRe(content, r'hpss request: \[[0-9-]+\]')
270
class TestCmdServeChrooting(TestBzrServeBase):
170
class TestCmdServeChrooting(TestCaseWithTransport):
272
172
def test_serve_tcp(self):
273
173
"""'bzr serve' wraps the given --directory in a ChrootServer.
282
182
['--port', '127.0.0.1:0',
283
183
'--directory', t.local_abspath('server-root'),
284
184
'--allow-writes'],
285
func=self.when_server_started)
185
self.when_server_started)
286
186
# The when_server_started method issued a find_repositoryV3 that should
287
187
# fail with 'norepository' because there are no repositories inside the
289
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:
291
226
def when_server_started(self):
292
227
# Connect to the TCP server and issue some requests and see what comes
344
278
(optionally decorated with 'readonly+'). BzrServerFactory can
345
279
determine the original --directory from that transport.
347
# URLs always include the trailing slash, and get_base_path returns it
348
base_dir = osutils.abspath('/a/b/c') + '/'
349
base_url = urlutils.local_path_to_url(base_dir) + '/'
350
281
# Define a fake 'protocol' to capture the transport that cmd_serve
351
282
# passes to serve_bzr.
352
283
def capture_transport(transport, host, port, inet):
353
284
self.bzr_serve_transport = transport
354
285
cmd = builtins.cmd_serve()
356
cmd.run(directory=base_dir, protocol=capture_transport)
287
cmd.run(directory='/a/b/c', protocol=capture_transport)
357
288
server_maker = BzrServerFactory()
358
289
self.assertEqual(
359
'readonly+%s' % base_url, self.bzr_serve_transport.base)
290
'readonly+file:///a/b/c/', self.bzr_serve_transport.base)
360
291
self.assertEqual(
361
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))
363
cmd.run(directory=base_dir, protocol=capture_transport,
294
cmd.run(directory='/a/b/c', protocol=capture_transport,
364
295
allow_writes=True)
365
296
server_maker = BzrServerFactory()
366
self.assertEqual(base_url, self.bzr_serve_transport.base)
367
self.assertEqual(base_dir,
368
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
