13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
18
"""Tests of the bzr serve command."""
25
26
from bzrlib import (
29
29
revision as _mod_revision,
33
31
from bzrlib.branch import Branch
34
32
from bzrlib.bzrdir import BzrDir
35
from bzrlib.smart import client, medium
36
from bzrlib.smart.server import (
40
from bzrlib.tests import (
41
TestCaseWithMemoryTransport,
42
TestCaseWithTransport,
44
from bzrlib.trace import mutter
45
from bzrlib.transport import remote
48
class TestBzrServeBase(TestCaseWithTransport):
50
def run_bzr_serve_then_func(self, serve_args, retcode=0, func=None,
51
*func_args, **func_kwargs):
52
"""Run 'bzr serve', and run the given func in a thread once the server
55
When 'func' terminates, the server will be terminated too.
57
Returns stdout and stderr.
60
def on_server_start(backing_urls, tcp_server):
62
target=on_server_start_thread, args=(tcp_server,))
64
def on_server_start_thread(tcp_server):
67
self.tcp_server = tcp_server
70
func(*func_args, **func_kwargs)
72
# Log errors to make some test failures a little less
74
mutter('func broke: %r', e)
76
# Then stop the server
77
mutter('interrupting...')
78
thread.interrupt_main()
79
SmartTCPServer.hooks.install_named_hook(
80
'server_started_ex', on_server_start,
81
'run_bzr_serve_then_func hook')
84
out, err = self.run_bzr(['serve'] + list(serve_args))
85
except KeyboardInterrupt, e:
90
class TestBzrServe(TestBzrServeBase):
93
super(TestBzrServe, self).setUp()
94
self.disable_missing_extensions_warning()
33
from bzrlib.errors import ParamikoNotPresent
34
from bzrlib.smart import medium
35
from bzrlib.tests import TestCaseWithTransport, TestSkipped
36
from bzrlib.transport import get_transport, remote
39
class TestBzrServe(TestCaseWithTransport):
96
41
def assertInetServerShutsdownCleanly(self, process):
97
42
"""Shutdown the server process looking for errors."""
204
128
# Connect to the server
205
129
branch = Branch.open(url)
206
self.make_read_requests(branch)
131
# We get a working branch
132
branch.repository.get_revision_graph()
133
self.assertEqual(_mod_revision.NULL_REVISION,
134
_mod_revision.ensure_null(branch.last_revision()))
207
136
self.assertServerFinishesCleanly(process)
209
def test_bzr_serve_supports_protocol(self):
138
def test_bzr_connect_to_bzr_ssh(self):
139
"""User acceptance that get_transport of a bzr+ssh:// behaves correctly.
141
bzr+ssh:// should cause bzr to run a remote bzr smart server over SSH.
144
from bzrlib.transport.sftp import SFTPServer
145
except ParamikoNotPresent:
146
raise TestSkipped('Paramiko not installed')
147
from bzrlib.tests.stub_sftp import StubServer
211
self.make_branch('.')
213
process, url = self.start_server_port(['--allow-writes',
216
# Connect to the server
217
branch = Branch.open(url)
218
self.make_read_requests(branch)
219
self.assertServerFinishesCleanly(process)
221
def test_bzr_serve_dhpss(self):
222
# This is a smoke test that the server doesn't crash when run with
223
# -Dhpss, and does drop some hpss logging to the file.
224
self.make_branch('.')
225
log_fname = os.getcwd() + '/server.log'
226
self.overrideEnv('BZR_LOG', log_fname)
227
process, transport = self.start_server_inet(['-Dhpss'])
228
branch = BzrDir.open_from_transport(transport).open_branch()
229
self.make_read_requests(branch)
230
self.assertInetServerShutsdownCleanly(process)
231
f = open(log_fname, 'rb')
234
self.assertContainsRe(content, r'hpss request: \[[0-9-]+\]')
237
class TestCmdServeChrooting(TestBzrServeBase):
239
def test_serve_tcp(self):
240
"""'bzr serve' wraps the given --directory in a ChrootServer.
242
So requests that search up through the parent directories (like
243
find_repositoryV3) will give "not found" responses, rather than
244
InvalidURLJoin or jail break errors.
246
t = self.get_transport()
247
t.mkdir('server-root')
248
self.run_bzr_serve_then_func(
249
['--port', '127.0.0.1:0',
250
'--directory', t.local_abspath('server-root'),
252
func=self.when_server_started)
253
# The when_server_started method issued a find_repositoryV3 that should
254
# fail with 'norepository' because there are no repositories inside the
256
self.assertEqual(('norepository',), self.client_resp)
258
def when_server_started(self):
259
# Connect to the TCP server and issue some requests and see what comes
261
client_medium = medium.SmartTCPClientMedium(
262
'127.0.0.1', self.tcp_server.port,
263
'bzr://localhost:%d/' % (self.tcp_server.port,))
264
smart_client = client._SmartClient(client_medium)
265
resp = smart_client.call('mkdir', 'foo', '')
266
resp = smart_client.call('BzrDirFormat.initialize', 'foo/')
150
self.make_branch('a_branch')
152
# Start an SSH server
153
self.command_executed = []
154
# XXX: This is horrible -- we define a really dumb SSH server that
155
# executes commands, and manage the hooking up of stdin/out/err to the
156
# SSH channel ourselves. Surely this has already been implemented
158
class StubSSHServer(StubServer):
162
def check_channel_exec_request(self, channel, command):
163
self.test.command_executed.append(command)
164
proc = subprocess.Popen(
165
command, shell=True, stdin=subprocess.PIPE,
166
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
168
# XXX: horribly inefficient, not to mention ugly.
169
# Start a thread for each of stdin/out/err, and relay bytes from
170
# the subprocess to channel and vice versa.
171
def ferry_bytes(read, write, close):
180
(channel.recv, proc.stdin.write, proc.stdin.close),
181
(proc.stdout.read, channel.sendall, channel.close),
182
(proc.stderr.read, channel.sendall_stderr, channel.close)]
183
for read, write, close in file_functions:
184
t = threading.Thread(
185
target=ferry_bytes, args=(read, write, close))
190
ssh_server = SFTPServer(StubSSHServer)
191
# XXX: We *don't* want to override the default SSH vendor, so we set
192
# _vendor to what _get_ssh_vendor returns.
194
self.addCleanup(ssh_server.tearDown)
195
port = ssh_server._listener.port
197
# Access the branch via a bzr+ssh URL. The BZR_REMOTE_PATH environment
198
# variable is used to tell bzr what command to run on the remote end.
199
path_to_branch = osutils.abspath('a_branch')
201
orig_bzr_remote_path = os.environ.get('BZR_REMOTE_PATH')
202
bzr_remote_path = self.get_bzr_path()
203
if sys.platform == 'win32':
204
bzr_remote_path = sys.executable + ' ' + self.get_bzr_path()
205
os.environ['BZR_REMOTE_PATH'] = bzr_remote_path
268
resp = smart_client.call('BzrDir.find_repositoryV3', 'foo/')
269
except errors.ErrorFromSmartServer, e:
271
self.client_resp = resp
272
client_medium.disconnect()
275
class TestUserdirExpansion(TestCaseWithMemoryTransport):
277
def fake_expanduser(self, path):
278
"""A simple, environment-independent, function for the duration of this
281
Paths starting with a path segment of '~user' will expand to start with
282
'/home/user/'. Every other path will be unchanged.
284
if path.split('/', 1)[0] == '~user':
285
return '/home/user' + path[len('~user'):]
288
def make_test_server(self, base_path='/'):
289
"""Make and start a BzrServerFactory, backed by a memory transport, and
290
creat '/home/user' in that transport.
292
bzr_server = BzrServerFactory(
293
self.fake_expanduser, lambda t: base_path)
294
mem_transport = self.get_transport()
295
mem_transport.mkdir_multi(['home', 'home/user'])
296
bzr_server.set_up(mem_transport, None, None, inet=True)
297
self.addCleanup(bzr_server.tear_down)
300
def test_bzr_serve_expands_userdir(self):
301
bzr_server = self.make_test_server()
302
self.assertTrue(bzr_server.smart_server.backing_transport.has('~user'))
304
def test_bzr_serve_does_not_expand_userdir_outside_base(self):
305
bzr_server = self.make_test_server('/foo')
306
self.assertFalse(bzr_server.smart_server.backing_transport.has('~user'))
308
def test_get_base_path(self):
309
"""cmd_serve will turn the --directory option into a LocalTransport
310
(optionally decorated with 'readonly+'). BzrServerFactory can
311
determine the original --directory from that transport.
313
# URLs always include the trailing slash, and get_base_path returns it
314
base_dir = osutils.abspath('/a/b/c') + '/'
315
base_url = urlutils.local_path_to_url(base_dir) + '/'
316
# Define a fake 'protocol' to capture the transport that cmd_serve
317
# passes to serve_bzr.
318
def capture_transport(transport, host, port, inet):
319
self.bzr_serve_transport = transport
320
cmd = builtins.cmd_serve()
322
cmd.run(directory=base_dir, protocol=capture_transport)
323
server_maker = BzrServerFactory()
325
'readonly+%s' % base_url, self.bzr_serve_transport.base)
327
base_dir, server_maker.get_base_path(self.bzr_serve_transport))
329
cmd.run(directory=base_dir, protocol=capture_transport,
331
server_maker = BzrServerFactory()
332
self.assertEqual(base_url, self.bzr_serve_transport.base)
333
self.assertEqual(base_dir,
334
server_maker.get_base_path(self.bzr_serve_transport))
207
if sys.platform == 'win32':
208
path_to_branch = os.path.splitdrive(path_to_branch)[1]
209
branch = Branch.open(
210
'bzr+ssh://fred:secret@localhost:%d%s' % (port, path_to_branch))
212
branch.repository.get_revision_graph()
213
self.assertEqual(_mod_revision.NULL_REVISION,
214
_mod_revision.ensure_null(branch.last_revision()))
215
# Check we can perform write operations
216
branch.bzrdir.root_transport.mkdir('foo')
218
# Restore the BZR_REMOTE_PATH environment variable back to its
220
if orig_bzr_remote_path is None:
221
del os.environ['BZR_REMOTE_PATH']
223
os.environ['BZR_REMOTE_PATH'] = orig_bzr_remote_path
226
['%s serve --inet --directory=/ --allow-writes'
228
self.command_executed)
added
removed
bzrlib/tests/blackbox/test_serve.py
