/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5557.1.7 by John Arbash Meinel
Merge in the bzr.dev 5582
1
# Copyright (C) 2006-2011 Canonical Ltd
1910.19.7 by Andrew Bennetts
Allow specifying the host/interface to bzr serve, and use the new test
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1910.19.7 by Andrew Bennetts
Allow specifying the host/interface to bzr serve, and use the new test
16
17
18
"""Tests of the bzr serve command."""
19
2018.1.2 by Andrew Bennetts
Tidy imports, skip test if paramiko isn't installed.
20
import os
1910.19.7 by Andrew Bennetts
Allow specifying the host/interface to bzr serve, and use the new test
21
import signal
5929.2.6 by Vincent Ladeuil
Clarify the design a bit and make the test more precise and more robust.
22
import sys
4544.1.2 by Andrew Bennetts
Add test that would catch the lack of ChrootServer in cmd_serve.
23
import thread
2018.1.2 by Andrew Bennetts
Tidy imports, skip test if paramiko isn't installed.
24
import threading
6133.4.21 by John Arbash Meinel
I'm trying to make sure that 'bzr serve' supports the serve.client_timeout code.
25
import time
1910.19.7 by Andrew Bennetts
Allow specifying the host/interface to bzr serve, and use the new test
26
2309.2.5 by Alexander Belchenko
test_bzr_connect_to_bzr_ssh: win32-compatibility
27
from bzrlib import (
4634.43.8 by Andrew Bennetts
Test for recovering the --directory value from the transport cmd_serve passes to bzr_serve.
28
    builtins,
6133.4.21 by John Arbash Meinel
I'm trying to make sure that 'bzr serve' supports the serve.client_timeout code.
29
    config,
2309.2.5 by Alexander Belchenko
test_bzr_connect_to_bzr_ssh: win32-compatibility
30
    errors,
31
    osutils,
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
32
    revision as _mod_revision,
5929.2.6 by Vincent Ladeuil
Clarify the design a bit and make the test more precise and more robust.
33
    trace,
5273.1.7 by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through
34
    transport,
4797.3.21 by John Arbash Meinel
Use urlutils.local_path_to_url to handle both windows and linux.
35
    urlutils,
2309.2.5 by Alexander Belchenko
test_bzr_connect_to_bzr_ssh: win32-compatibility
36
    )
1910.19.7 by Andrew Bennetts
Allow specifying the host/interface to bzr serve, and use the new test
37
from bzrlib.branch import Branch
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
38
from bzrlib.bzrdir import BzrDir
4544.1.2 by Andrew Bennetts
Add test that would catch the lack of ChrootServer in cmd_serve.
39
from bzrlib.smart import client, medium
5611.1.2 by Jelmer Vernooij
Add some tests for the hooks.
40
from bzrlib.smart.server import (
41
    BzrServerFactory,
42
    SmartTCPServer,
43
    )
4634.43.7 by Andrew Bennetts
Add some unit tests for parts of userdir expansion.
44
from bzrlib.tests import (
4700.1.3 by Robert Collins
Merge trunk.
45
    TestCaseWithMemoryTransport,
4634.43.7 by Andrew Bennetts
Add some unit tests for parts of userdir expansion.
46
    TestCaseWithTransport,
47
    )
5273.1.7 by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through
48
from bzrlib.transport import remote
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
49
4911.1.1 by John Arbash Meinel
Threads don't have 'get_ident()' attributes. I think spiv meant 'getName()'.
50
4815.3.7 by Gordon Tyler
Made a few changes at the suggestion of vila.
51
class TestBzrServeBase(TestCaseWithTransport):
4815.3.3 by Gordon Tyler
Changed test_bzr_serve_quiet to use in-process execution of the command.
52
53
    def run_bzr_serve_then_func(self, serve_args, retcode=0, func=None,
54
                                *func_args, **func_kwargs):
55
        """Run 'bzr serve', and run the given func in a thread once the server
56
        has started.
5611.1.2 by Jelmer Vernooij
Add some tests for the hooks.
57
4815.3.3 by Gordon Tyler
Changed test_bzr_serve_quiet to use in-process execution of the command.
58
        When 'func' terminates, the server will be terminated too.
5611.1.2 by Jelmer Vernooij
Add some tests for the hooks.
59
4815.3.3 by Gordon Tyler
Changed test_bzr_serve_quiet to use in-process execution of the command.
60
        Returns stdout and stderr.
61
        """
