/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
6622.1.4 by Jelmer Vernooij
Fix some more tests.
18
"""Tests of the brz serve command."""
1910.19.7 by Andrew Bennetts
Allow specifying the host/interface to bzr serve, and use the new test
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
1910.19.7 by Andrew Bennetts
Allow specifying the host/interface to bzr serve, and use the new test
25
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
26
from ... import (
4634.43.8 by Andrew Bennetts
Test for recovering the --directory value from the transport cmd_serve passes to bzr_serve.
27
    builtins,
6133.4.21 by John Arbash Meinel
I'm trying to make sure that 'bzr serve' supports the serve.client_timeout code.
28
    config,
2309.2.5 by Alexander Belchenko
test_bzr_connect_to_bzr_ssh: win32-compatibility
29
    errors,
30
    osutils,
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
31
    revision as _mod_revision,
5929.2.6 by Vincent Ladeuil
Clarify the design a bit and make the test more precise and more robust.
32
    trace,
5273.1.7 by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through
33
    transport,
4797.3.21 by John Arbash Meinel
Use urlutils.local_path_to_url to handle both windows and linux.
34
    urlutils,
2309.2.5 by Alexander Belchenko
test_bzr_connect_to_bzr_ssh: win32-compatibility
35
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
36
from ...branch import Branch
37
from ...controldir import ControlDir
6670.4.16 by Jelmer Vernooij
Move smart to breezy.bzr.
38
from ...bzr.smart import client, medium
39
from ...bzr.smart.server import (
5611.1.2 by Jelmer Vernooij
Add some tests for the hooks.
40
    BzrServerFactory,
41
    SmartTCPServer,
42
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
43
from .. import (
4700.1.3 by Robert Collins
Merge trunk.
44
    TestCaseWithMemoryTransport,
4634.43.7 by Andrew Bennetts
Add some unit tests for parts of userdir expansion.
45
    TestCaseWithTransport,
46
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
47
from ...transport import remote
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
48
4911.1.1 by John Arbash Meinel
Threads don't have 'get_ident()' attributes. I think spiv meant 'getName()'.
49
4815.3.7 by Gordon Tyler
Made a few changes at the suggestion of vila.
50
class TestBzrServeBase(TestCaseWithTransport):
4815.3.3 by Gordon Tyler
Changed test_bzr_serve_quiet to use in-process execution of the command.
51
52
    def run_bzr_serve_then_func(self, serve_args, retcode=0, func=None,
53
                                *func_args, **func_kwargs):
6622.1.29 by Jelmer Vernooij
Fix some more tests.
54
        """Run 'brz serve', and run the given func in a thread once the server
4815.3.3 by Gordon Tyler
Changed test_bzr_serve_quiet to use in-process execution of the command.
55
        has started.
5611.1.2 by Jelmer Vernooij
Add some tests for the hooks.
56
4815.3.3 by Gordon Tyler
Changed test_bzr_serve_quiet to use in-process execution of the command.
57
        When 'func' terminates, the server will be terminated too.
5611.1.2 by Jelmer Vernooij
Add some tests for the hooks.
58
4815.3.3 by Gordon Tyler
Changed test_bzr_serve_quiet to use in-process execution of the command.
59
        Returns stdout and stderr.
60
        """
61
        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.
62
            """This runs concurrently with the server thread.
63
64
            The server is interrupted as soon as ``func`` finishes, even if an
65
            exception is encountered.
66
            """
4815.3.3 by Gordon Tyler
Changed test_bzr_serve_quiet to use in-process execution of the command.
67
            try:
68
                # Run func if set
69
                self.tcp_server = tcp_server
6133.4.34 by John Arbash Meinel
get the blackbox tests passing.
70
                if func is not None:
4815.3.3 by Gordon Tyler
Changed test_bzr_serve_quiet to use in-process execution of the command.
71
                    try:
72
                        func(*func_args, **func_kwargs)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
73
                    except Exception as e:
4815.3.3 by Gordon Tyler
Changed test_bzr_serve_quiet to use in-process execution of the command.
74
                        # Log errors to make some test failures a little less
75
                        # mysterious.
5929.2.6 by Vincent Ladeuil
Clarify the design a bit and make the test more precise and more robust.
76
                        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.
77
            finally:
78
                # Then stop the server
5929.2.6 by Vincent Ladeuil
Clarify the design a bit and make the test more precise and more robust.
79
                trace.mutter('interrupting...')
4815.3.3 by Gordon Tyler
Changed test_bzr_serve_quiet to use in-process execution of the command.
80
                thread.interrupt_main()
5929.2.6 by Vincent Ladeuil
Clarify the design a bit and make the test more precise and more robust.
81
        # When the hook is fired, it just starts ``on_server_start_thread`` and
82
        # return
83
        def on_server_start(backing_urls, tcp_server):
84
            t = threading.Thread(
85
                target=on_server_start_thread, args=(tcp_server,))
86
            t.start()
87
        # install hook
4815.3.3 by Gordon Tyler
Changed test_bzr_serve_quiet to use in-process execution of the command.
88
        SmartTCPServer.hooks.install_named_hook(
89
            'server_started_ex', on_server_start,
90
            'run_bzr_serve_then_func hook')
6133.4.34 by John Arbash Meinel
get the blackbox tests passing.
91
        # It seesm thread.interrupt_main() will not raise KeyboardInterrupt
92
        # until after socket.accept returns. So we set the timeout low to make
93
        # the test faster.
94
        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.
95
        # start a TCP server
96
        try:
5929.2.6 by Vincent Ladeuil
Clarify the design a bit and make the test more precise and more robust.
97
            out, err = self.run_bzr(['serve'] + list(serve_args),
98
                                    retcode=retcode)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
99
        except KeyboardInterrupt as e:
6621.22.1 by Martin
Refactor bzrlib.ui to be based on unicode streams
100
            return (self._last_cmd_stdout.getvalue(),
101
                self._last_cmd_stderr.getvalue())
4815.3.7 by Gordon Tyler
Made a few changes at the suggestion of vila.
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')
6475.2.2 by Ross Lagerwall
Update tests to use new --listen & --port options to bzr serve.
126
        args = ['--listen', 'localhost', '--port', '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):
6622.1.29 by Jelmer Vernooij
Fix some more tests.
147
        """Shutdown the brz serve instance process looking for errors."""
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
148
        # Shutdown the server
149
        result = self.finish_bzr_subprocess(process, retcode=3,
150
                                            send_signal=signal.SIGINT)
151
        self.assertEqual('', result[0])
6622.1.4 by Jelmer Vernooij
Fix some more tests.
152
        self.assertEqual('brz: interrupted\n', result[1])
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
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."""
6754.8.4 by Jelmer Vernooij
Use new context stuff.
156
        with branch.lock_read():
3287.6.4 by Robert Collins
Fix up deprecation warnings for get_revision_graph.
157
            branch.repository.all_revision_ids()
158
            self.assertEqual(_mod_revision.NULL_REVISION,
159
                             _mod_revision.ensure_null(branch.last_revision()))
160
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
161
    def start_server_inet(self, extra_options=()):
6622.1.29 by Jelmer Vernooij
Fix some more tests.
162
        """Start a brz server subprocess using the --inet option.
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
163
164
        :param extra_options: extra options to give the server.
6622.1.29 by Jelmer Vernooij
Fix some more tests.
165
        :return: a tuple with the brz process handle for passing to
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
166
            finish_bzr_subprocess, a client for the server, and a transport.
167
        """
168
        # Serve from the current directory
4911.1.1 by John Arbash Meinel
Threads don't have 'get_ident()' attributes. I think spiv meant 'getName()'.
169
        args = ['serve', '--inet']
170
        args.extend(extra_options)
171
        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`.
172
173
        # Connect to the server
174
        # We use this url because while this is no valid URL to connect to this
175
        # server instance, the transport needs a URL.
6622.1.30 by Jelmer Vernooij
Some more test fixes.
176
        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.
177
        self.permit_url(url)
2018.5.15 by Andrew Bennetts
Tidy some imports, and bugs introduced when adding server.py
178
        client_medium = medium.SmartSimplePipesClientMedium(
3431.3.7 by Andrew Bennetts
Fix incidental breakage in blackbox/test_serve.py
179
            process.stdout, process.stdin, url)
180
        transport = remote.RemoteTransport(url, medium=client_medium)
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
181
        return process, transport
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
182
183
    def start_server_port(self, extra_options=()):
6622.1.29 by Jelmer Vernooij
Fix some more tests.
184
        """Start a brz server subprocess.
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
185
186
        :param extra_options: extra options to give the server.
6622.1.29 by Jelmer Vernooij
Fix some more tests.
187
        :return: a tuple with the brz process handle for passing to
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
188
            finish_bzr_subprocess, and the base url for the server.
189
        """
190
        # Serve from the current directory
6475.2.2 by Ross Lagerwall
Update tests to use new --listen & --port options to bzr serve.
191
        args = ['serve', '--listen', 'localhost', '--port', '0']
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
192
        args.extend(extra_options)
193
        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.
194
        port_line = process.stderr.readline()
1910.19.7 by Andrew Bennetts
Allow specifying the host/interface to bzr serve, and use the new test
195
        prefix = 'listening on port: '
196
        self.assertStartsWith(port_line, prefix)
197
        port = int(port_line[len(prefix):])
6622.1.30 by Jelmer Vernooij
Some more test fixes.
198
        url = 'bzr://localhost:%d/' % port
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.
199
        self.permit_url(url)
200
        return process, url
5611.1.2 by Jelmer Vernooij
Add some tests for the hooks.
201
4815.3.1 by Gordon Tyler
Added test_bzr_serve_quiet which tests that the output of 'bzr serve --quiet' is really quiet.
202
    def test_bzr_serve_quiet(self):
203
        self.make_branch('.')
6475.2.2 by Ross Lagerwall
Update tests to use new --listen & --port options to bzr serve.
204
        args = ['--listen', 'localhost', '--port', '0', '--quiet']
4815.3.3 by Gordon Tyler
Changed test_bzr_serve_quiet to use in-process execution of the command.
205
        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.
206
        self.assertEqual('', out)
207
        self.assertEqual('', err)
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
208
209
    def test_bzr_serve_inet_readonly(self):
6622.1.29 by Jelmer Vernooij
Fix some more tests.
210
        """brz 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.
211
        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`.
212
        self.assertRaises(errors.TransportNotPossible, transport.mkdir, 'adir')
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
213
        self.assertInetServerShutsdownCleanly(process)
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
214
215
    def test_bzr_serve_inet_readwrite(self):
216
        # Make a branch
217
        self.make_branch('.')
218
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
219
        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`.
220
4911.1.1 by John Arbash Meinel
Threads don't have 'get_ident()' attributes. I think spiv meant 'getName()'.
221
        # We get a working branch, and can create a directory
6472.2.2 by Jelmer Vernooij
Use controldir rather than bzrdir in a couple more places.
222
        branch = ControlDir.open_from_transport(transport).open_branch()
3287.6.4 by Robert Collins
Fix up deprecation warnings for get_revision_graph.
223
        self.make_read_requests(branch)
4911.1.1 by John Arbash Meinel
Threads don't have 'get_ident()' attributes. I think spiv meant 'getName()'.
224
        transport.mkdir('adir')
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
225
        self.assertInetServerShutsdownCleanly(process)
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
226
227
    def test_bzr_serve_port_readonly(self):
6622.1.29 by Jelmer Vernooij
Fix some more tests.
228
        """brz server should provide a read only filesystem by default."""
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
229
        process, url = self.start_server_port()
6083.1.1 by Jelmer Vernooij
Use get_transport_from_{url,path} in more places.
230
        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
231
        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`.
232
        self.assertServerFinishesCleanly(process)
233
234
    def test_bzr_serve_port_readwrite(self):
235
        # Make a branch
236
        self.make_branch('.')
237
238
        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
239
240
        # Connect to the server
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
241
        branch = Branch.open(url)
3287.6.4 by Robert Collins
Fix up deprecation warnings for get_revision_graph.
242
        self.make_read_requests(branch)
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
243
        self.assertServerFinishesCleanly(process)
1910.19.7 by Andrew Bennetts
Allow specifying the host/interface to bzr serve, and use the new test
244
4370.4.2 by Jelmer Vernooij
Add --protocol option to 'bzr serve'.
245
    def test_bzr_serve_supports_protocol(self):
246
        # Make a branch
247
        self.make_branch('.')
248
249
        process, url = self.start_server_port(['--allow-writes',
250
                                               '--protocol=bzr'])
251
252
        # Connect to the server
253
        branch = Branch.open(url)
254
        self.make_read_requests(branch)
255
        self.assertServerFinishesCleanly(process)
256
4911.1.1 by John Arbash Meinel
Threads don't have 'get_ident()' attributes. I think spiv meant 'getName()'.
257
    def test_bzr_serve_dhpss(self):
258
        # This is a smoke test that the server doesn't crash when run with
259
        # -Dhpss, and does drop some hpss logging to the file.
260
        self.make_branch('.')
6619.3.26 by Martin
Fix fallout from 2to3 getcwdu transformation and other test uses
261
        log_fname = self.test_dir + '/server.log'
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
262
        self.overrideEnv('BRZ_LOG', log_fname)
4911.1.1 by John Arbash Meinel
Threads don't have 'get_ident()' attributes. I think spiv meant 'getName()'.
263
        process, transport = self.start_server_inet(['-Dhpss'])
6472.2.2 by Jelmer Vernooij
Use controldir rather than bzrdir in a couple more places.
264
        branch = ControlDir.open_from_transport(transport).open_branch()
4911.1.1 by John Arbash Meinel
Threads don't have 'get_ident()' attributes. I think spiv meant 'getName()'.
265
        self.make_read_requests(branch)
266
        self.assertInetServerShutsdownCleanly(process)
267
        f = open(log_fname, 'rb')
268
        content = f.read()
269
        f.close()
4913.1.1 by John Arbash Meinel
Switch to using thread.get_ident() which is available on all python versions.
270
        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()'.
271
6133.4.21 by John Arbash Meinel
I'm trying to make sure that 'bzr serve' supports the serve.client_timeout code.
272
    def test_bzr_serve_supports_configurable_timeout(self):
273
        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.
274
        gs.set('serve.client_timeout', 0.2)
6499.3.9 by Vincent Ladeuil
Provide fresh config stores for tests.
275
        # Save the config as the subprocess will use it
6499.3.4 by Vincent Ladeuil
Fix failing tests, they were either brittle or requiring the config to be saved.
276
        gs.store.save()
6133.4.21 by John Arbash Meinel
I'm trying to make sure that 'bzr serve' supports the serve.client_timeout code.
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)
6133.4.34 by John Arbash Meinel
get the blackbox tests passing.
281
        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.
282
        # However, if we just wait for more content from the server, it will
283
        # eventually disconnect us.
6133.4.22 by John Arbash Meinel
move the comment
284
        m = t.get_smart_medium()
6133.4.34 by John Arbash Meinel
get the blackbox tests passing.
285
        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.
286
        # Now, we wait for timeout to trigger
6133.4.34 by John Arbash Meinel
get the blackbox tests passing.
287
        err = process.stderr.readline()
288
        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.
289
            'Connection Timeout: disconnecting client after 0.2 seconds\n',
6133.4.34 by John Arbash Meinel
get the blackbox tests passing.
290
            err)
6133.4.21 by John Arbash Meinel
I'm trying to make sure that 'bzr serve' supports the serve.client_timeout code.
291
        self.assertServerFinishesCleanly(process)
292
6133.4.29 by John Arbash Meinel
Expose --client-timeout to the command line, pass it through the layers.
293
    def test_bzr_serve_supports_client_timeout(self):
294
        process, url = self.start_server_port(['--client-timeout=0.1'])
295
        self.build_tree_contents([('a_file', 'contents\n')])
296
        # We can connect and issue a request
297
        t = transport.get_transport_from_url(url)
6133.4.34 by John Arbash Meinel
get the blackbox tests passing.
298
        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.
299
        # However, if we just wait for more content from the server, it will
300
        # eventually disconnect us.
301
        # TODO: Use something like signal.alarm() so that if the server doesn't
302
        #       properly handle the timeout, we end up failing the test instead
303
        #       of hanging forever.
304
        m = t.get_smart_medium()
6133.4.34 by John Arbash Meinel
get the blackbox tests passing.
305
        m.read_bytes(1)
6133.4.29 by John Arbash Meinel
Expose --client-timeout to the command line, pass it through the layers.
306
        # Now, we wait for timeout to trigger
6133.4.34 by John Arbash Meinel
get the blackbox tests passing.
307
        err = process.stderr.readline()
308
        self.assertEqual(
309
            'Connection Timeout: disconnecting client after 0.1 seconds\n',
310
            err)
6133.4.29 by John Arbash Meinel
Expose --client-timeout to the command line, pass it through the layers.
311
        self.assertServerFinishesCleanly(process)
312
6133.4.47 by John Arbash Meinel
Testing that 'bzr serve' actually installs SIGHUP and responds to it showed some problems.
313
    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.
314
        big_contents = 'a'*64*1024
315
        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.
316
        process, url = self.start_server_port(['--client-timeout=1.0'])
317
        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.
318
        m = t.get_smart_medium()
319
        c = client._SmartClient(m)
320
        # Start, but don't finish a response
321
        resp, response_handler = c.call_expecting_body('get', 'bigfile')
322
        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.
323
        # Note: process.send_signal is a Python 2.6ism
324
        process.send_signal(signal.SIGHUP)
6133.4.68 by John Arbash Meinel
Fix the blackbox test to wait for the process to exit.
325
        # Wait for the server to notice the signal, and then read the actual
326
        # body of the response. That way we know that it is waiting for the
327
        # request to finish
328
        self.assertEqual('Requested to stop gracefully\n',
329
                         process.stderr.readline())
330
        self.assertEqual('Waiting for 1 client(s) to finish\n',
331
                         process.stderr.readline())
332
        body = response_handler.read_body_bytes()
333
        if body != big_contents:
334
            self.fail('Failed to properly read the contents of "bigfile"')
335
        # Now that our request is finished, the medium should notice it has
336
        # been disconnected.
6133.4.47 by John Arbash Meinel
Testing that 'bzr serve' actually installs SIGHUP and responds to it showed some problems.
337
        self.assertEqual('', m.read_bytes(1))
6133.4.68 by John Arbash Meinel
Fix the blackbox test to wait for the process to exit.
338
        # And the server should be stopping
339
        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.
340
4544.1.2 by Andrew Bennetts
Add test that would catch the lack of ChrootServer in cmd_serve.
341
4815.3.7 by Gordon Tyler
Made a few changes at the suggestion of vila.
342
class TestCmdServeChrooting(TestBzrServeBase):
4544.1.2 by Andrew Bennetts
Add test that would catch the lack of ChrootServer in cmd_serve.
343
344
    def test_serve_tcp(self):
6622.1.29 by Jelmer Vernooij
Fix some more tests.
345
        """'brz serve' wraps the given --directory in a ChrootServer.
4544.1.2 by Andrew Bennetts
Add test that would catch the lack of ChrootServer in cmd_serve.
346
347
        So requests that search up through the parent directories (like
348
        find_repositoryV3) will give "not found" responses, rather than
349
        InvalidURLJoin or jail break errors.
350
        """
351
        t = self.get_transport()
352
        t.mkdir('server-root')
353
        self.run_bzr_serve_then_func(
6511.2.2 by Jelmer Vernooij
Revert to using 127.0.0.1 when starting serve, as that is what the client will use to connect.
354
            ['--listen', '127.0.0.1', '--port', '0',
4676.3.3 by Vincent Ladeuil
Force IPV4 to fix failure on IPV6-enabled hosts.
355
             '--directory', t.local_abspath('server-root'),
4544.1.2 by Andrew Bennetts
Add test that would catch the lack of ChrootServer in cmd_serve.
356
             '--allow-writes'],
4815.3.3 by Gordon Tyler
Changed test_bzr_serve_quiet to use in-process execution of the command.
357
            func=self.when_server_started)
4544.1.2 by Andrew Bennetts
Add test that would catch the lack of ChrootServer in cmd_serve.
358
        # The when_server_started method issued a find_repositoryV3 that should
359
        # fail with 'norepository' because there are no repositories inside the
360
        # --directory.
4676.3.3 by Vincent Ladeuil
Force IPV4 to fix failure on IPV6-enabled hosts.
361
        self.assertEqual(('norepository',), self.client_resp)
4676.3.1 by Vincent Ladeuil
Marking TestCmdServeChrooting.test_serve_tcp as expected failure
362
4544.1.2 by Andrew Bennetts
Add test that would catch the lack of ChrootServer in cmd_serve.
363
    def when_server_started(self):
364
        # Connect to the TCP server and issue some requests and see what comes
365
        # back.
366
        client_medium = medium.SmartTCPClientMedium(
367
            '127.0.0.1', self.tcp_server.port,
6622.1.30 by Jelmer Vernooij
Some more test fixes.
368
            'bzr://localhost:%d/' % (self.tcp_server.port,))
4544.1.2 by Andrew Bennetts
Add test that would catch the lack of ChrootServer in cmd_serve.
369
        smart_client = client._SmartClient(client_medium)
370
        resp = smart_client.call('mkdir', 'foo', '')
371
        resp = smart_client.call('BzrDirFormat.initialize', 'foo/')
372
        try:
373
            resp = smart_client.call('BzrDir.find_repositoryV3', 'foo/')
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
374
        except errors.ErrorFromSmartServer as e:
4544.1.2 by Andrew Bennetts
Add test that would catch the lack of ChrootServer in cmd_serve.
375
            resp = e.error_tuple
376
        self.client_resp = resp
377
        client_medium.disconnect()
378
379
4634.43.7 by Andrew Bennetts
Add some unit tests for parts of userdir expansion.
380
class TestUserdirExpansion(TestCaseWithMemoryTransport):
381
5340.15.1 by John Arbash Meinel
supersede exc-info branch
382
    @staticmethod
383
    def fake_expanduser(path):
4634.43.7 by Andrew Bennetts
Add some unit tests for parts of userdir expansion.
384
        """A simple, environment-independent, function for the duration of this
385
        test.
386
387
        Paths starting with a path segment of '~user' will expand to start with
388
        '/home/user/'.  Every other path will be unchanged.
389
        """
390
        if path.split('/', 1)[0] == '~user':
391
            return '/home/user' + path[len('~user'):]
392
        return path
393
394
    def make_test_server(self, base_path='/'):
4934.3.3 by Martin Pool
Rename Server.setUp to Server.start_server
395
        """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.
396
        creat '/home/user' in that transport.
397
        """
4634.43.15 by Andrew Bennetts
Rename BzrServerMaker -> BzrServerFactory.
398
        bzr_server = BzrServerFactory(
4634.43.7 by Andrew Bennetts
Add some unit tests for parts of userdir expansion.
399
            self.fake_expanduser, lambda t: base_path)
400
        mem_transport = self.get_transport()
401
        mem_transport.mkdir_multi(['home', 'home/user'])
6133.4.34 by John Arbash Meinel
get the blackbox tests passing.
402
        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.
403
        self.addCleanup(bzr_server.tear_down)
4634.43.7 by Andrew Bennetts
Add some unit tests for parts of userdir expansion.
404
        return bzr_server
405
406
    def test_bzr_serve_expands_userdir(self):
407
        bzr_server = self.make_test_server()
408
        self.assertTrue(bzr_server.smart_server.backing_transport.has('~user'))
409
410
    def test_bzr_serve_does_not_expand_userdir_outside_base(self):
411
        bzr_server = self.make_test_server('/foo')
412
        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.
413
4634.43.8 by Andrew Bennetts
Test for recovering the --directory value from the transport cmd_serve passes to bzr_serve.
414
    def test_get_base_path(self):
415
        """cmd_serve will turn the --directory option into a LocalTransport
4634.43.15 by Andrew Bennetts
Rename BzrServerMaker -> BzrServerFactory.
416
        (optionally decorated with 'readonly+').  BzrServerFactory can
417
        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.
418
        """
4797.3.4 by John Arbash Meinel
Per review recommendation, use 'osutils.abspath' instead of hardcoded string.
419
        # URLs always include the trailing slash, and get_base_path returns it
420
        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.
421
        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.
422
        # Define a fake 'protocol' to capture the transport that cmd_serve
423
        # passes to serve_bzr.
6133.4.34 by John Arbash Meinel
get the blackbox tests passing.
424
        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.
425
            self.bzr_serve_transport = transport
426
        cmd = builtins.cmd_serve()
427
        # Read-only
4789.7.1 by John Arbash Meinel
Fix a 'bzr serve' test that didn't expect windows translating '/a' to 'C:/a'.
428
        cmd.run(directory=base_dir, protocol=capture_transport)
4634.43.15 by Andrew Bennetts
Rename BzrServerMaker -> BzrServerFactory.
429
        server_maker = BzrServerFactory()
4634.43.8 by Andrew Bennetts
Test for recovering the --directory value from the transport cmd_serve passes to bzr_serve.
430
        self.assertEqual(
4797.3.21 by John Arbash Meinel
Use urlutils.local_path_to_url to handle both windows and linux.
431
            '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.
432
        self.assertEqual(
4789.7.1 by John Arbash Meinel
Fix a 'bzr serve' test that didn't expect windows translating '/a' to 'C:/a'.
433
            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.
434
        # Read-write
4789.7.1 by John Arbash Meinel
Fix a 'bzr serve' test that didn't expect windows translating '/a' to 'C:/a'.
435
        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.
436
            allow_writes=True)
4634.43.15 by Andrew Bennetts
Rename BzrServerMaker -> BzrServerFactory.
437
        server_maker = BzrServerFactory()
4797.3.21 by John Arbash Meinel
Use urlutils.local_path_to_url to handle both windows and linux.
438
        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'.
439
        self.assertEqual(base_dir,
440
            server_maker.get_base_path(self.bzr_serve_transport))
6236.1.1 by Jelmer Vernooij
bzr serve can now serve remote URLs and things behind directory services.
441
        # Read-only, from a URL
442
        cmd.run(directory=base_url, protocol=capture_transport)
443
        server_maker = BzrServerFactory()
444
        self.assertEqual(
445
            'readonly+%s' % base_url, self.bzr_serve_transport.base)
446
        self.assertEqual(
447
            base_dir, server_maker.get_base_path(self.bzr_serve_transport))