62
        def on_server_start_thread(tcp_server):
5929.2.6 by Vincent Ladeuil
Clarify the design a bit and make the test more precise and more robust.
63
            """This runs concurrently with the server thread.
64
65
            The server is interrupted as soon as ``func`` finishes, even if an
66
            exception is encountered.
67
            """
4815.3.3 by Gordon Tyler
Changed test_bzr_serve_quiet to use in-process execution of the command.
68
            try:
69
                # Run func if set
70
                self.tcp_server = tcp_server
6133.4.34 by John Arbash Meinel
get the blackbox tests passing.
71
                if func is not None:
4815.3.3 by Gordon Tyler
Changed test_bzr_serve_quiet to use in-process execution of the command.
72
                    try:
73
                        func(*func_args, **func_kwargs)
74
                    except Exception, e:
75
                        # Log errors to make some test failures a little less
76
                        # mysterious.
5929.2.6 by Vincent Ladeuil
Clarify the design a bit and make the test more precise and more robust.
77
                        trace.mutter('func broke: %r', e)
4815.3.3 by Gordon Tyler
Changed test_bzr_serve_quiet to use in-process execution of the command.
78
            finally:
79
                # Then stop the server
5929.2.6 by Vincent Ladeuil
Clarify the design a bit and make the test more precise and more robust.
80
                trace.mutter('interrupting...')
4815.3.3 by Gordon Tyler
Changed test_bzr_serve_quiet to use in-process execution of the command.
81
                thread.interrupt_main()
5929.2.6 by Vincent Ladeuil
Clarify the design a bit and make the test more precise and more robust.
82
        # When the hook is fired, it just starts ``on_server_start_thread`` and
83
        # return
84
        def on_server_start(backing_urls, tcp_server):
85
            t = threading.Thread(
86
                target=on_server_start_thread, args=(tcp_server,))
87
            t.start()
88
        # install hook
4815.3.3 by Gordon Tyler
Changed test_bzr_serve_quiet to use in-process execution of the command.
89
        SmartTCPServer.hooks.install_named_hook(
90
            'server_started_ex', on_server_start,
91
            'run_bzr_serve_then_func hook')
6133.4.34 by John Arbash Meinel
get the blackbox tests passing.
92
        # It seesm thread.interrupt_main() will not raise KeyboardInterrupt
93
        # until after socket.accept returns. So we set the timeout low to make
94
        # the test faster.
95
        self.overrideAttr(SmartTCPServer, '_ACCEPT_TIMEOUT', 0.1)
4815.3.3 by Gordon Tyler
Changed test_bzr_serve_quiet to use in-process execution of the command.
96
        # start a TCP server
97
        try:
5929.2.6 by Vincent Ladeuil
Clarify the design a bit and make the test more precise and more robust.
98
            out, err = self.run_bzr(['serve'] + list(serve_args),
99
                                    retcode=retcode)
4815.3.7 by Gordon Tyler
Made a few changes at the suggestion of vila.
100
        except KeyboardInterrupt, e:
101
            out, err = e.args
102
        return out, err
103
104
105
class TestBzrServe(TestBzrServeBase):
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
106
4695.3.1 by Vincent Ladeuil
Fix test failures with no C extensions loaded.
107
    def setUp(self):
4815.3.6 by Gordon Tyler
Fixed super call in TestBzrServe.
108
        super(TestBzrServe, self).setUp()
4695.3.2 by Vincent Ladeuil
Simplified and claried as per Robert's review.
109
        self.disable_missing_extensions_warning()
4695.3.1 by Vincent Ladeuil
Fix test failures with no C extensions loaded.
110
5909.2.5 by Jonathan Riddell
split test into two tests
111
    def test_server_exception_with_hook(self):
5929.2.6 by Vincent Ladeuil
Clarify the design a bit and make the test more precise and more robust.
112
        """Catch exception from the server in the server_exception hook.
113
114
        We use ``run_bzr_serve_then_func`` without a ``func`` so the server
115
        will receive a KeyboardInterrupt exception we want to catch.
116
        """
5909.2.3 by Jonathan Riddell
add test for server exception hook. Also ensure return code is checked in run_bzr_serve_then_func()
117
        def hook(exception):
5929.2.6 by Vincent Ladeuil
Clarify the design a bit and make the test more precise and more robust.
118
            if exception[0] is KeyboardInterrupt:
119
                sys.stderr.write('catching KeyboardInterrupt\n')
120
                return True
121
            else:
122
                return False
5909.2.3 by Jonathan Riddell
add test for server exception hook. Also ensure return code is checked in run_bzr_serve_then_func()
123
        SmartTCPServer.hooks.install_named_hook(
124
            'server_exception', hook,
125
            'test_server_except_hook hook')
5929.2.3 by Vincent Ladeuil
Since the exception is thrown/caught in a thread and the 'listening on port' is emitted by another thread and since synchrozining them is way out of scope for the test, it's easier to just not emit the 'listening' line. So we just tell the server to "Don't do that!".
126
        args = ['--port', 'localhost:0', '--quiet']
5909.2.3 by Jonathan Riddell
add test for server exception hook. Also ensure return code is checked in run_bzr_serve_then_func()
127
        out, err = self.run_bzr_serve_then_func(args, retcode=0)
5929.2.6 by Vincent Ladeuil
Clarify the design a bit and make the test more precise and more robust.
128
        self.assertEqual('catching KeyboardInterrupt\n', err)
5909.2.3 by Jonathan Riddell
add test for server exception hook. Also ensure return code is checked in run_bzr_serve_then_func()
129
5909.2.5 by Jonathan Riddell
split test into two tests
130
    def test_server_exception_no_hook(self):
131
        """test exception without hook returns error"""
132
        args = []
133
        out, err = self.run_bzr_serve_then_func(args, retcode=3)
134
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
135
    def assertInetServerShutsdownCleanly(self, process):
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
136
        """Shutdown the server process looking for errors."""
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
137
        # Shutdown the server: the server should shut down when it cannot read
138
        # from stdin anymore.
139
        process.stdin.close()
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
140
        # Hide stdin from the subprocess module, so it won't fail to close it.
141
        process.stdin = None
2581.1.2 by Martin Pool
Remove unnecessary retcode=0 to run_bzr calls
142
        result = self.finish_bzr_subprocess(process)
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
143
        self.assertEqual('', result[0])
144
        self.assertEqual('', result[1])
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
145
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
146
    def assertServerFinishesCleanly(self, process):
147
        """Shutdown the bzr serve instance process looking for errors."""
148
        # Shutdown the server
149
        result = self.finish_bzr_subprocess(process, retcode=3,
150
                                            send_signal=signal.SIGINT)
151
        self.assertEqual('', result[0])
152
        self.assertEqual('bzr: interrupted\n', result[1])
153
3287.6.4 by Robert Collins
Fix up deprecation warnings for get_revision_graph.
154
    def make_read_requests(self, branch):
155
        """Do some read only requests."""
156
        branch.lock_read()
157
        try:
158
            branch.repository.all_revision_ids()
159
            self.assertEqual(_mod_revision.NULL_REVISION,
160
                             _mod_revision.ensure_null(branch.last_revision()))
161
        finally:
162
            branch.unlock()
163
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
164
    def start_server_inet(self, extra_options=()):
165
        """Start a bzr server subprocess using the --inet option.
166
167
        :param extra_options: extra options to give the server.
168
        :return: a tuple with the bzr process handle for passing to
169
            finish_bzr_subprocess, a client for the server, and a transport.
170
        """
171
        # Serve from the current directory
4911.1.1 by John Arbash Meinel
Threads don't have 'get_ident()' attributes. I think spiv meant 'getName()'.
172
        args = ['serve', '--inet']
173
        args.extend(extra_options)
174
        process = self.start_bzr_subprocess(args)
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
175
176
        # Connect to the server
177
        # We use this url because while this is no valid URL to connect to this
178
        # server instance, the transport needs a URL.
3431.3.7 by Andrew Bennetts
Fix incidental breakage in blackbox/test_serve.py
179
        url = 'bzr://localhost/'
4691.2.1 by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite.
180
        self.permit_url(url)
2018.5.15 by Andrew Bennetts
Tidy some imports, and bugs introduced when adding server.py
181
        client_medium = medium.SmartSimplePipesClientMedium(
3431.3.7 by Andrew Bennetts
Fix incidental breakage in blackbox/test_serve.py
182
            process.stdout, process.stdin, url)
183
        transport = remote.RemoteTransport(url, medium=client_medium)
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
184
        return process, transport
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
185
186
    def start_server_port(self, extra_options=()):
187
        """Start a bzr server subprocess.
188
189
        :param extra_options: extra options to give the server.
190
        :return: a tuple with the bzr process handle for passing to
191
            finish_bzr_subprocess, and the base url for the server.
192
        """
193
        # Serve from the current directory
194
        args = ['serve', '--port', 'localhost:0']
195
        args.extend(extra_options)
196
        process = self.start_bzr_subprocess(args, skip_if_plan_to_signal=True)
3955.1.7 by Jonathan Lange
Fix some tests that assumed the port was on stderr rather than stdout.
197
        port_line = process.stderr.readline()
1910.19.7 by Andrew Bennetts
Allow specifying the host/interface to bzr serve, and use the new test
198
        prefix = 'listening on port: '
199
        self.assertStartsWith(port_line, prefix)
200
        port = int(port_line[len(prefix):])
4691.2.1 by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite.
201
        url = 'bzr://localhost:%d/' % port
202
        self.permit_url(url)
203
        return process, url
5611.1.2 by Jelmer Vernooij
Add some tests for the hooks.
204
4815.3.1 by Gordon Tyler
Added test_bzr_serve_quiet which tests that the output of 'bzr serve --quiet' is really quiet.
205
    def test_bzr_serve_quiet(self):
206
        self.make_branch('.')
4815.3.3 by Gordon Tyler
Changed test_bzr_serve_quiet to use in-process execution of the command.
207
        args = ['--port', 'localhost:0', '--quiet']
208
        out, err = self.run_bzr_serve_then_func(args, retcode=3)
4815.3.2 by Gordon Tyler
test_bzr_serve_quiet should be skipped if signals are not available.
209
        self.assertEqual('', out)
210
        self.assertEqual('', err)
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
211
212
    def test_bzr_serve_inet_readonly(self):
213
        """bzr server should provide a read only filesystem by default."""
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
214
        process, transport = self.start_server_inet()
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
215
        self.assertRaises(errors.TransportNotPossible, transport.mkdir, 'adir')
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
216
        self.assertInetServerShutsdownCleanly(process)
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
217
218
    def test_bzr_serve_inet_readwrite(self):
219
        # Make a branch
220
        self.make_branch('.')
221
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
222
        process, transport = self.start_server_inet(['--allow-writes'])
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
223
4911.1.1 by John Arbash Meinel
Threads don't have 'get_ident()' attributes. I think spiv meant 'getName()'.
224
        # We get a working branch, and can create a directory
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
225
        branch = BzrDir.open_from_transport(transport).open_branch()
3287.6.4 by Robert Collins
Fix up deprecation warnings for get_revision_graph.
226
        self.make_read_requests(branch)
4911.1.1 by John Arbash Meinel
Threads don't have 'get_ident()' attributes. I think spiv meant 'getName()'.
227
        transport.mkdir('adir')
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
228
        self.assertInetServerShutsdownCleanly(process)
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
229
230
    def test_bzr_serve_port_readonly(self):
231
        """bzr server should provide a read only filesystem by default."""
232
        process, url = self.start_server_port()
6083.1.1 by Jelmer Vernooij
Use get_transport_from_{url,path} in more places.
233
        t = transport.get_transport_from_url(url)
5273.1.7 by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through
234
        self.assertRaises(errors.TransportNotPossible, t.mkdir, 'adir')
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
235
        self.assertServerFinishesCleanly(process)
236
237
    def test_bzr_serve_port_readwrite(self):
238
        # Make a branch
239
        self.make_branch('.')
240
241
        process, url = self.start_server_port(['--allow-writes'])
1910.19.7 by Andrew Bennetts
Allow specifying the host/interface to bzr serve, and use the new test
242
243
        # Connect to the server
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
244
        branch = Branch.open(url)
3287.6.4 by Robert Collins
Fix up deprecation warnings for get_revision_graph.
245
        self.make_read_requests(branch)
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
246
        self.assertServerFinishesCleanly(process)
1910.19.7 by Andrew Bennetts
Allow specifying the host/interface to bzr serve, and use the new test
247
4370.4.2 by Jelmer Vernooij
Add --protocol option to 'bzr serve'.
248
    def test_bzr_serve_supports_protocol(self):
249
        # Make a branch
250
        self.make_branch('.')
251
252
        process, url = self.start_server_port(['--allow-writes',
253
                                               '--protocol=bzr'])
254
255
        # Connect to the server
256
        branch = Branch.open(url)
257
        self.make_read_requests(branch)
258
        self.assertServerFinishesCleanly(process)
259
4911.1.1 by John Arbash Meinel
Threads don't have 'get_ident()' attributes. I think spiv meant 'getName()'.
260
    def test_bzr_serve_dhpss(self):
261
        # This is a smoke test that the server doesn't crash when run with
262
        # -Dhpss, and does drop some hpss logging to the file.
263
        self.make_branch('.')
264
        log_fname = os.getcwd() + '/server.log'
5570.3.6 by Vincent Ladeuil
Get rid of all _captureVar() calls, no test failures, pfew.
265
        self.overrideEnv('BZR_LOG', log_fname)
4911.1.1 by John Arbash Meinel
Threads don't have 'get_ident()' attributes. I think spiv meant 'getName()'.
266
        process, transport = self.start_server_inet(['-Dhpss'])
267
        branch = BzrDir.open_from_transport(transport).open_branch()
268
        self.make_read_requests(branch)
269
        self.assertInetServerShutsdownCleanly(process)
270
        f = open(log_fname, 'rb')
271
        content = f.read()
272
        f.close()
4913.1.1 by John Arbash Meinel
Switch to using thread.get_ident() which is available on all python versions.
273
        self.assertContainsRe(content, r'hpss request: \[[0-9-]+\]')
4911.1.1 by John Arbash Meinel
Threads don't have 'get_ident()' attributes. I think spiv meant 'getName()'.
274
6133.4.21 by John Arbash Meinel
I'm trying to make sure that 'bzr serve' supports the serve.client_timeout code.
275
    def test_bzr_serve_supports_configurable_timeout(self):
276
        gs = config.GlobalStack()
6133.4.35 by John Arbash Meinel
Change int_from_store into float_from_store, which allows us to set the time under 1.0s.
277
        gs.set('serve.client_timeout', 0.2)
6133.4.21 by John Arbash Meinel
I'm trying to make sure that 'bzr serve' supports the serve.client_timeout code.
278
        process, url = self.start_server_port()
279
        self.build_tree_contents([('a_file', 'contents\n')])
280
        # We can connect and issue a request
281
        t = transport.get_transport_from_url(url)
6133.4.34 by John Arbash Meinel
get the blackbox tests passing.
282
        self.assertEqual('contents\n', t.get_bytes('a_file'))
6133.4.21 by John Arbash Meinel
I'm trying to make sure that 'bzr serve' supports the serve.client_timeout code.
283
        # However, if we just wait for more content from the server, it will
284
        # eventually disconnect us.
6133.4.25 by John Arbash Meinel
Update some test comment.
285
        # TODO: Use something like signal.alarm() so that if the server doesn't
286
        #       properly handle the timeout, we end up failing the test instead
287
        #       of hanging forever.
6133.4.22 by John Arbash Meinel
move the comment
288
        m = t.get_smart_medium()
6133.4.34 by John Arbash Meinel
get the blackbox tests passing.
289
        m.read_bytes(1)
6133.4.21 by John Arbash Meinel
I'm trying to make sure that 'bzr serve' supports the serve.client_timeout code.
290
        # Now, we wait for timeout to trigger
6133.4.34 by John Arbash Meinel
get the blackbox tests passing.
291
        err = process.stderr.readline()
292
        self.assertEqual(
6133.4.35 by John Arbash Meinel
Change int_from_store into float_from_store, which allows us to set the time under 1.0s.
293
            'Connection Timeout: disconnecting client after 0.2 seconds\n',
6133.4.34 by John Arbash Meinel
get the blackbox tests passing.
294
            err)
6133.4.21 by John Arbash Meinel
I'm trying to make sure that 'bzr serve' supports the serve.client_timeout code.
295
        self.assertServerFinishesCleanly(process)
296
6133.4.29 by John Arbash Meinel
Expose --client-timeout to the command line, pass it through the layers.
297
    def test_bzr_serve_supports_client_timeout(self):
298
        process, url = self.start_server_port(['--client-timeout=0.1'])
299
        self.build_tree_contents([('a_file', 'contents\n')])
300
        # We can connect and issue a request
301
        t = transport.get_transport_from_url(url)
6133.4.34 by John Arbash Meinel
get the blackbox tests passing.
302
        self.assertEqual('contents\n', t.get_bytes('a_file'))
6133.4.29 by John Arbash Meinel
Expose --client-timeout to the command line, pass it through the layers.
303
        # However, if we just wait for more content from the server, it will
304
        # eventually disconnect us.
305
        # TODO: Use something like signal.alarm() so that if the server doesn't
306
        #       properly handle the timeout, we end up failing the test instead
307
        #       of hanging forever.
308
        m = t.get_smart_medium()
6133.4.34 by John Arbash Meinel
get the blackbox tests passing.
309
        m.read_bytes(1)
6133.4.29 by John Arbash Meinel
Expose --client-timeout to the command line, pass it through the layers.
310
        # Now, we wait for timeout to trigger
6133.4.34 by John Arbash Meinel
get the blackbox tests passing.
311
        err = process.stderr.readline()
312
        self.assertEqual(
313
            'Connection Timeout: disconnecting client after 0.1 seconds\n',
314
            err)
6133.4.29 by John Arbash Meinel
Expose --client-timeout to the command line, pass it through the layers.
315
        self.assertServerFinishesCleanly(process)
316
6133.4.47 by John Arbash Meinel
Testing that 'bzr serve' actually installs SIGHUP and responds to it showed some problems.
317
    def test_bzr_serve_graceful_shutdown(self):
6133.4.68 by John Arbash Meinel
Fix the blackbox test to wait for the process to exit.
318
        big_contents = 'a'*64*1024
319
        self.build_tree_contents([('bigfile', big_contents)])
6133.4.47 by John Arbash Meinel
Testing that 'bzr serve' actually installs SIGHUP and responds to it showed some problems.
320
        process, url = self.start_server_port(['--client-timeout=1.0'])
321
        t = transport.get_transport_from_url(url)
6133.4.68 by John Arbash Meinel
Fix the blackbox test to wait for the process to exit.
322
        m = t.get_smart_medium()
323
        c = client._SmartClient(m)
324
        # Start, but don't finish a response
325
        resp, response_handler = c.call_expecting_body('get', 'bigfile')
326
        self.assertEqual(('ok',), resp)
6133.4.47 by John Arbash Meinel
Testing that 'bzr serve' actually installs SIGHUP and responds to it showed some problems.
327
        # Note: process.send_signal is a Python 2.6ism
328
        process.send_signal(signal.SIGHUP)
6133.4.68 by John Arbash Meinel
Fix the blackbox test to wait for the process to exit.
329
        # Wait for the server to notice the signal, and then read the actual
330
        # body of the response. That way we know that it is waiting for the
331
        # request to finish
332
        self.assertEqual('Requested to stop gracefully\n',
333
                         process.stderr.readline())
334
        self.assertEqual('Waiting for 1 client(s) to finish\n',
335
                         process.stderr.readline())
336
        body = response_handler.read_body_bytes()
337
        if body != big_contents:
338
            self.fail('Failed to properly read the contents of "bigfile"')
339
        # Now that our request is finished, the medium should notice it has
340
        # been disconnected.
6133.4.47 by John Arbash Meinel
Testing that 'bzr serve' actually installs SIGHUP and responds to it showed some problems.
341
        self.assertEqual('', m.read_bytes(1))
6133.4.68 by John Arbash Meinel
Fix the blackbox test to wait for the process to exit.
342
        # And the server should be stopping
343
        self.assertEqual(0, process.wait())
6133.4.47 by John Arbash Meinel
Testing that 'bzr serve' actually installs SIGHUP and responds to it showed some problems.
344
4544.1.2 by Andrew Bennetts
Add test that would catch the lack of ChrootServer in cmd_serve.
345
4815.3.7 by Gordon Tyler
Made a few changes at the suggestion of vila.
346
class TestCmdServeChrooting(TestBzrServeBase):
4544.1.2 by Andrew Bennetts
Add test that would catch the lack of ChrootServer in cmd_serve.
347
348
    def test_serve_tcp(self):
349
        """'bzr serve' wraps the given --directory in a ChrootServer.
350
351
        So requests that search up through the parent directories (like
352
        find_repositoryV3) will give "not found" responses, rather than
353
        InvalidURLJoin or jail break errors.
354
        """
355
        t = self.get_transport()
356
        t.mkdir('server-root')
357
        self.run_bzr_serve_then_func(
4676.3.3 by Vincent Ladeuil
Force IPV4 to fix failure on IPV6-enabled hosts.
358
            ['--port', '127.0.0.1:0',
359
             '--directory', t.local_abspath('server-root'),
4544.1.2 by Andrew Bennetts
Add test that would catch the lack of ChrootServer in cmd_serve.
360
             '--allow-writes'],
4815.3.3 by Gordon Tyler
Changed test_bzr_serve_quiet to use in-process execution of the command.
361
            func=self.when_server_started)
4544.1.2 by Andrew Bennetts
Add test that would catch the lack of ChrootServer in cmd_serve.
362
        # The when_server_started method issued a find_repositoryV3 that should
363
        # fail with 'norepository' because there are no repositories inside the
364
        # --directory.
4676.3.3 by Vincent Ladeuil
Force IPV4 to fix failure on IPV6-enabled hosts.
365
        self.assertEqual(('norepository',), self.client_resp)
4676.3.1 by Vincent Ladeuil
Marking TestCmdServeChrooting.test_serve_tcp as expected failure
366
4544.1.2 by Andrew Bennetts
Add test that would catch the lack of ChrootServer in cmd_serve.
367
    def when_server_started(self):
368
        # Connect to the TCP server and issue some requests and see what comes
369
        # back.
370
        client_medium = medium.SmartTCPClientMedium(
371
            '127.0.0.1', self.tcp_server.port,
372
            'bzr://localhost:%d/' % (self.tcp_server.port,))
373
        smart_client = client._SmartClient(client_medium)
374
        resp = smart_client.call('mkdir', 'foo', '')
375
        resp = smart_client.call('BzrDirFormat.initialize', 'foo/')
376
        try:
377
            resp = smart_client.call('BzrDir.find_repositoryV3', 'foo/')
378
        except errors.ErrorFromSmartServer, e:
379
            resp = e.error_tuple
380
        self.client_resp = resp
381
        client_medium.disconnect()
382
383
4634.43.7 by Andrew Bennetts
Add some unit tests for parts of userdir expansion.
384
class TestUserdirExpansion(TestCaseWithMemoryTransport):
385
5901.1.1 by John Arbash Meinel
Re-apply the bits of TestCase that I wanted, on the new bzr.dev tip.
386
    @staticmethod
387
    def fake_expanduser(path):
4634.43.7 by Andrew Bennetts
Add some unit tests for parts of userdir expansion.
388
        """A simple, environment-independent, function for the duration of this
389
        test.
390
391
        Paths starting with a path segment of '~user' will expand to start with
392
        '/home/user/'.  Every other path will be unchanged.
393
        """
394
        if path.split('/', 1)[0] == '~user':
395
            return '/home/user' + path[len('~user'):]
396
        return path
397
398
    def make_test_server(self, base_path='/'):
4934.3.3 by Martin Pool
Rename Server.setUp to Server.start_server
399
        """Make and start a BzrServerFactory, backed by a memory transport, and
4634.43.7 by Andrew Bennetts
Add some unit tests for parts of userdir expansion.
400
        creat '/home/user' in that transport.
401
        """
4634.43.15 by Andrew Bennetts
Rename BzrServerMaker -> BzrServerFactory.
402
        bzr_server = BzrServerFactory(
4634.43.7 by Andrew Bennetts
Add some unit tests for parts of userdir expansion.
403
            self.fake_expanduser, lambda t: base_path)
404
        mem_transport = self.get_transport()
405
        mem_transport.mkdir_multi(['home', 'home/user'])
6133.4.34 by John Arbash Meinel
get the blackbox tests passing.
406
        bzr_server.set_up(mem_transport, None, None, inet=True, timeout=4.0)
4634.43.19 by Andrew Bennetts
Rename BzrServerFactory's setUp/tearDown to set_up/tear_down; this isn't a TestCase (or transport Server), so we should not use camelCase names.
407
        self.addCleanup(bzr_server.tear_down)
4634.43.7 by Andrew Bennetts
Add some unit tests for parts of userdir expansion.
408
        return bzr_server
409
410
    def test_bzr_serve_expands_userdir(self):
411
        bzr_server = self.make_test_server()
412
        self.assertTrue(bzr_server.smart_server.backing_transport.has('~user'))
413
414
    def test_bzr_serve_does_not_expand_userdir_outside_base(self):
415
        bzr_server = self.make_test_server('/foo')
416
        self.assertFalse(bzr_server.smart_server.backing_transport.has('~user'))
4544.1.2 by Andrew Bennetts
Add test that would catch the lack of ChrootServer in cmd_serve.
417
4634.43.8 by Andrew Bennetts
Test for recovering the --directory value from the transport cmd_serve passes to bzr_serve.
418
    def test_get_base_path(self):
419
        """cmd_serve will turn the --directory option into a LocalTransport
4634.43.15 by Andrew Bennetts
Rename BzrServerMaker -> BzrServerFactory.
420
        (optionally decorated with 'readonly+').  BzrServerFactory can
421
        determine the original --directory from that transport.
4634.43.8 by Andrew Bennetts
Test for recovering the --directory value from the transport cmd_serve passes to bzr_serve.
422
        """
4797.3.4 by John Arbash Meinel
Per review recommendation, use 'osutils.abspath' instead of hardcoded string.
423
        # URLs always include the trailing slash, and get_base_path returns it
424
        base_dir = osutils.abspath('/a/b/c') + '/'
4797.3.21 by John Arbash Meinel
Use urlutils.local_path_to_url to handle both windows and linux.
425
        base_url = urlutils.local_path_to_url(base_dir) + '/'
4634.43.8 by Andrew Bennetts
Test for recovering the --directory value from the transport cmd_serve passes to bzr_serve.
426
        # Define a fake 'protocol' to capture the transport that cmd_serve
427
        # passes to serve_bzr.
6133.4.34 by John Arbash Meinel
get the blackbox tests passing.
428
        def capture_transport(transport, host, port, inet, timeout):
4634.43.8 by Andrew Bennetts
Test for recovering the --directory value from the transport cmd_serve passes to bzr_serve.
429
            self.bzr_serve_transport = transport
430
        cmd = builtins.cmd_serve()
431
        # Read-only
4789.7.1 by John Arbash Meinel
Fix a 'bzr serve' test that didn't expect windows translating '/a' to 'C:/a'.
432
        cmd.run(directory=base_dir, protocol=capture_transport)
4634.43.15 by Andrew Bennetts
Rename BzrServerMaker -> BzrServerFactory.
433
        server_maker = BzrServerFactory()
4634.43.8 by Andrew Bennetts
Test for recovering the --directory value from the transport cmd_serve passes to bzr_serve.
434
        self.assertEqual(
4797.3.21 by John Arbash Meinel
Use urlutils.local_path_to_url to handle both windows and linux.
435
            'readonly+%s' % base_url, self.bzr_serve_transport.base)
4634.43.8 by Andrew Bennetts
Test for recovering the --directory value from the transport cmd_serve passes to bzr_serve.
436
        self.assertEqual(
4789.7.1 by John Arbash Meinel
Fix a 'bzr serve' test that didn't expect windows translating '/a' to 'C:/a'.
437
            base_dir, server_maker.get_base_path(self.bzr_serve_transport))
4634.43.8 by Andrew Bennetts
Test for recovering the --directory value from the transport cmd_serve passes to bzr_serve.
438
        # Read-write
4789.7.1 by John Arbash Meinel
Fix a 'bzr serve' test that didn't expect windows translating '/a' to 'C:/a'.
439
        cmd.run(directory=base_dir, protocol=capture_transport,
4634.43.8 by Andrew Bennetts
Test for recovering the --directory value from the transport cmd_serve passes to bzr_serve.
440
            allow_writes=True)
4634.43.15 by Andrew Bennetts
Rename BzrServerMaker -> BzrServerFactory.
441
        server_maker = BzrServerFactory()
4797.3.21 by John Arbash Meinel
Use urlutils.local_path_to_url to handle both windows and linux.
442
        self.assertEqual(base_url, self.bzr_serve_transport.base)
4789.7.1 by John Arbash Meinel
Fix a 'bzr serve' test that didn't expect windows translating '/a' to 'C:/a'.
443
        self.assertEqual(base_dir,
444
            server_maker.get_base_path(self.bzr_serve_transport))