/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
3990.3.2 by Andrew Bennetts
Fix the do_body NotImplementedError log spam.
1
# Copyright (C) 2006, 2007, 2008, 2009 Canonical Ltd
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
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.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
16
17
"""Tests for smart transport"""
18
19
# all of this deals with byte strings so this is safe
20
from cStringIO import StringIO
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
21
import os
22
import socket
23
import threading
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
24
3245.4.55 by Andrew Bennetts
Test improvements suggested by John's review.
25
import bzrlib
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
26
from bzrlib import (
27
        bzrdir,
28
        errors,
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
29
        osutils,
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
30
        tests,
2049.1.1 by Lukáš Lalinský
Windows-speficic smart server transport selftest fixes.
31
        urlutils,
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
32
        )
2018.5.21 by Andrew Bennetts
Move bzrlib.transport.smart to bzrlib.smart
33
from bzrlib.smart import (
2018.5.26 by Andrew Bennetts
Extract a simple SmartClient class from RemoteTransport, and a hack to avoid VFS operations when probing for a bzrdir over a smart transport.
34
        client,
2018.5.14 by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.
35
        medium,
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
36
        message,
2018.5.14 by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.
37
        protocol,
2432.4.3 by Robert Collins
Refactor the HPSS Response code to take SmartServerResponse rather than args and body.
38
        request as _mod_request,
2018.5.14 by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.
39
        server,
40
        vfs,
41
)
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
42
from bzrlib.tests.test_smart import TestCaseWithSmartMedium
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
43
from bzrlib.transport import (
44
        get_transport,
45
        local,
46
        memory,
2400.1.1 by Andrew Bennetts
Rename bzrlib/transport/smart.py to bzrlib/transport/remote.py.
47
        remote,
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
48
        )
2004.1.28 by v.ladeuil+lp at free
Merge bzr.dev. Including http modifications by "smart" related code
49
from bzrlib.transport.http import SmartClientHTTPMediumRequest
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
50
51
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
52
class StringIOSSHVendor(object):
53
    """A SSH vendor that uses StringIO to buffer writes and answer reads."""
54
55
    def __init__(self, read_from, write_to):
56
        self.read_from = read_from
57
        self.write_to = write_to
58
        self.calls = []
59
60
    def connect_ssh(self, username, password, host, port, command):
61
        self.calls.append(('connect_ssh', username, password, host, port,
62
            command))
63
        return StringIOSSHConnection(self)
64
65
66
class StringIOSSHConnection(object):
67
    """A SSH connection that uses StringIO to buffer writes and answer reads."""
68
69
    def __init__(self, vendor):
70
        self.vendor = vendor
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
71
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
72
    def close(self):
73
        self.vendor.calls.append(('close', ))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
74
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
75
    def get_filelike_channels(self):
76
        return self.vendor.read_from, self.vendor.write_to
77
78
3180.1.2 by Andrew Bennetts
Add a test, and also add InvalidHostnameFeature.
79
class _InvalidHostnameFeature(tests.Feature):
80
    """Does 'non_existent.invalid' fail to resolve?
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
81
3180.1.2 by Andrew Bennetts
Add a test, and also add InvalidHostnameFeature.
82
    RFC 2606 states that .invalid is reserved for invalid domain names, and
83
    also underscores are not a valid character in domain names.  Despite this,
84
    it's possible a badly misconfigured name server might decide to always
85
    return an address for any name, so this feature allows us to distinguish a
86
    broken system from a broken test.
87
    """
88
89
    def _probe(self):
90
        try:
91
            socket.gethostbyname('non_existent.invalid')
92
        except socket.gaierror:
93
            # The host name failed to resolve.  Good.
94
            return True
95
        else:
96
            return False
97
98
    def feature_name(self):
99
        return 'invalid hostname'
100
101
InvalidHostnameFeature = _InvalidHostnameFeature()
102
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
103
104
class SmartClientMediumTests(tests.TestCase):
105
    """Tests for SmartClientMedium.
106
107
    We should create a test scenario for this: we need a server module that
108
    construct the test-servers (like make_loopsocket_and_medium), and the list
109
    of SmartClientMedium classes to test.
110
    """
111
112
    def make_loopsocket_and_medium(self):
113
        """Create a loopback socket for testing, and a medium aimed at it."""
114
        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
115
        sock.bind(('127.0.0.1', 0))
116
        sock.listen(1)
117
        port = sock.getsockname()[1]
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
118
        client_medium = medium.SmartTCPClientMedium('127.0.0.1', port, 'base')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
119
        return sock, client_medium
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
120
121
    def receive_bytes_on_server(self, sock, bytes):
122
        """Accept a connection on sock and read 3 bytes.
123
124
        The bytes are appended to the list bytes.
125
126
        :return: a Thread which is running to do the accept and recv.
127
        """
128
        def _receive_bytes_on_server():
129
            connection, address = sock.accept()
2091.1.1 by Martin Pool
Avoid MSG_WAITALL as it doesn't work on Windows
130
            bytes.append(osutils.recv_all(connection, 3))
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
131
            connection.close()
132
        t = threading.Thread(target=_receive_bytes_on_server)
133
        t.start()
134
        return t
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
135
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
136
    def test_construct_smart_simple_pipes_client_medium(self):
137
        # the SimplePipes client medium takes two pipes:
138
        # readable pipe, writeable pipe.
139
        # Constructing one should just save these and do nothing.
140
        # We test this by passing in None.
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
141
        client_medium = medium.SmartSimplePipesClientMedium(None, None, None)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
142
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
143
    def test_simple_pipes_client_request_type(self):
144
        # SimplePipesClient should use SmartClientStreamMediumRequest's.
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
145
        client_medium = medium.SmartSimplePipesClientMedium(None, None, None)
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
146
        request = client_medium.get_request()
147
        self.assertIsInstance(request, medium.SmartClientStreamMediumRequest)
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
148
149
    def test_simple_pipes_client_get_concurrent_requests(self):
150
        # the simple_pipes client does not support pipelined requests:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
151
        # but it does support serial requests: we construct one after
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
152
        # another is finished. This is a smoke test testing the integration
153
        # of the SmartClientStreamMediumRequest and the SmartClientStreamMedium
154
        # classes - as the sibling classes share this logic, they do not have
155
        # explicit tests for this.
156
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
157
        client_medium = medium.SmartSimplePipesClientMedium(
158
            None, output, 'base')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
159
        request = client_medium.get_request()
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
160
        request.finished_writing()
161
        request.finished_reading()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
162
        request2 = client_medium.get_request()
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
163
        request2.finished_writing()
164
        request2.finished_reading()
165
166
    def test_simple_pipes_client__accept_bytes_writes_to_writable(self):
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
167
        # accept_bytes writes to the writeable pipe.
168
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
169
        client_medium = medium.SmartSimplePipesClientMedium(
170
            None, output, 'base')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
171
        client_medium._accept_bytes('abc')
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
172
        self.assertEqual('abc', output.getvalue())
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
173
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
174
    def test_simple_pipes_client_disconnect_does_nothing(self):
175
        # calling disconnect does nothing.
176
        input = StringIO()
177
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
178
        client_medium = medium.SmartSimplePipesClientMedium(
179
            input, output, 'base')
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
180
        # send some bytes to ensure disconnecting after activity still does not
181
        # close.
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
182
        client_medium._accept_bytes('abc')
183
        client_medium.disconnect()
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
184
        self.assertFalse(input.closed)
185
        self.assertFalse(output.closed)
186
187
    def test_simple_pipes_client_accept_bytes_after_disconnect(self):
188
        # calling disconnect on the client does not alter the pipe that
189
        # accept_bytes writes to.
190
        input = StringIO()
191
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
192
        client_medium = medium.SmartSimplePipesClientMedium(
193
            input, output, 'base')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
194
        client_medium._accept_bytes('abc')
195
        client_medium.disconnect()
196
        client_medium._accept_bytes('abc')
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
197
        self.assertFalse(input.closed)
198
        self.assertFalse(output.closed)
199
        self.assertEqual('abcabc', output.getvalue())
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
200
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
201
    def test_simple_pipes_client_ignores_disconnect_when_not_connected(self):
202
        # Doing a disconnect on a new (and thus unconnected) SimplePipes medium
203
        # does nothing.
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
204
        client_medium = medium.SmartSimplePipesClientMedium(None, None, 'base')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
205
        client_medium.disconnect()
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
206
207
    def test_simple_pipes_client_can_always_read(self):
208
        # SmartSimplePipesClientMedium is never disconnected, so read_bytes
209
        # always tries to read from the underlying pipe.
210
        input = StringIO('abcdef')
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
211
        client_medium = medium.SmartSimplePipesClientMedium(input, None, 'base')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
212
        self.assertEqual('abc', client_medium.read_bytes(3))
213
        client_medium.disconnect()
214
        self.assertEqual('def', client_medium.read_bytes(3))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
215
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
216
    def test_simple_pipes_client_supports__flush(self):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
217
        # invoking _flush on a SimplePipesClient should flush the output
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
218
        # pipe. We test this by creating an output pipe that records
219
        # flush calls made to it.
220
        from StringIO import StringIO # get regular StringIO
221
        input = StringIO()
222
        output = StringIO()
223
        flush_calls = []
2018.2.26 by Andrew Bennetts
Changes prompted by j-a-meinel's review.
224
        def logging_flush(): flush_calls.append('flush')
225
        output.flush = logging_flush
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
226
        client_medium = medium.SmartSimplePipesClientMedium(
227
            input, output, 'base')
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
228
        # this call is here to ensure we only flush once, not on every
229
        # _accept_bytes call.
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
230
        client_medium._accept_bytes('abc')
231
        client_medium._flush()
232
        client_medium.disconnect()
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
233
        self.assertEqual(['flush'], flush_calls)
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
234
235
    def test_construct_smart_ssh_client_medium(self):
236
        # the SSH client medium takes:
237
        # host, port, username, password, vendor
238
        # Constructing one should just save these and do nothing.
239
        # we test this by creating a empty bound socket and constructing
240
        # a medium.
241
        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
242
        sock.bind(('127.0.0.1', 0))
2018.2.26 by Andrew Bennetts
Changes prompted by j-a-meinel's review.
243
        unopened_port = sock.getsockname()[1]
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
244
        # having vendor be invalid means that if it tries to connect via the
245
        # vendor it will blow up.
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
246
        client_medium = medium.SmartSSHClientMedium('127.0.0.1', unopened_port,
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
247
            username=None, password=None, base='base', vendor="not a vendor",
1551.18.17 by Aaron Bentley
Introduce bzr_remote_path configuration variable
248
            bzr_remote_path='bzr')
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
249
        sock.close()
250
251
    def test_ssh_client_connects_on_first_use(self):
252
        # The only thing that initiates a connection from the medium is giving
253
        # it bytes.
254
        output = StringIO()
255
        vendor = StringIOSSHVendor(StringIO(), output)
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
256
        client_medium = medium.SmartSSHClientMedium(
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
257
            'a hostname', 'a port', 'a username', 'a password', 'base', vendor,
258
            'bzr')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
259
        client_medium._accept_bytes('abc')
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
260
        self.assertEqual('abc', output.getvalue())
261
        self.assertEqual([('connect_ssh', 'a username', 'a password',
262
            'a hostname', 'a port',
263
            ['bzr', 'serve', '--inet', '--directory=/', '--allow-writes'])],
264
            vendor.calls)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
265
1551.18.17 by Aaron Bentley
Introduce bzr_remote_path configuration variable
266
    def test_ssh_client_changes_command_when_bzr_remote_path_passed(self):
267
        # The only thing that initiates a connection from the medium is giving
268
        # it bytes.
269
        output = StringIO()
270
        vendor = StringIOSSHVendor(StringIO(), output)
271
        client_medium = medium.SmartSSHClientMedium('a hostname', 'a port',
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
272
            'a username', 'a password', 'base', vendor, bzr_remote_path='fugly')
1551.18.17 by Aaron Bentley
Introduce bzr_remote_path configuration variable
273
        client_medium._accept_bytes('abc')
274
        self.assertEqual('abc', output.getvalue())
275
        self.assertEqual([('connect_ssh', 'a username', 'a password',
276
            'a hostname', 'a port',
277
            ['fugly', 'serve', '--inet', '--directory=/', '--allow-writes'])],
278
            vendor.calls)
279
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
280
    def test_ssh_client_disconnect_does_so(self):
281
        # calling disconnect should disconnect both the read_from and write_to
282
        # file-like object it from the ssh connection.
283
        input = StringIO()
284
        output = StringIO()
285
        vendor = StringIOSSHVendor(input, output)
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
286
        client_medium = medium.SmartSSHClientMedium(
287
            'a hostname', base='base', vendor=vendor, bzr_remote_path='bzr')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
288
        client_medium._accept_bytes('abc')
289
        client_medium.disconnect()
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
290
        self.assertTrue(input.closed)
291
        self.assertTrue(output.closed)
292
        self.assertEqual([
293
            ('connect_ssh', None, None, 'a hostname', None,
294
            ['bzr', 'serve', '--inet', '--directory=/', '--allow-writes']),
295
            ('close', ),
296
            ],
297
            vendor.calls)
298
299
    def test_ssh_client_disconnect_allows_reconnection(self):
300
        # calling disconnect on the client terminates the connection, but should
301
        # not prevent additional connections occuring.
302
        # we test this by initiating a second connection after doing a
303
        # disconnect.
304
        input = StringIO()
305
        output = StringIO()
306
        vendor = StringIOSSHVendor(input, output)
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
307
        client_medium = medium.SmartSSHClientMedium(
308
            'a hostname', base='base', vendor=vendor, bzr_remote_path='bzr')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
309
        client_medium._accept_bytes('abc')
310
        client_medium.disconnect()
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
311
        # the disconnect has closed output, so we need a new output for the
312
        # new connection to write to.
313
        input2 = StringIO()
314
        output2 = StringIO()
315
        vendor.read_from = input2
316
        vendor.write_to = output2
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
317
        client_medium._accept_bytes('abc')
318
        client_medium.disconnect()
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
319
        self.assertTrue(input.closed)
320
        self.assertTrue(output.closed)
321
        self.assertTrue(input2.closed)
322
        self.assertTrue(output2.closed)
323
        self.assertEqual([
324
            ('connect_ssh', None, None, 'a hostname', None,
325
            ['bzr', 'serve', '--inet', '--directory=/', '--allow-writes']),
326
            ('close', ),
327
            ('connect_ssh', None, None, 'a hostname', None,
328
            ['bzr', 'serve', '--inet', '--directory=/', '--allow-writes']),
329
            ('close', ),
330
            ],
331
            vendor.calls)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
332
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
333
    def test_ssh_client_ignores_disconnect_when_not_connected(self):
334
        # Doing a disconnect on a new (and thus unconnected) SSH medium
2018.2.26 by Andrew Bennetts
Changes prompted by j-a-meinel's review.
335
        # does not fail.  It's ok to disconnect an unconnected medium.
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
336
        client_medium = medium.SmartSSHClientMedium(
337
            None, base='base', bzr_remote_path='bzr')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
338
        client_medium.disconnect()
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
339
340
    def test_ssh_client_raises_on_read_when_not_connected(self):
341
        # Doing a read on a new (and thus unconnected) SSH medium raises
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
342
        # MediumNotConnected.
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
343
        client_medium = medium.SmartSSHClientMedium(
344
            None, base='base', bzr_remote_path='bzr')
1551.18.17 by Aaron Bentley
Introduce bzr_remote_path configuration variable
345
        self.assertRaises(errors.MediumNotConnected, client_medium.read_bytes,
346
                          0)
347
        self.assertRaises(errors.MediumNotConnected, client_medium.read_bytes,
348
                          1)
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
349
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
350
    def test_ssh_client_supports__flush(self):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
351
        # invoking _flush on a SSHClientMedium should flush the output
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
352
        # pipe. We test this by creating an output pipe that records
353
        # flush calls made to it.
354
        from StringIO import StringIO # get regular StringIO
355
        input = StringIO()
356
        output = StringIO()
357
        flush_calls = []
2018.2.26 by Andrew Bennetts
Changes prompted by j-a-meinel's review.
358
        def logging_flush(): flush_calls.append('flush')
359
        output.flush = logging_flush
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
360
        vendor = StringIOSSHVendor(input, output)
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
361
        client_medium = medium.SmartSSHClientMedium(
362
            'a hostname', base='base', vendor=vendor, bzr_remote_path='bzr')
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
363
        # this call is here to ensure we only flush once, not on every
364
        # _accept_bytes call.
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
365
        client_medium._accept_bytes('abc')
366
        client_medium._flush()
367
        client_medium.disconnect()
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
368
        self.assertEqual(['flush'], flush_calls)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
369
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
370
    def test_construct_smart_tcp_client_medium(self):
371
        # the TCP client medium takes a host and a port.  Constructing it won't
372
        # connect to anything.
373
        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
374
        sock.bind(('127.0.0.1', 0))
2018.2.26 by Andrew Bennetts
Changes prompted by j-a-meinel's review.
375
        unopened_port = sock.getsockname()[1]
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
376
        client_medium = medium.SmartTCPClientMedium(
377
            '127.0.0.1', unopened_port, 'base')
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
378
        sock.close()
379
380
    def test_tcp_client_connects_on_first_use(self):
381
        # The only thing that initiates a connection from the medium is giving
382
        # it bytes.
383
        sock, medium = self.make_loopsocket_and_medium()
384
        bytes = []
385
        t = self.receive_bytes_on_server(sock, bytes)
2018.2.26 by Andrew Bennetts
Changes prompted by j-a-meinel's review.
386
        medium.accept_bytes('abc')
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
387
        t.join()
388
        sock.close()
389
        self.assertEqual(['abc'], bytes)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
390
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
391
    def test_tcp_client_disconnect_does_so(self):
392
        # calling disconnect on the client terminates the connection.
393
        # we test this by forcing a short read during a socket.MSG_WAITALL
2018.2.26 by Andrew Bennetts
Changes prompted by j-a-meinel's review.
394
        # call: write 2 bytes, try to read 3, and then the client disconnects.
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
395
        sock, medium = self.make_loopsocket_and_medium()
396
        bytes = []
397
        t = self.receive_bytes_on_server(sock, bytes)
2018.2.26 by Andrew Bennetts
Changes prompted by j-a-meinel's review.
398
        medium.accept_bytes('ab')
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
399
        medium.disconnect()
400
        t.join()
401
        sock.close()
402
        self.assertEqual(['ab'], bytes)
2018.2.26 by Andrew Bennetts
Changes prompted by j-a-meinel's review.
403
        # now disconnect again: this should not do anything, if disconnection
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
404
        # really did disconnect.
405
        medium.disconnect()
3236.3.1 by Andrew Bennetts
Fix a bug in SmartServerSocketStreamMedium._get_line, and add some asserts to catch this sort of mistake sooner.
406
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
407
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
408
    def test_tcp_client_ignores_disconnect_when_not_connected(self):
409
        # Doing a disconnect on a new (and thus unconnected) TCP medium
2018.2.26 by Andrew Bennetts
Changes prompted by j-a-meinel's review.
410
        # does not fail.  It's ok to disconnect an unconnected medium.
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
411
        client_medium = medium.SmartTCPClientMedium(None, None, None)
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
412
        client_medium.disconnect()
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
413
414
    def test_tcp_client_raises_on_read_when_not_connected(self):
415
        # Doing a read on a new (and thus unconnected) TCP medium raises
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
416
        # MediumNotConnected.
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
417
        client_medium = medium.SmartTCPClientMedium(None, None, None)
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
418
        self.assertRaises(errors.MediumNotConnected, client_medium.read_bytes, 0)
419
        self.assertRaises(errors.MediumNotConnected, client_medium.read_bytes, 1)
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
420
421
    def test_tcp_client_supports__flush(self):
422
        # invoking _flush on a TCPClientMedium should do something useful.
423
        # RBC 20060922 not sure how to test/tell in this case.
424
        sock, medium = self.make_loopsocket_and_medium()
425
        bytes = []
426
        t = self.receive_bytes_on_server(sock, bytes)
427
        # try with nothing buffered
428
        medium._flush()
429
        medium._accept_bytes('ab')
430
        # and with something sent.
431
        medium._flush()
432
        medium.disconnect()
433
        t.join()
434
        sock.close()
435
        self.assertEqual(['ab'], bytes)
436
        # now disconnect again : this should not do anything, if disconnection
437
        # really did disconnect.
438
        medium.disconnect()
439
3180.1.2 by Andrew Bennetts
Add a test, and also add InvalidHostnameFeature.
440
    def test_tcp_client_host_unknown_connection_error(self):
441
        self.requireFeature(InvalidHostnameFeature)
442
        client_medium = medium.SmartTCPClientMedium(
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
443
            'non_existent.invalid', 4155, 'base')
3180.1.2 by Andrew Bennetts
Add a test, and also add InvalidHostnameFeature.
444
        self.assertRaises(
445
            errors.ConnectionError, client_medium._ensure_connection)
446
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
447
448
class TestSmartClientStreamMediumRequest(tests.TestCase):
449
    """Tests the for SmartClientStreamMediumRequest.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
450
451
    SmartClientStreamMediumRequest is a helper for the three stream based
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
452
    mediums: TCP, SSH, SimplePipes, so we only test it once, and then test that
453
    those three mediums implement the interface it expects.
454
    """
455
456
    def test_accept_bytes_after_finished_writing_errors(self):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
457
        # calling accept_bytes after calling finished_writing raises
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
458
        # WritingCompleted to prevent bad assumptions on stream environments
459
        # breaking the needs of message-based environments.
460
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
461
        client_medium = medium.SmartSimplePipesClientMedium(
462
            None, output, 'base')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
463
        request = medium.SmartClientStreamMediumRequest(client_medium)
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
464
        request.finished_writing()
465
        self.assertRaises(errors.WritingCompleted, request.accept_bytes, None)
466
467
    def test_accept_bytes(self):
468
        # accept bytes should invoke _accept_bytes on the stream medium.
469
        # we test this by using the SimplePipes medium - the most trivial one
470
        # and checking that the pipes get the data.
471
        input = StringIO()
472
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
473
        client_medium = medium.SmartSimplePipesClientMedium(
474
            input, output, 'base')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
475
        request = medium.SmartClientStreamMediumRequest(client_medium)
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
476
        request.accept_bytes('123')
477
        request.finished_writing()
478
        request.finished_reading()
479
        self.assertEqual('', input.getvalue())
480
        self.assertEqual('123', output.getvalue())
481
482
    def test_construct_sets_stream_request(self):
483
        # constructing a SmartClientStreamMediumRequest on a StreamMedium sets
484
        # the current request to the new SmartClientStreamMediumRequest
485
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
486
        client_medium = medium.SmartSimplePipesClientMedium(
487
            None, output, 'base')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
488
        request = medium.SmartClientStreamMediumRequest(client_medium)
489
        self.assertIs(client_medium._current_request, request)
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
490
491
    def test_construct_while_another_request_active_throws(self):
492
        # constructing a SmartClientStreamMediumRequest on a StreamMedium with
493
        # a non-None _current_request raises TooManyConcurrentRequests.
494
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
495
        client_medium = medium.SmartSimplePipesClientMedium(
496
            None, output, 'base')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
497
        client_medium._current_request = "a"
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
498
        self.assertRaises(errors.TooManyConcurrentRequests,
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
499
            medium.SmartClientStreamMediumRequest, client_medium)
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
500
501
    def test_finished_read_clears_current_request(self):
502
        # calling finished_reading clears the current request from the requests
503
        # medium
504
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
505
        client_medium = medium.SmartSimplePipesClientMedium(
506
            None, output, 'base')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
507
        request = medium.SmartClientStreamMediumRequest(client_medium)
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
508
        request.finished_writing()
509
        request.finished_reading()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
510
        self.assertEqual(None, client_medium._current_request)
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
511
512
    def test_finished_read_before_finished_write_errors(self):
513
        # calling finished_reading before calling finished_writing triggers a
514
        # WritingNotComplete error.
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
515
        client_medium = medium.SmartSimplePipesClientMedium(
516
            None, None, 'base')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
517
        request = medium.SmartClientStreamMediumRequest(client_medium)
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
518
        self.assertRaises(errors.WritingNotComplete, request.finished_reading)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
519
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
520
    def test_read_bytes(self):
521
        # read bytes should invoke _read_bytes on the stream medium.
522
        # we test this by using the SimplePipes medium - the most trivial one
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
523
        # and checking that the data is supplied. Its possible that a
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
524
        # faulty implementation could poke at the pipe variables them selves,
525
        # but we trust that this will be caught as it will break the integration
526
        # smoke tests.
527
        input = StringIO('321')
528
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
529
        client_medium = medium.SmartSimplePipesClientMedium(
530
            input, output, 'base')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
531
        request = medium.SmartClientStreamMediumRequest(client_medium)
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
532
        request.finished_writing()
533
        self.assertEqual('321', request.read_bytes(3))
534
        request.finished_reading()
535
        self.assertEqual('', input.read())
536
        self.assertEqual('', output.getvalue())
537
538
    def test_read_bytes_before_finished_write_errors(self):
539
        # calling read_bytes before calling finished_writing triggers a
540
        # WritingNotComplete error because the Smart protocol is designed to be
541
        # compatible with strict message based protocols like HTTP where the
542
        # request cannot be submitted until the writing has completed.
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
543
        client_medium = medium.SmartSimplePipesClientMedium(None, None, 'base')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
544
        request = medium.SmartClientStreamMediumRequest(client_medium)
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
545
        self.assertRaises(errors.WritingNotComplete, request.read_bytes, None)
546
547
    def test_read_bytes_after_finished_reading_errors(self):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
548
        # calling read_bytes after calling finished_reading raises
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
549
        # ReadingCompleted to prevent bad assumptions on stream environments
550
        # breaking the needs of message-based environments.
551
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
552
        client_medium = medium.SmartSimplePipesClientMedium(
553
            None, output, 'base')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
554
        request = medium.SmartClientStreamMediumRequest(client_medium)
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
555
        request.finished_writing()
556
        request.finished_reading()
557
        self.assertRaises(errors.ReadingCompleted, request.read_bytes, None)
558
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
559
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
560
class RemoteTransportTests(TestCaseWithSmartMedium):
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
561
562
    def test_plausible_url(self):
563
        self.assert_(self.get_url().startswith('bzr://'))
564
565
    def test_probe_transport(self):
566
        t = self.get_transport()
2018.5.20 by Andrew Bennetts
Move bzrlib/transport/smart/_smart.py to bzrlib/transport/remote.py and rename SmartTransport to RemoteTransport (Robert Collins, Andrew Bennetts)
567
        self.assertIsInstance(t, remote.RemoteTransport)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
568
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
569
    def test_get_medium_from_transport(self):
570
        """Remote transport has a medium always, which it can return."""
571
        t = self.get_transport()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
572
        client_medium = t.get_smart_medium()
573
        self.assertIsInstance(client_medium, medium.SmartClientMedium)
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
574
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
575
2018.2.18 by Andrew Bennetts
Just close the pipe/socket if the medium catches an error, and add tests for medium exception handling.
576
class ErrorRaisingProtocol(object):
577
578
    def __init__(self, exception):
579
        self.exception = exception
580
581
    def next_read_size(self):
582
        raise self.exception
583
584
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
585
class SampleRequest(object):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
586
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
587
    def __init__(self, expected_bytes):
588
        self.accepted_bytes = ''
2018.2.15 by Andrew Bennetts
Remove SmartServerRequestProtocolOne.finished_reading attribute, replace with next_read_size method.
589
        self._finished_reading = False
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
590
        self.expected_bytes = expected_bytes
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
591
        self.unused_data = ''
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
592
593
    def accept_bytes(self, bytes):
594
        self.accepted_bytes += bytes
595
        if self.accepted_bytes.startswith(self.expected_bytes):
2018.2.15 by Andrew Bennetts
Remove SmartServerRequestProtocolOne.finished_reading attribute, replace with next_read_size method.
596
            self._finished_reading = True
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
597
            self.unused_data = self.accepted_bytes[len(self.expected_bytes):]
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
598
2018.2.15 by Andrew Bennetts
Remove SmartServerRequestProtocolOne.finished_reading attribute, replace with next_read_size method.
599
    def next_read_size(self):
600
        if self._finished_reading:
601
            return 0
602
        else:
603
            return 1
604
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
605
606
class TestSmartServerStreamMedium(tests.TestCase):
607
2018.5.24 by Andrew Bennetts
Setting NO_SMART_VFS in environment will disable VFS methods in the smart server. (Robert Collins, John Arbash Meinel, Andrew Bennetts)
608
    def setUp(self):
609
        super(TestSmartServerStreamMedium, self).setUp()
2402.1.2 by Andrew Bennetts
Deal with review comments.
610
        self._captureVar('BZR_NO_SMART_VFS', None)
2018.5.24 by Andrew Bennetts
Setting NO_SMART_VFS in environment will disable VFS methods in the smart server. (Robert Collins, John Arbash Meinel, Andrew Bennetts)
611
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
612
    def portable_socket_pair(self):
613
        """Return a pair of TCP sockets connected to each other.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
614
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
615
        Unlike socket.socketpair, this should work on Windows.
616
        """
617
        listen_sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
618
        listen_sock.bind(('127.0.0.1', 0))
619
        listen_sock.listen(1)
620
        client_sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
621
        client_sock.connect(listen_sock.getsockname())
622
        server_sock, addr = listen_sock.accept()
623
        listen_sock.close()
624
        return server_sock, client_sock
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
625
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
626
    def test_smart_query_version(self):
627
        """Feed a canned query version to a server"""
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
628
        # wire-to-wire, using the whole stack
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
629
        to_server = StringIO('hello\n')
630
        from_server = StringIO()
2018.2.27 by Andrew Bennetts
Merge from bzr.dev
631
        transport = local.LocalTransport(urlutils.local_path_to_url('/'))
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
632
        server = medium.SmartServerPipeStreamMedium(
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
633
            to_server, from_server, transport)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
634
        smart_protocol = protocol.SmartServerRequestProtocolOne(transport,
2018.2.23 by Andrew Bennetts
Clean up SmartServerStreamMedium implementations, including removing unnecessary flushes.
635
                from_server.write)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
636
        server._serve_one_request(smart_protocol)
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
637
        self.assertEqual('ok\0012\n',
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
638
                         from_server.getvalue())
639
2018.2.31 by Andrew Bennetts
Fix dispatching of smart server requests involving unicode paths.
640
    def test_response_to_canned_get(self):
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
641
        transport = memory.MemoryTransport('memory:///')
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
642
        transport.put_bytes('testfile', 'contents\nof\nfile\n')
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
643
        to_server = StringIO('get\001./testfile\n')
644
        from_server = StringIO()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
645
        server = medium.SmartServerPipeStreamMedium(
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
646
            to_server, from_server, transport)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
647
        smart_protocol = protocol.SmartServerRequestProtocolOne(transport,
2018.2.23 by Andrew Bennetts
Clean up SmartServerStreamMedium implementations, including removing unnecessary flushes.
648
                from_server.write)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
649
        server._serve_one_request(smart_protocol)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
650
        self.assertEqual('ok\n'
651
                         '17\n'
652
                         'contents\nof\nfile\n'
653
                         'done\n',
654
                         from_server.getvalue())
655
2018.2.31 by Andrew Bennetts
Fix dispatching of smart server requests involving unicode paths.
656
    def test_response_to_canned_get_of_utf8(self):
657
        # wire-to-wire, using the whole stack, with a UTF-8 filename.
658
        transport = memory.MemoryTransport('memory:///')
659
        utf8_filename = u'testfile\N{INTERROBANG}'.encode('utf-8')
4760.2.4 by Andrew Bennetts
Update test_response_to_canned_get_of_utf8 to reflect reality.
660
        # VFS requests use filenames, not raw UTF-8.
661
        hpss_path = urlutils.escape(utf8_filename)
2018.2.31 by Andrew Bennetts
Fix dispatching of smart server requests involving unicode paths.
662
        transport.put_bytes(utf8_filename, 'contents\nof\nfile\n')
4760.2.4 by Andrew Bennetts
Update test_response_to_canned_get_of_utf8 to reflect reality.
663
        to_server = StringIO('get\001' + hpss_path + '\n')
2018.2.31 by Andrew Bennetts
Fix dispatching of smart server requests involving unicode paths.
664
        from_server = StringIO()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
665
        server = medium.SmartServerPipeStreamMedium(
2018.2.31 by Andrew Bennetts
Fix dispatching of smart server requests involving unicode paths.
666
            to_server, from_server, transport)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
667
        smart_protocol = protocol.SmartServerRequestProtocolOne(transport,
2018.2.31 by Andrew Bennetts
Fix dispatching of smart server requests involving unicode paths.
668
                from_server.write)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
669
        server._serve_one_request(smart_protocol)
2018.2.31 by Andrew Bennetts
Fix dispatching of smart server requests involving unicode paths.
670
        self.assertEqual('ok\n'
671
                         '17\n'
672
                         'contents\nof\nfile\n'
673
                         'done\n',
674
                         from_server.getvalue())
675
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
676
    def test_pipe_like_stream_with_bulk_data(self):
677
        sample_request_bytes = 'command\n9\nbulk datadone\n'
678
        to_server = StringIO(sample_request_bytes)
679
        from_server = StringIO()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
680
        server = medium.SmartServerPipeStreamMedium(
681
            to_server, from_server, None)
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
682
        sample_protocol = SampleRequest(expected_bytes=sample_request_bytes)
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
683
        server._serve_one_request(sample_protocol)
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
684
        self.assertEqual('', from_server.getvalue())
685
        self.assertEqual(sample_request_bytes, sample_protocol.accepted_bytes)
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
686
        self.assertFalse(server.finished)
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
687
688
    def test_socket_stream_with_bulk_data(self):
689
        sample_request_bytes = 'command\n9\nbulk datadone\n'
690
        server_sock, client_sock = self.portable_socket_pair()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
691
        server = medium.SmartServerSocketStreamMedium(
2018.2.23 by Andrew Bennetts
Clean up SmartServerStreamMedium implementations, including removing unnecessary flushes.
692
            server_sock, None)
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
693
        sample_protocol = SampleRequest(expected_bytes=sample_request_bytes)
694
        client_sock.sendall(sample_request_bytes)
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
695
        server._serve_one_request(sample_protocol)
2018.2.23 by Andrew Bennetts
Clean up SmartServerStreamMedium implementations, including removing unnecessary flushes.
696
        server_sock.close()
697
        self.assertEqual('', client_sock.recv(1))
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
698
        self.assertEqual(sample_request_bytes, sample_protocol.accepted_bytes)
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
699
        self.assertFalse(server.finished)
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
700
701
    def test_pipe_like_stream_shutdown_detection(self):
702
        to_server = StringIO('')
703
        from_server = StringIO()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
704
        server = medium.SmartServerPipeStreamMedium(to_server, from_server, None)
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
705
        server._serve_one_request(SampleRequest('x'))
706
        self.assertTrue(server.finished)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
707
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
708
    def test_socket_stream_shutdown_detection(self):
709
        server_sock, client_sock = self.portable_socket_pair()
710
        client_sock.close()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
711
        server = medium.SmartServerSocketStreamMedium(
2018.2.23 by Andrew Bennetts
Clean up SmartServerStreamMedium implementations, including removing unnecessary flushes.
712
            server_sock, None)
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
713
        server._serve_one_request(SampleRequest('x'))
714
        self.assertTrue(server.finished)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
715
3236.3.1 by Andrew Bennetts
Fix a bug in SmartServerSocketStreamMedium._get_line, and add some asserts to catch this sort of mistake sooner.
716
    def test_socket_stream_incomplete_request(self):
717
        """The medium should still construct the right protocol version even if
718
        the initial read only reads part of the request.
719
720
        Specifically, it should correctly read the protocol version line even
721
        if the partial read doesn't end in a newline.  An older, naive
722
        implementation of _get_line in the server used to have a bug in that
723
        case.
724
        """
725
        incomplete_request_bytes = protocol.REQUEST_VERSION_TWO + 'hel'
726
        rest_of_request_bytes = 'lo\n'
727
        expected_response = (
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
728
            protocol.RESPONSE_VERSION_TWO + 'success\nok\x012\n')
3236.3.1 by Andrew Bennetts
Fix a bug in SmartServerSocketStreamMedium._get_line, and add some asserts to catch this sort of mistake sooner.
729
        server_sock, client_sock = self.portable_socket_pair()
730
        server = medium.SmartServerSocketStreamMedium(
731
            server_sock, None)
732
        client_sock.sendall(incomplete_request_bytes)
733
        server_protocol = server._build_protocol()
734
        client_sock.sendall(rest_of_request_bytes)
735
        server._serve_one_request(server_protocol)
736
        server_sock.close()
4676.3.2 by Vincent Ladeuil
Fix weird TestSmartServerStreamMedium failure on FreeBSD.
737
        self.assertEqual(expected_response, osutils.recv_all(client_sock, 50),
3236.3.1 by Andrew Bennetts
Fix a bug in SmartServerSocketStreamMedium._get_line, and add some asserts to catch this sort of mistake sooner.
738
                         "Not a version 2 response to 'hello' request.")
739
        self.assertEqual('', client_sock.recv(1))
740
3236.3.2 by Andrew Bennetts
Fix SmartServerPipeStreamMedium._get_line too.
741
    def test_pipe_stream_incomplete_request(self):
742
        """The medium should still construct the right protocol version even if
743
        the initial read only reads part of the request.
744
745
        Specifically, it should correctly read the protocol version line even
746
        if the partial read doesn't end in a newline.  An older, naive
747
        implementation of _get_line in the server used to have a bug in that
748
        case.
749
        """
750
        incomplete_request_bytes = protocol.REQUEST_VERSION_TWO + 'hel'
751
        rest_of_request_bytes = 'lo\n'
752
        expected_response = (
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
753
            protocol.RESPONSE_VERSION_TWO + 'success\nok\x012\n')
3236.3.2 by Andrew Bennetts
Fix SmartServerPipeStreamMedium._get_line too.
754
        # Make a pair of pipes, to and from the server
755
        to_server, to_server_w = os.pipe()
756
        from_server_r, from_server = os.pipe()
757
        to_server = os.fdopen(to_server, 'r', 0)
758
        to_server_w = os.fdopen(to_server_w, 'w', 0)
759
        from_server_r = os.fdopen(from_server_r, 'r', 0)
760
        from_server = os.fdopen(from_server, 'w', 0)
761
        server = medium.SmartServerPipeStreamMedium(
762
            to_server, from_server, None)
763
        # Like test_socket_stream_incomplete_request, write an incomplete
764
        # request (that does not end in '\n') and build a protocol from it.
765
        to_server_w.write(incomplete_request_bytes)
766
        server_protocol = server._build_protocol()
767
        # Send the rest of the request, and finish serving it.
768
        to_server_w.write(rest_of_request_bytes)
769
        server._serve_one_request(server_protocol)
770
        to_server_w.close()
771
        from_server.close()
772
        self.assertEqual(expected_response, from_server_r.read(),
773
                         "Not a version 2 response to 'hello' request.")
774
        self.assertEqual('', from_server_r.read(1))
775
        from_server_r.close()
776
        to_server.close()
777
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
778
    def test_pipe_like_stream_with_two_requests(self):
779
        # If two requests are read in one go, then two calls to
780
        # _serve_one_request should still process both of them as if they had
4031.3.1 by Frank Aspell
Fixing various typos
781
        # been received separately.
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
782
        sample_request_bytes = 'command\n'
783
        to_server = StringIO(sample_request_bytes * 2)
784
        from_server = StringIO()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
785
        server = medium.SmartServerPipeStreamMedium(
786
            to_server, from_server, None)
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
787
        first_protocol = SampleRequest(expected_bytes=sample_request_bytes)
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
788
        server._serve_one_request(first_protocol)
2018.2.15 by Andrew Bennetts
Remove SmartServerRequestProtocolOne.finished_reading attribute, replace with next_read_size method.
789
        self.assertEqual(0, first_protocol.next_read_size())
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
790
        self.assertEqual('', from_server.getvalue())
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
791
        self.assertFalse(server.finished)
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
792
        # Make a new protocol, call _serve_one_request with it to collect the
793
        # second request.
794
        second_protocol = SampleRequest(expected_bytes=sample_request_bytes)
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
795
        server._serve_one_request(second_protocol)
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
796
        self.assertEqual('', from_server.getvalue())
797
        self.assertEqual(sample_request_bytes, second_protocol.accepted_bytes)
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
798
        self.assertFalse(server.finished)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
799
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
800
    def test_socket_stream_with_two_requests(self):
801
        # If two requests are read in one go, then two calls to
802
        # _serve_one_request should still process both of them as if they had
4031.3.1 by Frank Aspell
Fixing various typos
803
        # been received separately.
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
804
        sample_request_bytes = 'command\n'
805
        server_sock, client_sock = self.portable_socket_pair()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
806
        server = medium.SmartServerSocketStreamMedium(
2018.2.23 by Andrew Bennetts
Clean up SmartServerStreamMedium implementations, including removing unnecessary flushes.
807
            server_sock, None)
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
808
        first_protocol = SampleRequest(expected_bytes=sample_request_bytes)
809
        # Put two whole requests on the wire.
810
        client_sock.sendall(sample_request_bytes * 2)
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
811
        server._serve_one_request(first_protocol)
2018.2.15 by Andrew Bennetts
Remove SmartServerRequestProtocolOne.finished_reading attribute, replace with next_read_size method.
812
        self.assertEqual(0, first_protocol.next_read_size())
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
813
        self.assertFalse(server.finished)
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
814
        # Make a new protocol, call _serve_one_request with it to collect the
815
        # second request.
816
        second_protocol = SampleRequest(expected_bytes=sample_request_bytes)
817
        stream_still_open = server._serve_one_request(second_protocol)
818
        self.assertEqual(sample_request_bytes, second_protocol.accepted_bytes)
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
819
        self.assertFalse(server.finished)
2018.2.23 by Andrew Bennetts
Clean up SmartServerStreamMedium implementations, including removing unnecessary flushes.
820
        server_sock.close()
821
        self.assertEqual('', client_sock.recv(1))
2018.2.18 by Andrew Bennetts
Just close the pipe/socket if the medium catches an error, and add tests for medium exception handling.
822
823
    def test_pipe_like_stream_error_handling(self):
824
        # Use plain python StringIO so we can monkey-patch the close method to
825
        # not discard the contents.
826
        from StringIO import StringIO
827
        to_server = StringIO('')
828
        from_server = StringIO()
829
        self.closed = False
830
        def close():
831
            self.closed = True
832
        from_server.close = close
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
833
        server = medium.SmartServerPipeStreamMedium(
834
            to_server, from_server, None)
2018.2.18 by Andrew Bennetts
Just close the pipe/socket if the medium catches an error, and add tests for medium exception handling.
835
        fake_protocol = ErrorRaisingProtocol(Exception('boom'))
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
836
        server._serve_one_request(fake_protocol)
2018.2.18 by Andrew Bennetts
Just close the pipe/socket if the medium catches an error, and add tests for medium exception handling.
837
        self.assertEqual('', from_server.getvalue())
838
        self.assertTrue(self.closed)
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
839
        self.assertTrue(server.finished)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
840
2018.2.18 by Andrew Bennetts
Just close the pipe/socket if the medium catches an error, and add tests for medium exception handling.
841
    def test_socket_stream_error_handling(self):
842
        server_sock, client_sock = self.portable_socket_pair()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
843
        server = medium.SmartServerSocketStreamMedium(
2018.2.23 by Andrew Bennetts
Clean up SmartServerStreamMedium implementations, including removing unnecessary flushes.
844
            server_sock, None)
2018.2.18 by Andrew Bennetts
Just close the pipe/socket if the medium catches an error, and add tests for medium exception handling.
845
        fake_protocol = ErrorRaisingProtocol(Exception('boom'))
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
846
        server._serve_one_request(fake_protocol)
2018.2.23 by Andrew Bennetts
Clean up SmartServerStreamMedium implementations, including removing unnecessary flushes.
847
        # recv should not block, because the other end of the socket has been
848
        # closed.
849
        self.assertEqual('', client_sock.recv(1))
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
850
        self.assertTrue(server.finished)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
851
2018.2.18 by Andrew Bennetts
Just close the pipe/socket if the medium catches an error, and add tests for medium exception handling.
852
    def test_pipe_like_stream_keyboard_interrupt_handling(self):
853
        to_server = StringIO('')
854
        from_server = StringIO()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
855
        server = medium.SmartServerPipeStreamMedium(
856
            to_server, from_server, None)
2018.2.18 by Andrew Bennetts
Just close the pipe/socket if the medium catches an error, and add tests for medium exception handling.
857
        fake_protocol = ErrorRaisingProtocol(KeyboardInterrupt('boom'))
858
        self.assertRaises(
859
            KeyboardInterrupt, server._serve_one_request, fake_protocol)
860
        self.assertEqual('', from_server.getvalue())
861
862
    def test_socket_stream_keyboard_interrupt_handling(self):
863
        server_sock, client_sock = self.portable_socket_pair()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
864
        server = medium.SmartServerSocketStreamMedium(
2018.2.23 by Andrew Bennetts
Clean up SmartServerStreamMedium implementations, including removing unnecessary flushes.
865
            server_sock, None)
2018.2.18 by Andrew Bennetts
Just close the pipe/socket if the medium catches an error, and add tests for medium exception handling.
866
        fake_protocol = ErrorRaisingProtocol(KeyboardInterrupt('boom'))
867
        self.assertRaises(
868
            KeyboardInterrupt, server._serve_one_request, fake_protocol)
2018.2.23 by Andrew Bennetts
Clean up SmartServerStreamMedium implementations, including removing unnecessary flushes.
869
        server_sock.close()
870
        self.assertEqual('', client_sock.recv(1))
2432.2.2 by Andrew Bennetts
Smart server mediums now detect which protocol version a request is and dispatch accordingly.
871
872
    def build_protocol_pipe_like(self, bytes):
873
        to_server = StringIO(bytes)
874
        from_server = StringIO()
875
        server = medium.SmartServerPipeStreamMedium(
876
            to_server, from_server, None)
877
        return server._build_protocol()
878
879
    def build_protocol_socket(self, bytes):
880
        server_sock, client_sock = self.portable_socket_pair()
881
        server = medium.SmartServerSocketStreamMedium(
882
            server_sock, None)
883
        client_sock.sendall(bytes)
884
        client_sock.close()
885
        return server._build_protocol()
886
887
    def assertProtocolOne(self, server_protocol):
888
        # Use assertIs because assertIsInstance will wrongly pass
889
        # SmartServerRequestProtocolTwo (because it subclasses
890
        # SmartServerRequestProtocolOne).
891
        self.assertIs(
892
            type(server_protocol), protocol.SmartServerRequestProtocolOne)
893
894
    def assertProtocolTwo(self, server_protocol):
895
        self.assertIsInstance(
896
            server_protocol, protocol.SmartServerRequestProtocolTwo)
897
898
    def test_pipe_like_build_protocol_empty_bytes(self):
899
        # Any empty request (i.e. no bytes) is detected as protocol version one.
900
        server_protocol = self.build_protocol_pipe_like('')
901
        self.assertProtocolOne(server_protocol)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
902
2432.2.2 by Andrew Bennetts
Smart server mediums now detect which protocol version a request is and dispatch accordingly.
903
    def test_socket_like_build_protocol_empty_bytes(self):
904
        # Any empty request (i.e. no bytes) is detected as protocol version one.
905
        server_protocol = self.build_protocol_socket('')
906
        self.assertProtocolOne(server_protocol)
907
908
    def test_pipe_like_build_protocol_non_two(self):
2432.2.7 by Andrew Bennetts
Use less confusing version strings, and define REQUEST_VERSION_TWO/RESPONSE_VERSION_TWO constants for them.
909
        # A request that doesn't start with "bzr request 2\n" is version one.
910
        server_protocol = self.build_protocol_pipe_like('abc\n')
2432.2.2 by Andrew Bennetts
Smart server mediums now detect which protocol version a request is and dispatch accordingly.
911
        self.assertProtocolOne(server_protocol)
912
913
    def test_socket_build_protocol_non_two(self):
2432.2.7 by Andrew Bennetts
Use less confusing version strings, and define REQUEST_VERSION_TWO/RESPONSE_VERSION_TWO constants for them.
914
        # A request that doesn't start with "bzr request 2\n" is version one.
915
        server_protocol = self.build_protocol_socket('abc\n')
2432.2.2 by Andrew Bennetts
Smart server mediums now detect which protocol version a request is and dispatch accordingly.
916
        self.assertProtocolOne(server_protocol)
917
918
    def test_pipe_like_build_protocol_two(self):
2432.2.7 by Andrew Bennetts
Use less confusing version strings, and define REQUEST_VERSION_TWO/RESPONSE_VERSION_TWO constants for them.
919
        # A request that starts with "bzr request 2\n" is version two.
920
        server_protocol = self.build_protocol_pipe_like('bzr request 2\n')
2432.2.2 by Andrew Bennetts
Smart server mediums now detect which protocol version a request is and dispatch accordingly.
921
        self.assertProtocolTwo(server_protocol)
922
923
    def test_socket_build_protocol_two(self):
2432.2.7 by Andrew Bennetts
Use less confusing version strings, and define REQUEST_VERSION_TWO/RESPONSE_VERSION_TWO constants for them.
924
        # A request that starts with "bzr request 2\n" is version two.
925
        server_protocol = self.build_protocol_socket('bzr request 2\n')
2432.2.2 by Andrew Bennetts
Smart server mediums now detect which protocol version a request is and dispatch accordingly.
926
        self.assertProtocolTwo(server_protocol)
3245.4.41 by Andrew Bennetts
Add TestGetProtocolFactoryForBytes.
927
928
929
class TestGetProtocolFactoryForBytes(tests.TestCase):
930
    """_get_protocol_factory_for_bytes identifies the protocol factory a server
931
    should use to decode a given request.  Any bytes not part of the version
932
    marker string (and thus part of the actual request) are returned alongside
933
    the protocol factory.
934
    """
935
936
    def test_version_three(self):
937
        result = medium._get_protocol_factory_for_bytes(
3245.4.60 by Andrew Bennetts
Update the protocol v3 version string to say 'bzr 1.6'.
938
            'bzr message 3 (bzr 1.6)\nextra bytes')
3245.4.41 by Andrew Bennetts
Add TestGetProtocolFactoryForBytes.
939
        protocol_factory, remainder = result
940
        self.assertEqual(
941
            protocol.build_server_protocol_three, protocol_factory)
942
        self.assertEqual('extra bytes', remainder)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
943
3245.4.41 by Andrew Bennetts
Add TestGetProtocolFactoryForBytes.
944
    def test_version_two(self):
945
        result = medium._get_protocol_factory_for_bytes(
946
            'bzr request 2\nextra bytes')
947
        protocol_factory, remainder = result
948
        self.assertEqual(
949
            protocol.SmartServerRequestProtocolTwo, protocol_factory)
950
        self.assertEqual('extra bytes', remainder)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
951
3245.4.41 by Andrew Bennetts
Add TestGetProtocolFactoryForBytes.
952
    def test_version_one(self):
953
        """Version one requests have no version markers."""
954
        result = medium._get_protocol_factory_for_bytes('anything\n')
955
        protocol_factory, remainder = result
956
        self.assertEqual(
957
            protocol.SmartServerRequestProtocolOne, protocol_factory)
958
        self.assertEqual('anything\n', remainder)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
959
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
960
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
961
class TestSmartTCPServer(tests.TestCase):
962
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
963
    def test_get_error_unexpected(self):
964
        """Error reported by server with no specific representation"""
2402.1.2 by Andrew Bennetts
Deal with review comments.
965
        self._captureVar('BZR_NO_SMART_VFS', None)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
966
        class FlakyTransport(object):
2376.3.3 by Robert Collins
Fix all smart_transport tests.
967
            base = 'a_url'
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
968
            def external_url(self):
969
                return self.base
1910.19.14 by Robert Collins
Fix up all tests to pass, remove a couple more deprecated function calls, and break the dependency on sftp for the smart transport.
970
            def get_bytes(self, path):
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
971
                raise Exception("some random exception from inside server")
2018.5.14 by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.
972
        smart_server = server.SmartTCPServer(backing_transport=FlakyTransport())
3245.4.28 by Andrew Bennetts
Remove another XXX, and include test ID in smart server thread names.
973
        smart_server.start_background_thread('-' + self.id())
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
974
        try:
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
975
            transport = remote.RemoteTCPTransport(smart_server.get_url())
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
976
            err = self.assertRaises(errors.UnknownErrorFromSmartServer,
977
                transport.get, 'something')
978
            self.assertContainsRe(str(err), 'some random exception')
2018.5.171 by Andrew Bennetts
Disconnect RemoteTransports in some tests to avoid tripping up test_strace with leftover threads from previous tests.
979
            transport.disconnect()
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
980
        finally:
2018.5.14 by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.
981
            smart_server.stop_background_thread()
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
982
983
984
class SmartTCPTests(tests.TestCase):
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
985
    """Tests for connection/end to end behaviour using the TCP server.
986
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
987
    All of these tests are run with a server running on another thread serving
988
    a MemoryTransport, and a connection to it already open.
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
989
990
    the server is obtained by calling self.setUpServer(readonly=False).
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
991
    """
992
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
993
    def setUpServer(self, readonly=False, backing_transport=None):
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
994
        """Setup the server.
995
996
        :param readonly: Create a readonly server.
997
        """
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.
998
        # NB: Tests using this fall into two categories: tests of the server,
999
        # tests wanting a server. The latter should be updated to use
1000
        # self.vfs_transport_factory etc.
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
1001
        if not backing_transport:
4634.47.10 by Andrew Bennetts
Merge bzr.dev; fix test isolation glitch.
1002
            mem_server = memory.MemoryServer()
1003
            mem_server.setUp()
1004
            self.addCleanup(mem_server.tearDown)
1005
            self.permit_url(mem_server.get_url())
1006
            self.backing_transport = get_transport(mem_server.get_url())
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
1007
        else:
1008
            self.backing_transport = backing_transport
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
1009
        if readonly:
1010
            self.real_backing_transport = self.backing_transport
1011
            self.backing_transport = get_transport("readonly+" + self.backing_transport.abspath('.'))
2018.5.14 by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.
1012
        self.server = server.SmartTCPServer(self.backing_transport)
3245.4.28 by Andrew Bennetts
Remove another XXX, and include test ID in smart server thread names.
1013
        self.server.start_background_thread('-' + self.id())
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
1014
        self.transport = remote.RemoteTCPTransport(self.server.get_url())
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1015
        self.addCleanup(self.tearDownServer)
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.
1016
        self.permit_url(self.server.get_url())
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
1017
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1018
    def tearDownServer(self):
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
1019
        if getattr(self, 'transport', None):
1020
            self.transport.disconnect()
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1021
            del self.transport
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
1022
        if getattr(self, 'server', None):
1023
            self.server.stop_background_thread()
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1024
            del self.server
1025
1026
1027
class TestServerSocketUsage(SmartTCPTests):
1028
2376.3.8 by Robert Collins
Overhaul the SmartTCPServer connect-thread logic to synchronise on startup and shutdown and notify the server if it is in accept.
1029
    def test_server_setup_teardown(self):
1030
        """It should be safe to teardown the server with no requests."""
1031
        self.setUpServer()
1032
        server = self.server
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
1033
        transport = remote.RemoteTCPTransport(self.server.get_url())
2376.3.8 by Robert Collins
Overhaul the SmartTCPServer connect-thread logic to synchronise on startup and shutdown and notify the server if it is in accept.
1034
        self.tearDownServer()
1035
        self.assertRaises(errors.ConnectionError, transport.has, '.')
1036
1037
    def test_server_closes_listening_sock_on_shutdown_after_request(self):
2370.4.2 by Robert Collins
Review feedback.
1038
        """The server should close its listening socket when it's stopped."""
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1039
        self.setUpServer()
2370.4.2 by Robert Collins
Review feedback.
1040
        server = self.server
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1041
        self.transport.has('.')
1042
        self.tearDownServer()
1043
        # if the listening socket has closed, we should get a BADFD error
1044
        # when connecting, rather than a hang.
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
1045
        transport = remote.RemoteTCPTransport(server.get_url())
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1046
        self.assertRaises(errors.ConnectionError, transport.has, '.')
1047
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
1048
1049
class WritableEndToEndTests(SmartTCPTests):
1050
    """Client to server tests that require a writable transport."""
1051
1052
    def setUp(self):
1053
        super(WritableEndToEndTests, self).setUp()
1054
        self.setUpServer()
1055
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
1056
    def test_start_tcp_server(self):
1057
        url = self.server.get_url()
1058
        self.assertContainsRe(url, r'^bzr://127\.0\.0\.1:[0-9]{2,}/')
1059
1060
    def test_smart_transport_has(self):
1061
        """Checking for file existence over smart."""
2402.1.2 by Andrew Bennetts
Deal with review comments.
1062
        self._captureVar('BZR_NO_SMART_VFS', None)
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
1063
        self.backing_transport.put_bytes("foo", "contents of foo\n")
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
1064
        self.assertTrue(self.transport.has("foo"))
1065
        self.assertFalse(self.transport.has("non-foo"))
1066
1067
    def test_smart_transport_get(self):
1068
        """Read back a file over smart."""
2402.1.2 by Andrew Bennetts
Deal with review comments.
1069
        self._captureVar('BZR_NO_SMART_VFS', None)
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
1070
        self.backing_transport.put_bytes("foo", "contents\nof\nfoo\n")
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
1071
        fp = self.transport.get("foo")
1072
        self.assertEqual('contents\nof\nfoo\n', fp.read())
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
1073
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
1074
    def test_get_error_enoent(self):
1075
        """Error reported from server getting nonexistent file."""
1752.2.81 by Andrew Bennetts
Merge cleaned up underlying dependencies for remote bzrdir.
1076
        # The path in a raised NoSuchFile exception should be the precise path
1077
        # asked for by the client. This gives meaningful and unsurprising errors
1078
        # for users.
2402.1.2 by Andrew Bennetts
Deal with review comments.
1079
        self._captureVar('BZR_NO_SMART_VFS', None)
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
1080
        err = self.assertRaises(
1081
            errors.NoSuchFile, self.transport.get, 'not%20a%20file')
4294.2.9 by Robert Collins
Fixup tests broken by cleaning up the layering.
1082
        self.assertSubset([err.path], ['not%20a%20file', './not%20a%20file'])
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
1083
1084
    def test_simple_clone_conn(self):
1085
        """Test that cloning reuses the same connection."""
1086
        # we create a real connection not a loopback one, but it will use the
1087
        # same server and pipes
1752.2.74 by Andrew Bennetts
Make SmartTransport.clone return the right class, and move connection sharing into clone from __init__.
1088
        conn2 = self.transport.clone('.')
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
1089
        self.assertIs(self.transport.get_smart_medium(),
1090
                      conn2.get_smart_medium())
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
1091
1910.19.12 by Andrew Bennetts
Activate a disabled test, rename another test to be consistent with what it's testing. (Andrew Bennetts, Robert Collins)
1092
    def test__remote_path(self):
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
1093
        self.assertEquals('/foo/bar',
1094
                          self.transport._remote_path('foo/bar'))
1095
1096
    def test_clone_changes_base(self):
1097
        """Cloning transport produces one with a new base location"""
1098
        conn2 = self.transport.clone('subdir')
1099
        self.assertEquals(self.transport.base + 'subdir/',
1100
                          conn2.base)
1101
1102
    def test_open_dir(self):
1103
        """Test changing directory"""
2402.1.2 by Andrew Bennetts
Deal with review comments.
1104
        self._captureVar('BZR_NO_SMART_VFS', None)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
1105
        transport = self.transport
1106
        self.backing_transport.mkdir('toffee')
1107
        self.backing_transport.mkdir('toffee/apple')
1108
        self.assertEquals('/toffee', transport._remote_path('toffee'))
1910.19.13 by Andrew Bennetts
Address various review comments.
1109
        toffee_trans = transport.clone('toffee')
1110
        # Check that each transport has only the contents of its directory
1111
        # directly visible. If state was being held in the wrong object, it's
1112
        # conceivable that cloning a transport would alter the state of the
1113
        # cloned-from transport.
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
1114
        self.assertTrue(transport.has('toffee'))
1910.19.13 by Andrew Bennetts
Address various review comments.
1115
        self.assertFalse(toffee_trans.has('toffee'))
1116
        self.assertFalse(transport.has('apple'))
1117
        self.assertTrue(toffee_trans.has('apple'))
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
1118
1119
    def test_open_bzrdir(self):
1120
        """Open an existing bzrdir over smart transport"""
1121
        transport = self.transport
1122
        t = self.backing_transport
1123
        bzrdir.BzrDirFormat.get_default_format().initialize_on_transport(t)
1124
        result_dir = bzrdir.BzrDir.open_containing_from_transport(transport)
1125
1126
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
1127
class ReadOnlyEndToEndTests(SmartTCPTests):
1128
    """Tests from the client to the server using a readonly backing transport."""
1129
1130
    def test_mkdir_error_readonly(self):
1131
        """TransportNotPossible should be preserved from the backing transport."""
2402.1.2 by Andrew Bennetts
Deal with review comments.
1132
        self._captureVar('BZR_NO_SMART_VFS', None)
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
1133
        self.setUpServer(readonly=True)
1134
        self.assertRaises(errors.TransportNotPossible, self.transport.mkdir,
1135
            'foo')
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1136
1137
1138
class TestServerHooks(SmartTCPTests):
1139
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
1140
    def capture_server_call(self, backing_urls, public_url):
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1141
        """Record a server_started|stopped hook firing."""
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
1142
        self.hook_calls.append((backing_urls, public_url))
1143
1144
    def test_server_started_hook_memory(self):
1145
        """The server_started hook fires when the server is started."""
1146
        self.hook_calls = []
3256.2.12 by Daniel Watkins
Updated uses of Hooks.install_hook to Hooks.install_named_hook in test_smart_transport.py.
1147
        server.SmartTCPServer.hooks.install_named_hook('server_started',
1148
            self.capture_server_call, None)
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
1149
        self.setUpServer()
1150
        # at this point, the server will be starting a thread up.
1151
        # there is no indicator at the moment, so bodge it by doing a request.
1152
        self.transport.has('.')
1153
        # The default test server uses MemoryTransport and that has no external
1154
        # url:
1155
        self.assertEqual([([self.backing_transport.base], self.transport.base)],
1156
            self.hook_calls)
1157
1158
    def test_server_started_hook_file(self):
1159
        """The server_started hook fires when the server is started."""
1160
        self.hook_calls = []
3256.2.12 by Daniel Watkins
Updated uses of Hooks.install_hook to Hooks.install_named_hook in test_smart_transport.py.
1161
        server.SmartTCPServer.hooks.install_named_hook('server_started',
1162
            self.capture_server_call, None)
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
1163
        self.setUpServer(backing_transport=get_transport("."))
1164
        # at this point, the server will be starting a thread up.
1165
        # there is no indicator at the moment, so bodge it by doing a request.
1166
        self.transport.has('.')
1167
        # The default test server uses MemoryTransport and that has no external
1168
        # url:
1169
        self.assertEqual([([
1170
            self.backing_transport.base, self.backing_transport.external_url()],
1171
             self.transport.base)],
1172
            self.hook_calls)
1173
1174
    def test_server_stopped_hook_simple_memory(self):
1175
        """The server_stopped hook fires when the server is stopped."""
1176
        self.hook_calls = []
3256.2.12 by Daniel Watkins
Updated uses of Hooks.install_hook to Hooks.install_named_hook in test_smart_transport.py.
1177
        server.SmartTCPServer.hooks.install_named_hook('server_stopped',
1178
            self.capture_server_call, None)
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
1179
        self.setUpServer()
1180
        result = [([self.backing_transport.base], self.transport.base)]
1181
        # check the stopping message isn't emitted up front.
1182
        self.assertEqual([], self.hook_calls)
1183
        # nor after a single message
1184
        self.transport.has('.')
1185
        self.assertEqual([], self.hook_calls)
1186
        # clean up the server
1187
        self.tearDownServer()
1188
        # now it should have fired.
1189
        self.assertEqual(result, self.hook_calls)
1190
1191
    def test_server_stopped_hook_simple_file(self):
1192
        """The server_stopped hook fires when the server is stopped."""
1193
        self.hook_calls = []
3256.2.12 by Daniel Watkins
Updated uses of Hooks.install_hook to Hooks.install_named_hook in test_smart_transport.py.
1194
        server.SmartTCPServer.hooks.install_named_hook('server_stopped',
1195
            self.capture_server_call, None)
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
1196
        self.setUpServer(backing_transport=get_transport("."))
1197
        result = [(
1198
            [self.backing_transport.base, self.backing_transport.external_url()]
1199
            , self.transport.base)]
2376.3.8 by Robert Collins
Overhaul the SmartTCPServer connect-thread logic to synchronise on startup and shutdown and notify the server if it is in accept.
1200
        # check the stopping message isn't emitted up front.
1201
        self.assertEqual([], self.hook_calls)
1202
        # nor after a single message
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1203
        self.transport.has('.')
1204
        self.assertEqual([], self.hook_calls)
1205
        # clean up the server
1206
        self.tearDownServer()
2376.3.8 by Robert Collins
Overhaul the SmartTCPServer connect-thread logic to synchronise on startup and shutdown and notify the server if it is in accept.
1207
        # now it should have fired.
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1208
        self.assertEqual(result, self.hook_calls)
1209
1210
# TODO: test that when the server suffers an exception that it calls the
1211
# server-stopped hook.
1212
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
1213
2018.5.17 by Andrew Bennetts
Paramaterise the commands handled by SmartServerRequestHandler.
1214
class SmartServerCommandTests(tests.TestCaseWithTransport):
1215
    """Tests that call directly into the command objects, bypassing the network
1216
    and the request dispatching.
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
1217
1218
    Note: these tests are rudimentary versions of the command object tests in
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
1219
    test_smart.py.
2018.5.17 by Andrew Bennetts
Paramaterise the commands handled by SmartServerRequestHandler.
1220
    """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1221
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
1222
    def test_hello(self):
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1223
        cmd = _mod_request.HelloRequest(None, '/')
2018.5.24 by Andrew Bennetts
Setting NO_SMART_VFS in environment will disable VFS methods in the smart server. (Robert Collins, John Arbash Meinel, Andrew Bennetts)
1224
        response = cmd.execute()
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
1225
        self.assertEqual(('ok', '2'), response.args)
2018.5.17 by Andrew Bennetts
Paramaterise the commands handled by SmartServerRequestHandler.
1226
        self.assertEqual(None, response.body)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1227
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
1228
    def test_get_bundle(self):
1229
        from bzrlib.bundle import serializer
1230
        wt = self.make_branch_and_tree('.')
1910.19.13 by Andrew Bennetts
Address various review comments.
1231
        self.build_tree_contents([('hello', 'hello world')])
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
1232
        wt.add('hello')
1910.19.13 by Andrew Bennetts
Address various review comments.
1233
        rev_id = wt.commit('add hello')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1234
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1235
        cmd = _mod_request.GetBundleRequest(self.get_transport(), '/')
2018.5.24 by Andrew Bennetts
Setting NO_SMART_VFS in environment will disable VFS methods in the smart server. (Robert Collins, John Arbash Meinel, Andrew Bennetts)
1236
        response = cmd.execute('.', rev_id)
2018.5.17 by Andrew Bennetts
Paramaterise the commands handled by SmartServerRequestHandler.
1237
        bundle = serializer.read_bundle(StringIO(response.body))
1238
        self.assertEqual((), response.args)
1239
1240
1241
class SmartServerRequestHandlerTests(tests.TestCaseWithTransport):
1242
    """Test that call directly into the handler logic, bypassing the network."""
1243
2018.5.24 by Andrew Bennetts
Setting NO_SMART_VFS in environment will disable VFS methods in the smart server. (Robert Collins, John Arbash Meinel, Andrew Bennetts)
1244
    def setUp(self):
1245
        super(SmartServerRequestHandlerTests, self).setUp()
2402.1.2 by Andrew Bennetts
Deal with review comments.
1246
        self._captureVar('BZR_NO_SMART_VFS', None)
2018.5.24 by Andrew Bennetts
Setting NO_SMART_VFS in environment will disable VFS methods in the smart server. (Robert Collins, John Arbash Meinel, Andrew Bennetts)
1247
2018.5.17 by Andrew Bennetts
Paramaterise the commands handled by SmartServerRequestHandler.
1248
    def build_handler(self, transport):
1249
        """Returns a handler for the commands in protocol version one."""
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1250
        return _mod_request.SmartServerRequestHandler(
1251
            transport, _mod_request.request_handlers, '/')
2018.5.17 by Andrew Bennetts
Paramaterise the commands handled by SmartServerRequestHandler.
1252
1253
    def test_construct_request_handler(self):
1254
        """Constructing a request handler should be easy and set defaults."""
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1255
        handler = _mod_request.SmartServerRequestHandler(None, commands=None,
1256
                root_client_path='/')
2018.5.17 by Andrew Bennetts
Paramaterise the commands handled by SmartServerRequestHandler.
1257
        self.assertFalse(handler.finished_reading)
1258
1259
    def test_hello(self):
1260
        handler = self.build_handler(None)
4634.6.30 by Andrew Bennetts
Remove SmartServerRequest.dispatch_command, fix SmartServerRequest.args_received.
1261
        handler.args_received(('hello',))
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
1262
        self.assertEqual(('ok', '2'), handler.response.args)
2018.5.17 by Andrew Bennetts
Paramaterise the commands handled by SmartServerRequestHandler.
1263
        self.assertEqual(None, handler.response.body)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1264
2018.5.24 by Andrew Bennetts
Setting NO_SMART_VFS in environment will disable VFS methods in the smart server. (Robert Collins, John Arbash Meinel, Andrew Bennetts)
1265
    def test_disable_vfs_handler_classes_via_environment(self):
2018.5.140 by Andrew Bennetts
Merge from bzr.dev
1266
        # VFS handler classes will raise an error from "execute" if
1267
        # BZR_NO_SMART_VFS is set.
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1268
        handler = vfs.HasRequest(None, '/')
2018.5.24 by Andrew Bennetts
Setting NO_SMART_VFS in environment will disable VFS methods in the smart server. (Robert Collins, John Arbash Meinel, Andrew Bennetts)
1269
        # set environment variable after construction to make sure it's
1270
        # examined.
2018.5.140 by Andrew Bennetts
Merge from bzr.dev
1271
        # Note that we can safely clobber BZR_NO_SMART_VFS here, because setUp
1272
        # has called _captureVar, so it will be restored to the right state
2018.5.24 by Andrew Bennetts
Setting NO_SMART_VFS in environment will disable VFS methods in the smart server. (Robert Collins, John Arbash Meinel, Andrew Bennetts)
1273
        # afterwards.
2402.1.2 by Andrew Bennetts
Deal with review comments.
1274
        os.environ['BZR_NO_SMART_VFS'] = ''
2018.5.24 by Andrew Bennetts
Setting NO_SMART_VFS in environment will disable VFS methods in the smart server. (Robert Collins, John Arbash Meinel, Andrew Bennetts)
1275
        self.assertRaises(errors.DisabledMethod, handler.execute)
1276
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
1277
    def test_readonly_exception_becomes_transport_not_possible(self):
1278
        """The response for a read-only error is ('ReadOnlyError')."""
2018.5.17 by Andrew Bennetts
Paramaterise the commands handled by SmartServerRequestHandler.
1279
        handler = self.build_handler(self.get_readonly_transport())
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
1280
        # send a mkdir for foo, with no explicit mode - should fail.
4634.6.30 by Andrew Bennetts
Remove SmartServerRequest.dispatch_command, fix SmartServerRequest.args_received.
1281
        handler.args_received(('mkdir', 'foo', ''))
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
1282
        # and the failure should be an explicit ReadOnlyError
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1283
        self.assertEqual(("ReadOnlyError", ), handler.response.args)
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
1284
        # XXX: TODO: test that other TransportNotPossible errors are
1285
        # presented as TransportNotPossible - not possible to do that
1286
        # until I figure out how to trigger that relatively cleanly via
1287
        # the api. RBC 20060918
1288
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1289
    def test_hello_has_finished_body_on_dispatch(self):
1290
        """The 'hello' command should set finished_reading."""
2018.5.17 by Andrew Bennetts
Paramaterise the commands handled by SmartServerRequestHandler.
1291
        handler = self.build_handler(None)
4634.6.30 by Andrew Bennetts
Remove SmartServerRequest.dispatch_command, fix SmartServerRequest.args_received.
1292
        handler.args_received(('hello',))
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1293
        self.assertTrue(handler.finished_reading)
1294
        self.assertNotEqual(None, handler.response)
1295
1296
    def test_put_bytes_non_atomic(self):
1297
        """'put_...' should set finished_reading after reading the bytes."""
2018.5.17 by Andrew Bennetts
Paramaterise the commands handled by SmartServerRequestHandler.
1298
        handler = self.build_handler(self.get_transport())
4634.6.30 by Andrew Bennetts
Remove SmartServerRequest.dispatch_command, fix SmartServerRequest.args_received.
1299
        handler.args_received(('put_non_atomic', 'a-file', '', 'F', ''))
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1300
        self.assertFalse(handler.finished_reading)
1301
        handler.accept_body('1234')
1302
        self.assertFalse(handler.finished_reading)
1303
        handler.accept_body('5678')
1304
        handler.end_of_body()
1305
        self.assertTrue(handler.finished_reading)
1306
        self.assertEqual(('ok', ), handler.response.args)
1307
        self.assertEqual(None, handler.response.body)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1308
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1309
    def test_readv_accept_body(self):
1310
        """'readv' should set finished_reading after reading offsets."""
1311
        self.build_tree(['a-file'])
2018.5.17 by Andrew Bennetts
Paramaterise the commands handled by SmartServerRequestHandler.
1312
        handler = self.build_handler(self.get_readonly_transport())
4634.6.30 by Andrew Bennetts
Remove SmartServerRequest.dispatch_command, fix SmartServerRequest.args_received.
1313
        handler.args_received(('readv', 'a-file'))
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1314
        self.assertFalse(handler.finished_reading)
1315
        handler.accept_body('2,')
1316
        self.assertFalse(handler.finished_reading)
1317
        handler.accept_body('3')
1318
        handler.end_of_body()
1319
        self.assertTrue(handler.finished_reading)
1320
        self.assertEqual(('readv', ), handler.response.args)
1321
        # co - nte - nt of a-file is the file contents we are extracting from.
1322
        self.assertEqual('nte', handler.response.body)
1323
1324
    def test_readv_short_read_response_contents(self):
1325
        """'readv' when a short read occurs sets the response appropriately."""
1326
        self.build_tree(['a-file'])
2018.5.17 by Andrew Bennetts
Paramaterise the commands handled by SmartServerRequestHandler.
1327
        handler = self.build_handler(self.get_readonly_transport())
4634.6.30 by Andrew Bennetts
Remove SmartServerRequest.dispatch_command, fix SmartServerRequest.args_received.
1328
        handler.args_received(('readv', 'a-file'))
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1329
        # read beyond the end of the file.
1330
        handler.accept_body('100,1')
1331
        handler.end_of_body()
1332
        self.assertTrue(handler.finished_reading)
2692.1.8 by Andrew Bennetts
Fix trivial test failure.
1333
        self.assertEqual(('ShortReadvError', './a-file', '100', '1', '0'),
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1334
            handler.response.args)
1335
        self.assertEqual(None, handler.response.body)
1336
1752.2.73 by Andrew Bennetts
Define (and register as bzr+ssh://) SmartSSHTransport, factor out an SSHSubprocess from SFTPSubprocess, and make SmartTransport connect lazily rather than in the constructor.
1337
2018.5.20 by Andrew Bennetts
Move bzrlib/transport/smart/_smart.py to bzrlib/transport/remote.py and rename SmartTransport to RemoteTransport (Robert Collins, Andrew Bennetts)
1338
class RemoteTransportRegistration(tests.TestCase):
1752.2.73 by Andrew Bennetts
Define (and register as bzr+ssh://) SmartSSHTransport, factor out an SSHSubprocess from SFTPSubprocess, and make SmartTransport connect lazily rather than in the constructor.
1339
1340
    def test_registration(self):
1341
        t = get_transport('bzr+ssh://example.com/path')
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
1342
        self.assertIsInstance(t, remote.RemoteSSHTransport)
1752.2.73 by Andrew Bennetts
Define (and register as bzr+ssh://) SmartSSHTransport, factor out an SSHSubprocess from SFTPSubprocess, and make SmartTransport connect lazily rather than in the constructor.
1343
        self.assertEqual('example.com', t._host)
1344
2814.2.2 by Martin Pool
merge bzr+https patch from johnf and add a basic test
1345
    def test_bzr_https(self):
1346
        # https://bugs.launchpad.net/bzr/+bug/128456
1347
        t = get_transport('bzr+https://example.com/path')
1348
        self.assertIsInstance(t, remote.RemoteHTTPTransport)
1349
        self.assertStartsWith(
1350
            t._http_transport.base,
1351
            'https://')
1352
1752.2.73 by Andrew Bennetts
Define (and register as bzr+ssh://) SmartSSHTransport, factor out an SSHSubprocess from SFTPSubprocess, and make SmartTransport connect lazily rather than in the constructor.
1353
2018.5.20 by Andrew Bennetts
Move bzrlib/transport/smart/_smart.py to bzrlib/transport/remote.py and rename SmartTransport to RemoteTransport (Robert Collins, Andrew Bennetts)
1354
class TestRemoteTransport(tests.TestCase):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1355
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
1356
    def test_use_connection_factory(self):
2018.5.20 by Andrew Bennetts
Move bzrlib/transport/smart/_smart.py to bzrlib/transport/remote.py and rename SmartTransport to RemoteTransport (Robert Collins, Andrew Bennetts)
1357
        # We want to be able to pass a client as a parameter to RemoteTransport.
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
1358
        input = StringIO('ok\n3\nbardone\n')
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
1359
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
1360
        client_medium = medium.SmartSimplePipesClientMedium(
1361
            input, output, 'base')
2018.5.20 by Andrew Bennetts
Move bzrlib/transport/smart/_smart.py to bzrlib/transport/remote.py and rename SmartTransport to RemoteTransport (Robert Collins, Andrew Bennetts)
1362
        transport = remote.RemoteTransport(
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1363
            'bzr://localhost/', medium=client_medium)
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
1364
        # Disable version detection.
3245.4.47 by Andrew Bennetts
Don't automatically send 'hello' requests from RemoteBzrDirFormat.probe_transport unless we have to (i.e. the transport is HTTP).
1365
        client_medium._protocol_version = 1
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
1366
1367
        # We want to make sure the client is used when the first remote
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
1368
        # method is called.  No data should have been sent, or read.
1369
        self.assertEqual(0, input.tell())
1370
        self.assertEqual('', output.getvalue())
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
1371
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1372
        # Now call a method that should result in one request: as the
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
1373
        # transport makes its own protocol instances, we check on the wire.
1374
        # XXX: TODO: give the transport a protocol factory, which can make
1375
        # an instrumented protocol for us.
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
1376
        self.assertEqual('bar', transport.get_bytes('foo'))
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
1377
        # only the needed data should have been sent/received.
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
1378
        self.assertEqual(13, input.tell())
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
1379
        self.assertEqual('get\x01/foo\n', output.getvalue())
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
1380
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
1381
    def test__translate_error_readonly(self):
1382
        """Sending a ReadOnlyError to _translate_error raises TransportNotPossible."""
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
1383
        client_medium = medium.SmartSimplePipesClientMedium(None, None, 'base')
2018.5.20 by Andrew Bennetts
Move bzrlib/transport/smart/_smart.py to bzrlib/transport/remote.py and rename SmartTransport to RemoteTransport (Robert Collins, Andrew Bennetts)
1384
        transport = remote.RemoteTransport(
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1385
            'bzr://localhost/', medium=client_medium)
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
1386
        err = errors.ErrorFromSmartServer(("ReadOnlyError", ))
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
1387
        self.assertRaises(errors.TransportNotPossible,
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
1388
            transport._translate_error, err)
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
1389
1910.19.22 by Robert Collins
Rearrange the readv patch to put the serialise offsets method into the correct class, and document the structure of the classes somewhat better to hint to people writing patches where code should go. Also alter the test so that the client and server components are tested in one place preventing possible encoding skew from occuring.
1390
2432.2.5 by Andrew Bennetts
Reduce duplication in test_smart_transport.
1391
class TestSmartProtocol(tests.TestCase):
1392
    """Base class for smart protocol tests.
1910.19.22 by Robert Collins
Rearrange the readv patch to put the serialise offsets method into the correct class, and document the structure of the classes somewhat better to hint to people writing patches where code should go. Also alter the test so that the client and server components are tested in one place preventing possible encoding skew from occuring.
1393
1394
    Each test case gets a smart_server and smart_client created during setUp().
1395
1396
    It is planned that the client can be called with self.call_client() giving
1397
    it an expected server response, which will be fed into it when it tries to
1398
    read. Likewise, self.call_server will call a servers method with a canned
1399
    serialised client request. Output done by the client or server for these
1400
    calls will be captured to self.to_server and self.to_client. Each element
1401
    in the list is a write call from the client or server respectively.
2432.2.5 by Andrew Bennetts
Reduce duplication in test_smart_transport.
1402
1403
    Subclasses can override client_protocol_class and server_protocol_class.
1910.19.22 by Robert Collins
Rearrange the readv patch to put the serialise offsets method into the correct class, and document the structure of the classes somewhat better to hint to people writing patches where code should go. Also alter the test so that the client and server components are tested in one place preventing possible encoding skew from occuring.
1404
    """
1405
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1406
    request_encoder = None
1407
    response_decoder = None
1408
    server_protocol_class = None
2432.2.5 by Andrew Bennetts
Reduce duplication in test_smart_transport.
1409
    client_protocol_class = None
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1410
1411
    def make_client_protocol_and_output(self, input_bytes=None):
3245.4.26 by Andrew Bennetts
Rename 'setProtoAndMedium' to more accurate 'setProtoAndMediumRequest', add ABCs for Requesters and ResponseHandlers.
1412
        """
1413
        :returns: a Request
1414
        """
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1415
        # This is very similar to
1416
        # bzrlib.smart.client._SmartClient._build_client_protocol
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
1417
        # XXX: make this use _SmartClient!
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1418
        if input_bytes is None:
1419
            input = StringIO()
1420
        else:
1421
            input = StringIO(input_bytes)
1422
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
1423
        client_medium = medium.SmartSimplePipesClientMedium(
1424
            input, output, 'base')
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1425
        request = client_medium.get_request()
1426
        if self.client_protocol_class is not None:
1427
            client_protocol = self.client_protocol_class(request)
1428
            return client_protocol, client_protocol, output
1429
        else:
3245.4.55 by Andrew Bennetts
Test improvements suggested by John's review.
1430
            self.assertNotEqual(None, self.request_encoder)
1431
            self.assertNotEqual(None, self.response_decoder)
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1432
            requester = self.request_encoder(request)
1433
            response_handler = message.ConventionalResponseHandler()
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
1434
            response_protocol = self.response_decoder(
1435
                response_handler, expect_version_marker=True)
3245.4.26 by Andrew Bennetts
Rename 'setProtoAndMedium' to more accurate 'setProtoAndMediumRequest', add ABCs for Requesters and ResponseHandlers.
1436
            response_handler.setProtoAndMediumRequest(
1437
                response_protocol, request)
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1438
            return requester, response_handler, output
1439
1440
    def make_client_protocol(self, input_bytes=None):
1441
        result = self.make_client_protocol_and_output(input_bytes=input_bytes)
1442
        requester, response_handler, output = result
1443
        return requester, response_handler
1910.19.22 by Robert Collins
Rearrange the readv patch to put the serialise offsets method into the correct class, and document the structure of the classes somewhat better to hint to people writing patches where code should go. Also alter the test so that the client and server components are tested in one place preventing possible encoding skew from occuring.
1444
3245.1.11 by Andrew Bennetts
Add make_server_protocol helper to TestSmartProtocol.
1445
    def make_server_protocol(self):
1446
        out_stream = StringIO()
3245.4.34 by Andrew Bennetts
Remove another insignificant change vs. bzr.dev.
1447
        smart_protocol = self.server_protocol_class(None, out_stream.write)
3245.1.11 by Andrew Bennetts
Add make_server_protocol helper to TestSmartProtocol.
1448
        return smart_protocol, out_stream
1449
1910.19.22 by Robert Collins
Rearrange the readv patch to put the serialise offsets method into the correct class, and document the structure of the classes somewhat better to hint to people writing patches where code should go. Also alter the test so that the client and server components are tested in one place preventing possible encoding skew from occuring.
1450
    def setUp(self):
2432.2.5 by Andrew Bennetts
Reduce duplication in test_smart_transport.
1451
        super(TestSmartProtocol, self).setUp()
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1452
        self.response_marker = getattr(
1453
            self.client_protocol_class, 'response_marker', None)
1454
        self.request_marker = getattr(
1455
            self.client_protocol_class, 'request_marker', None)
1910.19.22 by Robert Collins
Rearrange the readv patch to put the serialise offsets method into the correct class, and document the structure of the classes somewhat better to hint to people writing patches where code should go. Also alter the test so that the client and server components are tested in one place preventing possible encoding skew from occuring.
1456
1457
    def assertOffsetSerialisation(self, expected_offsets, expected_serialised,
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1458
        requester):
1910.19.22 by Robert Collins
Rearrange the readv patch to put the serialise offsets method into the correct class, and document the structure of the classes somewhat better to hint to people writing patches where code should go. Also alter the test so that the client and server components are tested in one place preventing possible encoding skew from occuring.
1459
        """Check that smart (de)serialises offsets as expected.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1460
1910.19.22 by Robert Collins
Rearrange the readv patch to put the serialise offsets method into the correct class, and document the structure of the classes somewhat better to hint to people writing patches where code should go. Also alter the test so that the client and server components are tested in one place preventing possible encoding skew from occuring.
1461
        We check both serialisation and deserialisation at the same time
1462
        to ensure that the round tripping cannot skew: both directions should
1463
        be as expected.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1464
1910.19.22 by Robert Collins
Rearrange the readv patch to put the serialise offsets method into the correct class, and document the structure of the classes somewhat better to hint to people writing patches where code should go. Also alter the test so that the client and server components are tested in one place preventing possible encoding skew from occuring.
1465
        :param expected_offsets: a readv offset list.
1466
        :param expected_seralised: an expected serial form of the offsets.
1467
        """
2018.5.4 by Andrew Bennetts
Split smart server VFS logic out into a new file, and start using the command pattern in the SmartServerRequestHandler.
1468
        # XXX: '_deserialise_offsets' should be a method of the
1469
        # SmartServerRequestProtocol in future.
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1470
        readv_cmd = vfs.ReadvRequest(None, '/')
2018.5.4 by Andrew Bennetts
Split smart server VFS logic out into a new file, and start using the command pattern in the SmartServerRequestHandler.
1471
        offsets = readv_cmd._deserialise_offsets(expected_serialised)
1910.19.22 by Robert Collins
Rearrange the readv patch to put the serialise offsets method into the correct class, and document the structure of the classes somewhat better to hint to people writing patches where code should go. Also alter the test so that the client and server components are tested in one place preventing possible encoding skew from occuring.
1472
        self.assertEqual(expected_offsets, offsets)
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1473
        serialised = requester._serialise_offsets(offsets)
1910.19.22 by Robert Collins
Rearrange the readv patch to put the serialise offsets method into the correct class, and document the structure of the classes somewhat better to hint to people writing patches where code should go. Also alter the test so that the client and server components are tested in one place preventing possible encoding skew from occuring.
1474
        self.assertEqual(expected_serialised, serialised)
1475
2018.2.10 by Andrew Bennetts
Tidy up TODOs, further testing and fixes for SmartServerRequestProtocolOne, and remove a read_bytes(1) call.
1476
    def build_protocol_waiting_for_body(self):
3245.1.11 by Andrew Bennetts
Add make_server_protocol helper to TestSmartProtocol.
1477
        smart_protocol, out_stream = self.make_server_protocol()
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
1478
        smart_protocol._has_dispatched = True
3245.1.14 by Andrew Bennetts
Merge from bzr.dev
1479
        smart_protocol.request = _mod_request.SmartServerRequestHandler(
1480
            None, _mod_request.request_handlers, '/')
3923.5.2 by Andrew Bennetts
Completely delegate handling of request body chunks to the command object. The default implementation accumulates, like the existing behaviour.
1481
        class FakeCommand(_mod_request.SmartServerRequest):
1482
            def do_body(self_cmd, body_bytes):
2018.5.7 by Andrew Bennetts
Simplify dispatch_command.
1483
                self.end_received = True
1484
                self.assertEqual('abcdefg', body_bytes)
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1485
                return _mod_request.SuccessfulSmartServerResponse(('ok', ))
3923.5.2 by Andrew Bennetts
Completely delegate handling of request body chunks to the command object. The default implementation accumulates, like the existing behaviour.
1486
        smart_protocol.request._command = FakeCommand(None)
2400.1.4 by Andrew Bennetts
Tidy up accidental changes.
1487
        # Call accept_bytes to make sure that internal state like _body_decoder
1488
        # is initialised.  This test should probably be given a clearer
1489
        # interface to work with that will not cause this inconsistency.
1490
        #   -- Andrew Bennetts, 2006-09-28
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1491
        smart_protocol.accept_bytes('')
1492
        return smart_protocol
2018.2.10 by Andrew Bennetts
Tidy up TODOs, further testing and fixes for SmartServerRequestProtocolOne, and remove a read_bytes(1) call.
1493
2432.2.5 by Andrew Bennetts
Reduce duplication in test_smart_transport.
1494
    def assertServerToClientEncoding(self, expected_bytes, expected_tuple,
1495
            input_tuples):
1496
        """Assert that each input_tuple serialises as expected_bytes, and the
1497
        bytes deserialise as expected_tuple.
1498
        """
1499
        # check the encoding of the server for all input_tuples matches
1500
        # expected bytes
1501
        for input_tuple in input_tuples:
3245.1.11 by Andrew Bennetts
Add make_server_protocol helper to TestSmartProtocol.
1502
            server_protocol, server_output = self.make_server_protocol()
2432.4.4 by Robert Collins
Merge hpss-protocol2.
1503
            server_protocol._send_response(
1504
                _mod_request.SuccessfulSmartServerResponse(input_tuple))
2432.2.5 by Andrew Bennetts
Reduce duplication in test_smart_transport.
1505
            self.assertEqual(expected_bytes, server_output.getvalue())
1506
        # check the decoding of the client smart_protocol from expected_bytes:
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1507
        requester, response_handler = self.make_client_protocol(expected_bytes)
1508
        requester.call('foo')
1509
        self.assertEqual(expected_tuple, response_handler.read_response_tuple())
2432.2.5 by Andrew Bennetts
Reduce duplication in test_smart_transport.
1510
1511
2621.3.1 by Andrew Bennetts
Log errors from the smart server in the trace file, to make debugging test failures (and live failures!) easier.
1512
class CommonSmartProtocolTestMixin(object):
1513
3195.2.1 by Andrew Bennetts
Improve test coverage, and fix a bug revealed by the improved coverage.
1514
    def test_connection_closed_reporting(self):
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1515
        requester, response_handler = self.make_client_protocol()
1516
        requester.call('hello')
3245.1.10 by Andrew Bennetts
Remove trailing whitespace.
1517
        ex = self.assertRaises(errors.ConnectionReset,
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1518
            response_handler.read_response_tuple)
3195.2.1 by Andrew Bennetts
Improve test coverage, and fix a bug revealed by the improved coverage.
1519
        self.assertEqual("Connection closed: "
4509.2.3 by Martin Pool
Test tweaks for ConnectionReset message change
1520
            "Unexpected end of message. Please check connectivity "
1521
            "and permissions, and report a bug if problems persist. ",
4070.8.1 by Martin Pool
Remove 'try -Dhpss' from error messages
1522
            str(ex))
3195.2.1 by Andrew Bennetts
Improve test coverage, and fix a bug revealed by the improved coverage.
1523
3245.1.8 by Andrew Bennetts
Remove TestSmartProtocol.setUp entirely.
1524
    def test_server_offset_serialisation(self):
1525
        """The Smart protocol serialises offsets as a comma and \n string.
1526
1527
        We check a number of boundary cases are as expected: empty, one offset,
1528
        one with the order of reads not increasing (an out of order read), and
1529
        one that should coalesce.
1530
        """
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1531
        requester, response_handler = self.make_client_protocol()
1532
        self.assertOffsetSerialisation([], '', requester)
1533
        self.assertOffsetSerialisation([(1,2)], '1,2', requester)
3245.1.8 by Andrew Bennetts
Remove TestSmartProtocol.setUp entirely.
1534
        self.assertOffsetSerialisation([(10,40), (0,5)], '10,40\n0,5',
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1535
            requester)
3245.1.8 by Andrew Bennetts
Remove TestSmartProtocol.setUp entirely.
1536
        self.assertOffsetSerialisation([(1,2), (3,4), (100, 200)],
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1537
            '1,2\n3,4\n100,200', requester)
3245.1.8 by Andrew Bennetts
Remove TestSmartProtocol.setUp entirely.
1538
2621.3.1 by Andrew Bennetts
Log errors from the smart server in the trace file, to make debugging test failures (and live failures!) easier.
1539
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1540
class TestVersionOneFeaturesInProtocolOne(
1541
    TestSmartProtocol, CommonSmartProtocolTestMixin):
1542
    """Tests for version one smart protocol features as implemeted by version
1543
    one."""
2432.2.5 by Andrew Bennetts
Reduce duplication in test_smart_transport.
1544
1545
    client_protocol_class = protocol.SmartClientRequestProtocolOne
1546
    server_protocol_class = protocol.SmartServerRequestProtocolOne
1547
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
1548
    def test_construct_version_one_server_protocol(self):
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1549
        smart_protocol = protocol.SmartServerRequestProtocolOne(None, None)
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
1550
        self.assertEqual('', smart_protocol.unused_data)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1551
        self.assertEqual('', smart_protocol.in_buffer)
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
1552
        self.assertFalse(smart_protocol._has_dispatched)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1553
        self.assertEqual(1, smart_protocol.next_read_size())
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
1554
1555
    def test_construct_version_one_client_protocol(self):
1556
        # we can construct a client protocol from a client medium request
1557
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
1558
        client_medium = medium.SmartSimplePipesClientMedium(
1559
            None, output, 'base')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1560
        request = client_medium.get_request()
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1561
        client_protocol = protocol.SmartClientRequestProtocolOne(request)
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1562
2018.3.2 by Andrew Bennetts
Ensure that a request's next_read_size() is 0 once an error response is sent.
1563
    def test_accept_bytes_of_bad_request_to_protocol(self):
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1564
        out_stream = StringIO()
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1565
        smart_protocol = protocol.SmartServerRequestProtocolOne(
1566
            None, out_stream.write)
1567
        smart_protocol.accept_bytes('abc')
1568
        self.assertEqual('abc', smart_protocol.in_buffer)
1569
        smart_protocol.accept_bytes('\n')
1570
        self.assertEqual(
1571
            "error\x01Generic bzr smart protocol error: bad request 'abc'\n",
1572
            out_stream.getvalue())
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
1573
        self.assertTrue(smart_protocol._has_dispatched)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1574
        self.assertEqual(0, smart_protocol.next_read_size())
2018.2.26 by Andrew Bennetts
Changes prompted by j-a-meinel's review.
1575
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1576
    def test_accept_body_bytes_to_protocol(self):
2018.2.10 by Andrew Bennetts
Tidy up TODOs, further testing and fixes for SmartServerRequestProtocolOne, and remove a read_bytes(1) call.
1577
        protocol = self.build_protocol_waiting_for_body()
2018.2.15 by Andrew Bennetts
Remove SmartServerRequestProtocolOne.finished_reading attribute, replace with next_read_size method.
1578
        self.assertEqual(6, protocol.next_read_size())
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1579
        protocol.accept_bytes('7\nabc')
2018.2.15 by Andrew Bennetts
Remove SmartServerRequestProtocolOne.finished_reading attribute, replace with next_read_size method.
1580
        self.assertEqual(9, protocol.next_read_size())
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1581
        protocol.accept_bytes('defgd')
1582
        protocol.accept_bytes('one\n')
2018.2.15 by Andrew Bennetts
Remove SmartServerRequestProtocolOne.finished_reading attribute, replace with next_read_size method.
1583
        self.assertEqual(0, protocol.next_read_size())
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1584
        self.assertTrue(self.end_received)
1585
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
1586
    def test_accept_request_and_body_all_at_once(self):
2402.1.2 by Andrew Bennetts
Deal with review comments.
1587
        self._captureVar('BZR_NO_SMART_VFS', None)
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
1588
        mem_transport = memory.MemoryTransport()
1589
        mem_transport.put_bytes('foo', 'abcdefghij')
1590
        out_stream = StringIO()
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1591
        smart_protocol = protocol.SmartServerRequestProtocolOne(mem_transport,
2018.2.23 by Andrew Bennetts
Clean up SmartServerStreamMedium implementations, including removing unnecessary flushes.
1592
                out_stream.write)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1593
        smart_protocol.accept_bytes('readv\x01foo\n3\n3,3done\n')
1594
        self.assertEqual(0, smart_protocol.next_read_size())
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
1595
        self.assertEqual('readv\n3\ndefdone\n', out_stream.getvalue())
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
1596
        self.assertEqual('', smart_protocol.unused_data)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1597
        self.assertEqual('', smart_protocol.in_buffer)
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
1598
2018.2.10 by Andrew Bennetts
Tidy up TODOs, further testing and fixes for SmartServerRequestProtocolOne, and remove a read_bytes(1) call.
1599
    def test_accept_excess_bytes_are_preserved(self):
1600
        out_stream = StringIO()
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1601
        smart_protocol = protocol.SmartServerRequestProtocolOne(
1602
            None, out_stream.write)
1603
        smart_protocol.accept_bytes('hello\nhello\n')
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
1604
        self.assertEqual("ok\x012\n", out_stream.getvalue())
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
1605
        self.assertEqual("hello\n", smart_protocol.unused_data)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1606
        self.assertEqual("", smart_protocol.in_buffer)
2018.2.10 by Andrew Bennetts
Tidy up TODOs, further testing and fixes for SmartServerRequestProtocolOne, and remove a read_bytes(1) call.
1607
1608
    def test_accept_excess_bytes_after_body(self):
1609
        protocol = self.build_protocol_waiting_for_body()
1610
        protocol.accept_bytes('7\nabcdefgdone\nX')
1611
        self.assertTrue(self.end_received)
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
1612
        self.assertEqual("X", protocol.unused_data)
2018.2.10 by Andrew Bennetts
Tidy up TODOs, further testing and fixes for SmartServerRequestProtocolOne, and remove a read_bytes(1) call.
1613
        self.assertEqual("", protocol.in_buffer)
1614
        protocol.accept_bytes('Y')
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
1615
        self.assertEqual("XY", protocol.unused_data)
2018.2.10 by Andrew Bennetts
Tidy up TODOs, further testing and fixes for SmartServerRequestProtocolOne, and remove a read_bytes(1) call.
1616
        self.assertEqual("", protocol.in_buffer)
1617
1618
    def test_accept_excess_bytes_after_dispatch(self):
1619
        out_stream = StringIO()
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1620
        smart_protocol = protocol.SmartServerRequestProtocolOne(
1621
            None, out_stream.write)
1622
        smart_protocol.accept_bytes('hello\n')
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
1623
        self.assertEqual("ok\x012\n", out_stream.getvalue())
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1624
        smart_protocol.accept_bytes('hel')
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
1625
        self.assertEqual("hel", smart_protocol.unused_data)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1626
        smart_protocol.accept_bytes('lo\n')
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
1627
        self.assertEqual("hello\n", smart_protocol.unused_data)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1628
        self.assertEqual("", smart_protocol.in_buffer)
2018.2.10 by Andrew Bennetts
Tidy up TODOs, further testing and fixes for SmartServerRequestProtocolOne, and remove a read_bytes(1) call.
1629
2018.3.2 by Andrew Bennetts
Ensure that a request's next_read_size() is 0 once an error response is sent.
1630
    def test__send_response_sets_finished_reading(self):
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1631
        smart_protocol = protocol.SmartServerRequestProtocolOne(
1632
            None, lambda x: None)
1633
        self.assertEqual(1, smart_protocol.next_read_size())
2432.4.3 by Robert Collins
Refactor the HPSS Response code to take SmartServerResponse rather than args and body.
1634
        smart_protocol._send_response(
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1635
            _mod_request.SuccessfulSmartServerResponse(('x',)))
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1636
        self.assertEqual(0, smart_protocol.next_read_size())
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1637
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
1638
    def test__send_response_errors_with_base_response(self):
1639
        """Ensure that only the Successful/Failed subclasses are used."""
1640
        smart_protocol = protocol.SmartServerRequestProtocolOne(
1641
            None, lambda x: None)
1642
        self.assertRaises(AttributeError, smart_protocol._send_response,
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1643
            _mod_request.SmartServerResponse(('x',)))
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
1644
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
1645
    def test_query_version(self):
1646
        """query_version on a SmartClientProtocolOne should return a number.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1647
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
1648
        The protocol provides the query_version because the domain level clients
1649
        may all need to be able to probe for capabilities.
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
1650
        """
1651
        # What we really want to test here is that SmartClientProtocolOne calls
1652
        # accept_bytes(tuple_based_encoding_of_hello) and reads and parses the
4031.3.1 by Frank Aspell
Fixing various typos
1653
        # response of tuple-encoded (ok, 1).  Also, separately we should test
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
1654
        # the error if the response is a non-understood version.
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
1655
        input = StringIO('ok\x012\n')
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
1656
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
1657
        client_medium = medium.SmartSimplePipesClientMedium(
1658
            input, output, 'base')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1659
        request = client_medium.get_request()
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1660
        smart_protocol = protocol.SmartClientRequestProtocolOne(request)
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
1661
        self.assertEqual(2, smart_protocol.query_version())
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
1662
1663
    def test_client_call_empty_response(self):
1664
        # protocol.call() can get back an empty tuple as a response. This occurs
1665
        # when the parsed line is an empty line, and results in a tuple with
1666
        # one element - an empty string.
1667
        self.assertServerToClientEncoding('\n', ('', ), [(), ('', )])
1668
1669
    def test_client_call_three_element_response(self):
1670
        # protocol.call() can get back tuples of other lengths. A three element
1671
        # tuple should be unpacked as three strings.
1672
        self.assertServerToClientEncoding('a\x01b\x0134\n', ('a', 'b', '34'),
1673
            [('a', 'b', '34')])
1674
1675
    def test_client_call_with_body_bytes_uploads(self):
2018.5.131 by Andrew Bennetts
Be strict about unicode passed to transport.put_{bytes,file} and SmartClient.call_with_body_bytes, fixing part of TestLockableFiles_RemoteLockDir.test_read_write.
1676
        # protocol.call_with_body_bytes should length-prefix the bytes onto the
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
1677
        # wire.
1678
        expected_bytes = "foo\n7\nabcdefgdone\n"
1679
        input = StringIO("\n")
1680
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
1681
        client_medium = medium.SmartSimplePipesClientMedium(
1682
            input, output, 'base')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1683
        request = client_medium.get_request()
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1684
        smart_protocol = protocol.SmartClientRequestProtocolOne(request)
1685
        smart_protocol.call_with_body_bytes(('foo', ), "abcdefg")
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
1686
        self.assertEqual(expected_bytes, output.getvalue())
1687
1688
    def test_client_call_with_body_readv_array(self):
1689
        # protocol.call_with_upload should encode the readv array and then
1690
        # length-prefix the bytes onto the wire.
1691
        expected_bytes = "foo\n7\n1,2\n5,6done\n"
1692
        input = StringIO("\n")
1693
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
1694
        client_medium = medium.SmartSimplePipesClientMedium(
1695
            input, output, 'base')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1696
        request = client_medium.get_request()
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1697
        smart_protocol = protocol.SmartClientRequestProtocolOne(request)
1698
        smart_protocol.call_with_body_readv_array(('foo', ), [(1,2),(5,6)])
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
1699
        self.assertEqual(expected_bytes, output.getvalue())
1700
3297.3.3 by Andrew Bennetts
SmartClientRequestProtocol*.read_response_tuple can now raise UnknownSmartMethod. Callers no longer need to do their own ad hoc unknown smart method error detection.
1701
    def _test_client_read_response_tuple_raises_UnknownSmartMethod(self,
1702
            server_bytes):
3297.3.1 by Andrew Bennetts
Raise UnknownSmartMethod automatically from read_response_tuple.
1703
        input = StringIO(server_bytes)
1704
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
1705
        client_medium = medium.SmartSimplePipesClientMedium(
1706
            input, output, 'base')
3297.3.1 by Andrew Bennetts
Raise UnknownSmartMethod automatically from read_response_tuple.
1707
        request = client_medium.get_request()
1708
        smart_protocol = protocol.SmartClientRequestProtocolOne(request)
1709
        smart_protocol.call('foo')
1710
        self.assertRaises(
1711
            errors.UnknownSmartMethod, smart_protocol.read_response_tuple)
1712
        # The request has been finished.  There is no body to read, and
1713
        # attempts to read one will fail.
1714
        self.assertRaises(
1715
            errors.ReadingCompleted, smart_protocol.read_body_bytes)
1716
3297.3.3 by Andrew Bennetts
SmartClientRequestProtocol*.read_response_tuple can now raise UnknownSmartMethod. Callers no longer need to do their own ad hoc unknown smart method error detection.
1717
    def test_client_read_response_tuple_raises_UnknownSmartMethod(self):
1718
        """read_response_tuple raises UnknownSmartMethod if the response says
1719
        the server did not recognise the request.
1720
        """
1721
        server_bytes = (
1722
            "error\x01Generic bzr smart protocol error: bad request 'foo'\n")
1723
        self._test_client_read_response_tuple_raises_UnknownSmartMethod(
1724
            server_bytes)
1725
1726
    def test_client_read_response_tuple_raises_UnknownSmartMethod_0_11(self):
1727
        """read_response_tuple also raises UnknownSmartMethod if the response
1728
        from a bzr 0.11 says the server did not recognise the request.
1729
1730
        (bzr 0.11 sends a slightly different error message to later versions.)
1731
        """
1732
        server_bytes = (
1733
            "error\x01Generic bzr smart protocol error: bad request u'foo'\n")
1734
        self._test_client_read_response_tuple_raises_UnknownSmartMethod(
1735
            server_bytes)
1736
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
1737
    def test_client_read_body_bytes_all(self):
1738
        # read_body_bytes should decode the body bytes from the wire into
1739
        # a response.
1740
        expected_bytes = "1234567"
1741
        server_bytes = "ok\n7\n1234567done\n"
1742
        input = StringIO(server_bytes)
1743
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
1744
        client_medium = medium.SmartSimplePipesClientMedium(
1745
            input, output, 'base')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1746
        request = client_medium.get_request()
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1747
        smart_protocol = protocol.SmartClientRequestProtocolOne(request)
1748
        smart_protocol.call('foo')
1749
        smart_protocol.read_response_tuple(True)
1750
        self.assertEqual(expected_bytes, smart_protocol.read_body_bytes())
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
1751
1752
    def test_client_read_body_bytes_incremental(self):
1753
        # test reading a few bytes at a time from the body
1754
        # XXX: possibly we should test dribbling the bytes into the stringio
2018.2.15 by Andrew Bennetts
Remove SmartServerRequestProtocolOne.finished_reading attribute, replace with next_read_size method.
1755
        # to make the state machine work harder: however, as we use the
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
1756
        # LengthPrefixedBodyDecoder that is already well tested - we can skip
1757
        # that.
1758
        expected_bytes = "1234567"
1759
        server_bytes = "ok\n7\n1234567done\n"
1760
        input = StringIO(server_bytes)
1761
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
1762
        client_medium = medium.SmartSimplePipesClientMedium(
1763
            input, output, 'base')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1764
        request = client_medium.get_request()
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1765
        smart_protocol = protocol.SmartClientRequestProtocolOne(request)
1766
        smart_protocol.call('foo')
1767
        smart_protocol.read_response_tuple(True)
1768
        self.assertEqual(expected_bytes[0:2], smart_protocol.read_body_bytes(2))
1769
        self.assertEqual(expected_bytes[2:4], smart_protocol.read_body_bytes(2))
1770
        self.assertEqual(expected_bytes[4:6], smart_protocol.read_body_bytes(2))
1771
        self.assertEqual(expected_bytes[6], smart_protocol.read_body_bytes())
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
1772
1773
    def test_client_cancel_read_body_does_not_eat_body_bytes(self):
1774
        # cancelling the expected body needs to finish the request, but not
1775
        # read any more bytes.
1776
        expected_bytes = "1234567"
1777
        server_bytes = "ok\n7\n1234567done\n"
1778
        input = StringIO(server_bytes)
1779
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
1780
        client_medium = medium.SmartSimplePipesClientMedium(
1781
            input, output, 'base')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1782
        request = client_medium.get_request()
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1783
        smart_protocol = protocol.SmartClientRequestProtocolOne(request)
1784
        smart_protocol.call('foo')
1785
        smart_protocol.read_response_tuple(True)
1786
        smart_protocol.cancel_read_body()
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
1787
        self.assertEqual(3, input.tell())
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1788
        self.assertRaises(
1789
            errors.ReadingCompleted, smart_protocol.read_body_bytes)
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1790
3464.4.1 by Andrew Bennetts
Fix infinite busy-loop caused by connection loss during read of response body in HPSS v1 and v2.
1791
    def test_client_read_body_bytes_interrupted_connection(self):
1792
        server_bytes = "ok\n999\nincomplete body"
1793
        input = StringIO(server_bytes)
1794
        output = StringIO()
1795
        client_medium = medium.SmartSimplePipesClientMedium(
1796
            input, output, 'base')
1797
        request = client_medium.get_request()
1798
        smart_protocol = self.client_protocol_class(request)
1799
        smart_protocol.call('foo')
1800
        smart_protocol.read_response_tuple(True)
1801
        self.assertRaises(
1802
            errors.ConnectionReset, smart_protocol.read_body_bytes)
1803
2018.2.15 by Andrew Bennetts
Remove SmartServerRequestProtocolOne.finished_reading attribute, replace with next_read_size method.
1804
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1805
class TestVersionOneFeaturesInProtocolTwo(
1806
    TestSmartProtocol, CommonSmartProtocolTestMixin):
1807
    """Tests for version one smart protocol features as implemeted by version
1808
    two.
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
1809
    """
1810
2432.2.5 by Andrew Bennetts
Reduce duplication in test_smart_transport.
1811
    client_protocol_class = protocol.SmartClientRequestProtocolTwo
1812
    server_protocol_class = protocol.SmartServerRequestProtocolTwo
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
1813
1814
    def test_construct_version_two_server_protocol(self):
1815
        smart_protocol = protocol.SmartServerRequestProtocolTwo(None, None)
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
1816
        self.assertEqual('', smart_protocol.unused_data)
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
1817
        self.assertEqual('', smart_protocol.in_buffer)
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
1818
        self.assertFalse(smart_protocol._has_dispatched)
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
1819
        self.assertEqual(1, smart_protocol.next_read_size())
1820
1821
    def test_construct_version_two_client_protocol(self):
1822
        # we can construct a client protocol from a client medium request
1823
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
1824
        client_medium = medium.SmartSimplePipesClientMedium(
1825
            None, output, 'base')
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
1826
        request = client_medium.get_request()
1827
        client_protocol = protocol.SmartClientRequestProtocolTwo(request)
1828
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1829
    def test_accept_bytes_of_bad_request_to_protocol(self):
1830
        out_stream = StringIO()
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1831
        smart_protocol = self.server_protocol_class(None, out_stream.write)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1832
        smart_protocol.accept_bytes('abc')
1833
        self.assertEqual('abc', smart_protocol.in_buffer)
1834
        smart_protocol.accept_bytes('\n')
1835
        self.assertEqual(
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1836
            self.response_marker +
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1837
            "failed\nerror\x01Generic bzr smart protocol error: bad request 'abc'\n",
1838
            out_stream.getvalue())
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
1839
        self.assertTrue(smart_protocol._has_dispatched)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1840
        self.assertEqual(0, smart_protocol.next_read_size())
1841
1842
    def test_accept_body_bytes_to_protocol(self):
1843
        protocol = self.build_protocol_waiting_for_body()
1844
        self.assertEqual(6, protocol.next_read_size())
1845
        protocol.accept_bytes('7\nabc')
1846
        self.assertEqual(9, protocol.next_read_size())
1847
        protocol.accept_bytes('defgd')
1848
        protocol.accept_bytes('one\n')
1849
        self.assertEqual(0, protocol.next_read_size())
1850
        self.assertTrue(self.end_received)
1851
1852
    def test_accept_request_and_body_all_at_once(self):
1853
        self._captureVar('BZR_NO_SMART_VFS', None)
1854
        mem_transport = memory.MemoryTransport()
1855
        mem_transport.put_bytes('foo', 'abcdefghij')
1856
        out_stream = StringIO()
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1857
        smart_protocol = self.server_protocol_class(
1858
            mem_transport, out_stream.write)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1859
        smart_protocol.accept_bytes('readv\x01foo\n3\n3,3done\n')
1860
        self.assertEqual(0, smart_protocol.next_read_size())
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1861
        self.assertEqual(self.response_marker +
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1862
                         'success\nreadv\n3\ndefdone\n',
1863
                         out_stream.getvalue())
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
1864
        self.assertEqual('', smart_protocol.unused_data)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1865
        self.assertEqual('', smart_protocol.in_buffer)
1866
1867
    def test_accept_excess_bytes_are_preserved(self):
1868
        out_stream = StringIO()
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1869
        smart_protocol = self.server_protocol_class(None, out_stream.write)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1870
        smart_protocol.accept_bytes('hello\nhello\n')
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
1871
        self.assertEqual(self.response_marker + "success\nok\x012\n",
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1872
                         out_stream.getvalue())
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
1873
        self.assertEqual("hello\n", smart_protocol.unused_data)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1874
        self.assertEqual("", smart_protocol.in_buffer)
1875
1876
    def test_accept_excess_bytes_after_body(self):
1877
        # The excess bytes look like the start of another request.
1878
        server_protocol = self.build_protocol_waiting_for_body()
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1879
        server_protocol.accept_bytes('7\nabcdefgdone\n' + self.response_marker)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1880
        self.assertTrue(self.end_received)
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1881
        self.assertEqual(self.response_marker,
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
1882
                         server_protocol.unused_data)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1883
        self.assertEqual("", server_protocol.in_buffer)
1884
        server_protocol.accept_bytes('Y')
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1885
        self.assertEqual(self.response_marker + "Y",
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
1886
                         server_protocol.unused_data)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1887
        self.assertEqual("", server_protocol.in_buffer)
1888
1889
    def test_accept_excess_bytes_after_dispatch(self):
1890
        out_stream = StringIO()
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1891
        smart_protocol = self.server_protocol_class(None, out_stream.write)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1892
        smart_protocol.accept_bytes('hello\n')
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
1893
        self.assertEqual(self.response_marker + "success\nok\x012\n",
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1894
                         out_stream.getvalue())
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1895
        smart_protocol.accept_bytes(self.request_marker + 'hel')
1896
        self.assertEqual(self.request_marker + "hel",
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
1897
                         smart_protocol.unused_data)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1898
        smart_protocol.accept_bytes('lo\n')
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1899
        self.assertEqual(self.request_marker + "hello\n",
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
1900
                         smart_protocol.unused_data)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1901
        self.assertEqual("", smart_protocol.in_buffer)
1902
1903
    def test__send_response_sets_finished_reading(self):
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1904
        smart_protocol = self.server_protocol_class(None, lambda x: None)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1905
        self.assertEqual(1, smart_protocol.next_read_size())
1906
        smart_protocol._send_response(
3245.4.14 by Andrew Bennetts
Merge from bzr.dev (via loom thread).
1907
            _mod_request.SuccessfulSmartServerResponse(('x',)))
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1908
        self.assertEqual(0, smart_protocol.next_read_size())
1909
1910
    def test__send_response_errors_with_base_response(self):
1911
        """Ensure that only the Successful/Failed subclasses are used."""
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1912
        smart_protocol = self.server_protocol_class(None, lambda x: None)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1913
        self.assertRaises(AttributeError, smart_protocol._send_response,
3245.4.14 by Andrew Bennetts
Merge from bzr.dev (via loom thread).
1914
            _mod_request.SmartServerResponse(('x',)))
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1915
1916
    def test_query_version(self):
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
1917
        """query_version on a SmartClientProtocolTwo should return a number.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1918
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1919
        The protocol provides the query_version because the domain level clients
1920
        may all need to be able to probe for capabilities.
1921
        """
1922
        # What we really want to test here is that SmartClientProtocolTwo calls
1923
        # accept_bytes(tuple_based_encoding_of_hello) and reads and parses the
4031.3.1 by Frank Aspell
Fixing various typos
1924
        # response of tuple-encoded (ok, 1).  Also, separately we should test
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1925
        # the error if the response is a non-understood version.
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
1926
        input = StringIO(self.response_marker + 'success\nok\x012\n')
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1927
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
1928
        client_medium = medium.SmartSimplePipesClientMedium(
1929
            input, output, 'base')
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1930
        request = client_medium.get_request()
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1931
        smart_protocol = self.client_protocol_class(request)
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
1932
        self.assertEqual(2, smart_protocol.query_version())
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1933
1934
    def test_client_call_empty_response(self):
1935
        # protocol.call() can get back an empty tuple as a response. This occurs
1936
        # when the parsed line is an empty line, and results in a tuple with
1937
        # one element - an empty string.
1938
        self.assertServerToClientEncoding(
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1939
            self.response_marker + 'success\n\n', ('', ), [(), ('', )])
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1940
1941
    def test_client_call_three_element_response(self):
1942
        # protocol.call() can get back tuples of other lengths. A three element
1943
        # tuple should be unpacked as three strings.
1944
        self.assertServerToClientEncoding(
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1945
            self.response_marker + 'success\na\x01b\x0134\n',
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1946
            ('a', 'b', '34'),
1947
            [('a', 'b', '34')])
1948
1949
    def test_client_call_with_body_bytes_uploads(self):
1950
        # protocol.call_with_body_bytes should length-prefix the bytes onto the
1951
        # wire.
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1952
        expected_bytes = self.request_marker + "foo\n7\nabcdefgdone\n"
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1953
        input = StringIO("\n")
1954
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
1955
        client_medium = medium.SmartSimplePipesClientMedium(
1956
            input, output, 'base')
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1957
        request = client_medium.get_request()
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1958
        smart_protocol = self.client_protocol_class(request)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1959
        smart_protocol.call_with_body_bytes(('foo', ), "abcdefg")
1960
        self.assertEqual(expected_bytes, output.getvalue())
1961
1962
    def test_client_call_with_body_readv_array(self):
1963
        # protocol.call_with_upload should encode the readv array and then
1964
        # length-prefix the bytes onto the wire.
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1965
        expected_bytes = self.request_marker + "foo\n7\n1,2\n5,6done\n"
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1966
        input = StringIO("\n")
1967
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
1968
        client_medium = medium.SmartSimplePipesClientMedium(
1969
            input, output, 'base')
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1970
        request = client_medium.get_request()
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1971
        smart_protocol = self.client_protocol_class(request)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1972
        smart_protocol.call_with_body_readv_array(('foo', ), [(1,2),(5,6)])
1973
        self.assertEqual(expected_bytes, output.getvalue())
1974
1975
    def test_client_read_body_bytes_all(self):
1976
        # read_body_bytes should decode the body bytes from the wire into
1977
        # a response.
1978
        expected_bytes = "1234567"
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1979
        server_bytes = (self.response_marker +
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1980
                        "success\nok\n7\n1234567done\n")
1981
        input = StringIO(server_bytes)
1982
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
1983
        client_medium = medium.SmartSimplePipesClientMedium(
1984
            input, output, 'base')
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1985
        request = client_medium.get_request()
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1986
        smart_protocol = self.client_protocol_class(request)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1987
        smart_protocol.call('foo')
1988
        smart_protocol.read_response_tuple(True)
1989
        self.assertEqual(expected_bytes, smart_protocol.read_body_bytes())
1990
1991
    def test_client_read_body_bytes_incremental(self):
1992
        # test reading a few bytes at a time from the body
1993
        # XXX: possibly we should test dribbling the bytes into the stringio
1994
        # to make the state machine work harder: however, as we use the
1995
        # LengthPrefixedBodyDecoder that is already well tested - we can skip
1996
        # that.
1997
        expected_bytes = "1234567"
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1998
        server_bytes = self.response_marker + "success\nok\n7\n1234567done\n"
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1999
        input = StringIO(server_bytes)
2000
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
2001
        client_medium = medium.SmartSimplePipesClientMedium(
2002
            input, output, 'base')
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
2003
        request = client_medium.get_request()
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
2004
        smart_protocol = self.client_protocol_class(request)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
2005
        smart_protocol.call('foo')
2006
        smart_protocol.read_response_tuple(True)
2007
        self.assertEqual(expected_bytes[0:2], smart_protocol.read_body_bytes(2))
2008
        self.assertEqual(expected_bytes[2:4], smart_protocol.read_body_bytes(2))
2009
        self.assertEqual(expected_bytes[4:6], smart_protocol.read_body_bytes(2))
2010
        self.assertEqual(expected_bytes[6], smart_protocol.read_body_bytes())
2011
2012
    def test_client_cancel_read_body_does_not_eat_body_bytes(self):
2013
        # cancelling the expected body needs to finish the request, but not
2014
        # read any more bytes.
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
2015
        server_bytes = self.response_marker + "success\nok\n7\n1234567done\n"
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
2016
        input = StringIO(server_bytes)
2017
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
2018
        client_medium = medium.SmartSimplePipesClientMedium(
2019
            input, output, 'base')
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
2020
        request = client_medium.get_request()
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
2021
        smart_protocol = self.client_protocol_class(request)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
2022
        smart_protocol.call('foo')
2023
        smart_protocol.read_response_tuple(True)
2024
        smart_protocol.cancel_read_body()
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
2025
        self.assertEqual(len(self.response_marker + 'success\nok\n'),
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
2026
                         input.tell())
2027
        self.assertRaises(
2028
            errors.ReadingCompleted, smart_protocol.read_body_bytes)
2029
3464.4.1 by Andrew Bennetts
Fix infinite busy-loop caused by connection loss during read of response body in HPSS v1 and v2.
2030
    def test_client_read_body_bytes_interrupted_connection(self):
2031
        server_bytes = (self.response_marker +
2032
                        "success\nok\n999\nincomplete body")
2033
        input = StringIO(server_bytes)
2034
        output = StringIO()
2035
        client_medium = medium.SmartSimplePipesClientMedium(
2036
            input, output, 'base')
2037
        request = client_medium.get_request()
2038
        smart_protocol = self.client_protocol_class(request)
2039
        smart_protocol.call('foo')
2040
        smart_protocol.read_response_tuple(True)
2041
        self.assertRaises(
2042
            errors.ConnectionReset, smart_protocol.read_body_bytes)
2043
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
2044
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
2045
class TestSmartProtocolTwoSpecificsMixin(object):
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
2046
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
2047
    def assertBodyStreamSerialisation(self, expected_serialisation,
2048
                                      body_stream):
2049
        """Assert that body_stream is serialised as expected_serialisation."""
2050
        out_stream = StringIO()
2748.4.10 by Andrew Bennetts
Fix chunking serialisation to be current with the latest changes to the protocol, and improve the tests to make it harder to have them desynchronised.
2051
        protocol._send_stream(body_stream, out_stream.write)
2748.4.4 by Andrew Bennetts
Extract a _send_chunks function to make testing easier.
2052
        self.assertEqual(expected_serialisation, out_stream.getvalue())
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
2053
2748.4.10 by Andrew Bennetts
Fix chunking serialisation to be current with the latest changes to the protocol, and improve the tests to make it harder to have them desynchronised.
2054
    def assertBodyStreamRoundTrips(self, body_stream):
2055
        """Assert that body_stream is the same after being serialised and
2056
        deserialised.
2057
        """
2058
        out_stream = StringIO()
2059
        protocol._send_stream(body_stream, out_stream.write)
2060
        decoder = protocol.ChunkedBodyDecoder()
2061
        decoder.accept_bytes(out_stream.getvalue())
2062
        decoded_stream = list(iter(decoder.read_next_chunk, None))
2063
        self.assertEqual(body_stream, decoded_stream)
2064
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
2065
    def test_body_stream_serialisation_empty(self):
2066
        """A body_stream with no bytes can be serialised."""
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
2067
        self.assertBodyStreamSerialisation('chunked\nEND\n', [])
2748.4.10 by Andrew Bennetts
Fix chunking serialisation to be current with the latest changes to the protocol, and improve the tests to make it harder to have them desynchronised.
2068
        self.assertBodyStreamRoundTrips([])
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
2069
2070
    def test_body_stream_serialisation(self):
2748.4.10 by Andrew Bennetts
Fix chunking serialisation to be current with the latest changes to the protocol, and improve the tests to make it harder to have them desynchronised.
2071
        stream = ['chunk one', 'chunk two', 'chunk three']
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
2072
        self.assertBodyStreamSerialisation(
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
2073
            'chunked\n' + '9\nchunk one' + '9\nchunk two' + 'b\nchunk three' +
2074
            'END\n',
2748.4.10 by Andrew Bennetts
Fix chunking serialisation to be current with the latest changes to the protocol, and improve the tests to make it harder to have them desynchronised.
2075
            stream)
2076
        self.assertBodyStreamRoundTrips(stream)
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
2077
2078
    def test_body_stream_with_empty_element_serialisation(self):
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
2079
        """A body stream can include ''.
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
2080
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
2081
        The empty string can be transmitted like any other string.
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
2082
        """
2748.4.10 by Andrew Bennetts
Fix chunking serialisation to be current with the latest changes to the protocol, and improve the tests to make it harder to have them desynchronised.
2083
        stream = ['', 'chunk']
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
2084
        self.assertBodyStreamSerialisation(
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
2085
            'chunked\n' + '0\n' + '5\nchunk' + 'END\n', stream)
2748.4.10 by Andrew Bennetts
Fix chunking serialisation to be current with the latest changes to the protocol, and improve the tests to make it harder to have them desynchronised.
2086
        self.assertBodyStreamRoundTrips(stream)
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
2087
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
2088
    def test_body_stream_error_serialistion(self):
2089
        stream = ['first chunk',
2692.1.2 by Andrew Bennetts
Merge from bzr.dev.
2090
                  _mod_request.FailedSmartServerResponse(
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
2091
                      ('FailureName', 'failure arg'))]
2092
        expected_bytes = (
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
2093
            'chunked\n' + 'b\nfirst chunk' +
2748.4.10 by Andrew Bennetts
Fix chunking serialisation to be current with the latest changes to the protocol, and improve the tests to make it harder to have them desynchronised.
2094
            'ERR\n' + 'b\nFailureName' + 'b\nfailure arg' +
2095
            'END\n')
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
2096
        self.assertBodyStreamSerialisation(expected_bytes, stream)
2748.4.10 by Andrew Bennetts
Fix chunking serialisation to be current with the latest changes to the protocol, and improve the tests to make it harder to have them desynchronised.
2097
        self.assertBodyStreamRoundTrips(stream)
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
2098
2432.4.6 by Robert Collins
Include success/failure feedback in SmartProtocolTwo responses to allow robust handling in the future.
2099
    def test__send_response_includes_failure_marker(self):
2100
        """FailedSmartServerResponse have 'failed\n' after the version."""
2101
        out_stream = StringIO()
2102
        smart_protocol = protocol.SmartServerRequestProtocolTwo(
2103
            None, out_stream.write)
2104
        smart_protocol._send_response(
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
2105
            _mod_request.FailedSmartServerResponse(('x',)))
2432.3.6 by Andrew Bennetts
Fix a couple of test failures introduced by the previous merge.
2106
        self.assertEqual(protocol.RESPONSE_VERSION_TWO + 'failed\nx\n',
2107
                         out_stream.getvalue())
2432.4.6 by Robert Collins
Include success/failure feedback in SmartProtocolTwo responses to allow robust handling in the future.
2108
2109
    def test__send_response_includes_success_marker(self):
2110
        """SuccessfulSmartServerResponse have 'success\n' after the version."""
2111
        out_stream = StringIO()
2112
        smart_protocol = protocol.SmartServerRequestProtocolTwo(
2113
            None, out_stream.write)
2114
        smart_protocol._send_response(
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
2115
            _mod_request.SuccessfulSmartServerResponse(('x',)))
2432.3.6 by Andrew Bennetts
Fix a couple of test failures introduced by the previous merge.
2116
        self.assertEqual(protocol.RESPONSE_VERSION_TWO + 'success\nx\n',
2117
                         out_stream.getvalue())
2432.4.6 by Robert Collins
Include success/failure feedback in SmartProtocolTwo responses to allow robust handling in the future.
2118
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
2119
    def test__send_response_with_body_stream_sets_finished_reading(self):
2120
        smart_protocol = protocol.SmartServerRequestProtocolTwo(
2121
            None, lambda x: None)
2122
        self.assertEqual(1, smart_protocol.next_read_size())
2123
        smart_protocol._send_response(
3245.4.14 by Andrew Bennetts
Merge from bzr.dev (via loom thread).
2124
            _mod_request.SuccessfulSmartServerResponse(('x',), body_stream=[]))
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
2125
        self.assertEqual(0, smart_protocol.next_read_size())
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
2126
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
2127
    def test_streamed_body_bytes(self):
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
2128
        body_header = 'chunked\n'
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
2129
        two_body_chunks = "4\n1234" + "3\n567"
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
2130
        body_terminator = "END\n"
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
2131
        server_bytes = (protocol.RESPONSE_VERSION_TWO +
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
2132
                        "success\nok\n" + body_header + two_body_chunks +
2133
                        body_terminator)
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
2134
        input = StringIO(server_bytes)
2135
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
2136
        client_medium = medium.SmartSimplePipesClientMedium(
2137
            input, output, 'base')
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
2138
        request = client_medium.get_request()
2139
        smart_protocol = protocol.SmartClientRequestProtocolTwo(request)
2140
        smart_protocol.call('foo')
2141
        smart_protocol.read_response_tuple(True)
2142
        stream = smart_protocol.read_streamed_body()
2143
        self.assertEqual(['1234', '567'], list(stream))
2144
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
2145
    def test_read_streamed_body_error(self):
2146
        """When a stream is interrupted by an error..."""
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
2147
        body_header = 'chunked\n'
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
2148
        a_body_chunk = '4\naaaa'
2748.4.6 by Andrew Bennetts
Use chunks for stream errors, rather than the response tuple format.
2149
        err_signal = 'ERR\n'
2150
        err_chunks = 'a\nerror arg1' + '4\narg2'
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
2151
        finish = 'END\n'
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
2152
        body = body_header + a_body_chunk + err_signal + err_chunks + finish
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
2153
        server_bytes = (protocol.RESPONSE_VERSION_TWO +
2748.4.6 by Andrew Bennetts
Use chunks for stream errors, rather than the response tuple format.
2154
                        "success\nok\n" + body)
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
2155
        input = StringIO(server_bytes)
2156
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
2157
        client_medium = medium.SmartSimplePipesClientMedium(
2158
            input, output, 'base')
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
2159
        smart_request = client_medium.get_request()
2160
        smart_protocol = protocol.SmartClientRequestProtocolTwo(smart_request)
2161
        smart_protocol.call('foo')
2162
        smart_protocol.read_response_tuple(True)
2163
        expected_chunks = [
2164
            'aaaa',
2692.1.2 by Andrew Bennetts
Merge from bzr.dev.
2165
            _mod_request.FailedSmartServerResponse(('error arg1', 'arg2'))]
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
2166
        stream = smart_protocol.read_streamed_body()
2167
        self.assertEqual(expected_chunks, list(stream))
2168
3464.4.1 by Andrew Bennetts
Fix infinite busy-loop caused by connection loss during read of response body in HPSS v1 and v2.
2169
    def test_streamed_body_bytes_interrupted_connection(self):
2170
        body_header = 'chunked\n'
2171
        incomplete_body_chunk = "9999\nincomplete chunk"
2172
        server_bytes = (protocol.RESPONSE_VERSION_TWO +
2173
                        "success\nok\n" + body_header + incomplete_body_chunk)
2174
        input = StringIO(server_bytes)
2175
        output = StringIO()
2176
        client_medium = medium.SmartSimplePipesClientMedium(
2177
            input, output, 'base')
2178
        request = client_medium.get_request()
2179
        smart_protocol = protocol.SmartClientRequestProtocolTwo(request)
2180
        smart_protocol.call('foo')
2181
        smart_protocol.read_response_tuple(True)
2182
        stream = smart_protocol.read_streamed_body()
2183
        self.assertRaises(errors.ConnectionReset, stream.next)
2184
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
2185
    def test_client_read_response_tuple_sets_response_status(self):
2186
        server_bytes = protocol.RESPONSE_VERSION_TWO + "success\nok\n"
2187
        input = StringIO(server_bytes)
2188
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
2189
        client_medium = medium.SmartSimplePipesClientMedium(
2190
            input, output, 'base')
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
2191
        request = client_medium.get_request()
2192
        smart_protocol = protocol.SmartClientRequestProtocolTwo(request)
2193
        smart_protocol.call('foo')
2194
        smart_protocol.read_response_tuple(False)
2195
        self.assertEqual(True, smart_protocol.response_status)
2196
3245.4.55 by Andrew Bennetts
Test improvements suggested by John's review.
2197
    def test_client_read_response_tuple_raises_UnknownSmartMethod(self):
2198
        """read_response_tuple raises UnknownSmartMethod if the response says
2199
        the server did not recognise the request.
2200
        """
2201
        server_bytes = (
2202
            protocol.RESPONSE_VERSION_TWO +
2203
            "failed\n" +
2204
            "error\x01Generic bzr smart protocol error: bad request 'foo'\n")
2205
        input = StringIO(server_bytes)
2206
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
2207
        client_medium = medium.SmartSimplePipesClientMedium(
2208
            input, output, 'base')
3245.4.55 by Andrew Bennetts
Test improvements suggested by John's review.
2209
        request = client_medium.get_request()
2210
        smart_protocol = protocol.SmartClientRequestProtocolTwo(request)
2211
        smart_protocol.call('foo')
2212
        self.assertRaises(
2213
            errors.UnknownSmartMethod, smart_protocol.read_response_tuple)
2214
        # The request has been finished.  There is no body to read, and
2215
        # attempts to read one will fail.
2216
        self.assertRaises(
2217
            errors.ReadingCompleted, smart_protocol.read_body_bytes)
2218
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
2219
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
2220
class TestSmartProtocolTwoSpecifics(
2221
        TestSmartProtocol, TestSmartProtocolTwoSpecificsMixin):
2222
    """Tests for aspects of smart protocol version two that are unique to
2223
    version two.
2224
2225
    Thus tests involving body streams and success/failure markers belong here.
2226
    """
2227
2228
    client_protocol_class = protocol.SmartClientRequestProtocolTwo
2229
    server_protocol_class = protocol.SmartServerRequestProtocolTwo
2230
2231
2232
class TestVersionOneFeaturesInProtocolThree(
2233
    TestSmartProtocol, CommonSmartProtocolTestMixin):
2234
    """Tests for version one smart protocol features as implemented by version
2235
    three.
2236
    """
2237
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
2238
    request_encoder = protocol.ProtocolThreeRequester
2239
    response_decoder = protocol.ProtocolThreeDecoder
3245.4.4 by Andrew Bennetts
Fix a KnownFailure.
2240
    # build_server_protocol_three is a function, so we can't set it as a class
2241
    # attribute directly, because then Python will assume it is actually a
3245.4.10 by Andrew Bennetts
Use a less ugly hack for TestVersionOneFeaturesInProtocolThree.server_protocol_class.
2242
    # method.  So we make server_protocol_class be a static method, rather than
2243
    # simply doing:
3245.4.4 by Andrew Bennetts
Fix a KnownFailure.
2244
    # "server_protocol_class = protocol.build_server_protocol_three".
3245.4.10 by Andrew Bennetts
Use a less ugly hack for TestVersionOneFeaturesInProtocolThree.server_protocol_class.
2245
    server_protocol_class = staticmethod(protocol.build_server_protocol_three)
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
2246
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
2247
    def setUp(self):
2248
        super(TestVersionOneFeaturesInProtocolThree, self).setUp()
2249
        self.response_marker = protocol.MESSAGE_VERSION_THREE
2250
        self.request_marker = protocol.MESSAGE_VERSION_THREE
2251
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
2252
    def test_construct_version_three_server_protocol(self):
3245.4.7 by Andrew Bennetts
Rename _ProtocolThreeBase to ProtocolThreeDecoder, remove SmartServerRequestProtocolThree.
2253
        smart_protocol = protocol.ProtocolThreeDecoder(None)
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
2254
        self.assertEqual('', smart_protocol.unused_data)
3649.5.5 by John Arbash Meinel
Fix the test suite.
2255
        self.assertEqual([], smart_protocol._in_buffer_list)
2256
        self.assertEqual(0, smart_protocol._in_buffer_len)
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
2257
        self.assertFalse(smart_protocol._has_dispatched)
3195.3.19 by Andrew Bennetts
Remove a stray pdb, fix a test.
2258
        # The protocol starts by expecting four bytes, a length prefix for the
2259
        # headers.
2260
        self.assertEqual(4, smart_protocol.next_read_size())
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
2261
2262
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
2263
class LoggingMessageHandler(object):
2264
2265
    def __init__(self):
2266
        self.event_log = []
2267
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
2268
    def _log(self, *args):
2269
        self.event_log.append(args)
2270
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
2271
    def headers_received(self, headers):
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
2272
        self._log('headers', headers)
2273
2274
    def protocol_error(self, exception):
2275
        self._log('protocol_error', exception)
2276
2277
    def byte_part_received(self, byte):
2278
        self._log('byte', byte)
2279
2280
    def bytes_part_received(self, bytes):
2281
        self._log('bytes', bytes)
2282
2283
    def structure_part_received(self, structure):
2284
        self._log('structure', structure)
2285
2286
    def end_received(self):
2287
        self._log('end')
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
2288
2289
2290
class TestProtocolThree(TestSmartProtocol):
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
2291
    """Tests for v3 of the server-side protocol."""
2292
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
2293
    request_encoder = protocol.ProtocolThreeRequester
2294
    response_decoder = protocol.ProtocolThreeDecoder
3245.4.7 by Andrew Bennetts
Rename _ProtocolThreeBase to ProtocolThreeDecoder, remove SmartServerRequestProtocolThree.
2295
    server_protocol_class = protocol.ProtocolThreeDecoder
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
2296
2297
    def test_trivial_request(self):
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
2298
        """Smoke test for the simplest possible v3 request: empty headers, no
2299
        message parts.
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
2300
        """
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
2301
        output = StringIO()
2302
        headers = '\0\0\0\x02de'  # length-prefixed, bencoded empty dict
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
2303
        end = 'e'
2304
        request_bytes = headers + end
2305
        smart_protocol = self.server_protocol_class(LoggingMessageHandler())
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
2306
        smart_protocol.accept_bytes(request_bytes)
2307
        self.assertEqual(0, smart_protocol.next_read_size())
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
2308
        self.assertEqual('', smart_protocol.unused_data)
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
2309
4515.1.1 by Andrew Bennetts
Fix bug in HPSS v3 decoder when receiving multiple lots of excess bytes.
2310
    def test_repeated_excess(self):
2311
        """Repeated calls to accept_bytes after the message end has been parsed
2312
        accumlates the bytes in the unused_data attribute.
2313
        """
2314
        output = StringIO()
2315
        headers = '\0\0\0\x02de'  # length-prefixed, bencoded empty dict
2316
        end = 'e'
2317
        request_bytes = headers + end
2318
        smart_protocol = self.server_protocol_class(LoggingMessageHandler())
2319
        smart_protocol.accept_bytes(request_bytes)
2320
        self.assertEqual('', smart_protocol.unused_data)
2321
        smart_protocol.accept_bytes('aaa')
2322
        self.assertEqual('aaa', smart_protocol.unused_data)
2323
        smart_protocol.accept_bytes('bbb')
2324
        self.assertEqual('aaabbb', smart_protocol.unused_data)
2325
        self.assertEqual(0, smart_protocol.next_read_size())
2326
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
2327
    def make_protocol_expecting_message_part(self):
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
2328
        headers = '\0\0\0\x02de'  # length-prefixed, bencoded empty dict
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
2329
        message_handler = LoggingMessageHandler()
2330
        smart_protocol = self.server_protocol_class(message_handler)
2331
        smart_protocol.accept_bytes(headers)
2332
        # Clear the event log
2333
        del message_handler.event_log[:]
2334
        return smart_protocol, message_handler.event_log
2335
2336
    def test_decode_one_byte(self):
2337
        """The protocol can decode a 'one byte' message part."""
2338
        smart_protocol, event_log = self.make_protocol_expecting_message_part()
2339
        smart_protocol.accept_bytes('ox')
2340
        self.assertEqual([('byte', 'x')], event_log)
2341
2342
    def test_decode_bytes(self):
2343
        """The protocol can decode a 'bytes' message part."""
2344
        smart_protocol, event_log = self.make_protocol_expecting_message_part()
2345
        smart_protocol.accept_bytes(
2346
            'b' # message part kind
2347
            '\0\0\0\x07' # length prefix
2348
            'payload' # payload
2349
            )
2350
        self.assertEqual([('bytes', 'payload')], event_log)
2351
2352
    def test_decode_structure(self):
2353
        """The protocol can decode a 'structure' message part."""
2354
        smart_protocol, event_log = self.make_protocol_expecting_message_part()
2355
        smart_protocol.accept_bytes(
2356
            's' # message part kind
2357
            '\0\0\0\x07' # length prefix
2358
            'l3:ARGe' # ['ARG']
2359
            )
3842.3.6 by Andrew Bennetts
Tweak bencode.py to decode sequences as tuples, not lists.
2360
        self.assertEqual([('structure', ('ARG',))], event_log)
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
2361
2362
    def test_decode_multiple_bytes(self):
2363
        """The protocol can decode a multiple 'bytes' message parts."""
2364
        smart_protocol, event_log = self.make_protocol_expecting_message_part()
2365
        smart_protocol.accept_bytes(
2366
            'b' # message part kind
2367
            '\0\0\0\x05' # length prefix
2368
            'first' # payload
2369
            'b' # message part kind
2370
            '\0\0\0\x06'
2371
            'second'
2372
            )
2373
        self.assertEqual(
2374
            [('bytes', 'first'), ('bytes', 'second')], event_log)
2375
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
2376
3923.5.1 by Andrew Bennetts
Add _SmartClient.call_with_body_bytes, plus some server-side code for handling bodies delivered in multiple parts.
2377
class TestConventionalResponseHandlerBodyStream(tests.TestCase):
3245.4.5 by Andrew Bennetts
Implement interrupting body streams with an error.
2378
3464.4.1 by Andrew Bennetts
Fix infinite busy-loop caused by connection loss during read of response body in HPSS v1 and v2.
2379
    def make_response_handler(self, response_bytes):
3245.4.5 by Andrew Bennetts
Implement interrupting body streams with an error.
2380
        from bzrlib.smart.message import ConventionalResponseHandler
2381
        response_handler = ConventionalResponseHandler()
3245.4.7 by Andrew Bennetts
Rename _ProtocolThreeBase to ProtocolThreeDecoder, remove SmartServerRequestProtocolThree.
2382
        protocol_decoder = protocol.ProtocolThreeDecoder(response_handler)
3245.4.5 by Andrew Bennetts
Implement interrupting body streams with an error.
2383
        # put decoder in desired state (waiting for message parts)
2384
        protocol_decoder.state_accept = protocol_decoder._state_accept_expecting_message_part
2385
        output = StringIO()
2386
        client_medium = medium.SmartSimplePipesClientMedium(
3464.4.1 by Andrew Bennetts
Fix infinite busy-loop caused by connection loss during read of response body in HPSS v1 and v2.
2387
            StringIO(response_bytes), output, 'base')
3245.4.5 by Andrew Bennetts
Implement interrupting body streams with an error.
2388
        medium_request = client_medium.get_request()
2389
        medium_request.finished_writing()
3245.4.26 by Andrew Bennetts
Rename 'setProtoAndMedium' to more accurate 'setProtoAndMediumRequest', add ABCs for Requesters and ResponseHandlers.
2390
        response_handler.setProtoAndMediumRequest(
2391
            protocol_decoder, medium_request)
3464.4.1 by Andrew Bennetts
Fix infinite busy-loop caused by connection loss during read of response body in HPSS v1 and v2.
2392
        return response_handler
2393
3923.5.1 by Andrew Bennetts
Add _SmartClient.call_with_body_bytes, plus some server-side code for handling bodies delivered in multiple parts.
2394
    def test_interrupted_by_error(self):
3464.4.1 by Andrew Bennetts
Fix infinite busy-loop caused by connection loss during read of response body in HPSS v1 and v2.
2395
        response_handler = self.make_response_handler(interrupted_body_stream)
3245.4.5 by Andrew Bennetts
Implement interrupting body streams with an error.
2396
        stream = response_handler.read_streamed_body()
4064.1.2 by Andrew Bennetts
Refactor server-side error translation, improve tests.
2397
        self.assertEqual('aaa', stream.next())
2398
        self.assertEqual('bbb', stream.next())
3245.4.5 by Andrew Bennetts
Implement interrupting body streams with an error.
2399
        exc = self.assertRaises(errors.ErrorFromSmartServer, stream.next)
4064.1.2 by Andrew Bennetts
Refactor server-side error translation, improve tests.
2400
        self.assertEqual(('error', 'Boom!'), exc.error_tuple)
3245.4.5 by Andrew Bennetts
Implement interrupting body streams with an error.
2401
3923.5.1 by Andrew Bennetts
Add _SmartClient.call_with_body_bytes, plus some server-side code for handling bodies delivered in multiple parts.
2402
    def test_interrupted_by_connection_lost(self):
3464.4.1 by Andrew Bennetts
Fix infinite busy-loop caused by connection loss during read of response body in HPSS v1 and v2.
2403
        interrupted_body_stream = (
2404
            'oS' # successful response
2405
            's\0\0\0\x02le' # empty args
2406
            'b\0\0\xff\xffincomplete chunk')
2407
        response_handler = self.make_response_handler(interrupted_body_stream)
2408
        stream = response_handler.read_streamed_body()
2409
        self.assertRaises(errors.ConnectionReset, stream.next)
2410
2411
    def test_read_body_bytes_interrupted_by_connection_lost(self):
2412
        interrupted_body_stream = (
2413
            'oS' # successful response
2414
            's\0\0\0\x02le' # empty args
2415
            'b\0\0\xff\xffincomplete chunk')
2416
        response_handler = self.make_response_handler(interrupted_body_stream)
2417
        self.assertRaises(
2418
            errors.ConnectionReset, response_handler.read_body_bytes)
2419
3923.5.1 by Andrew Bennetts
Add _SmartClient.call_with_body_bytes, plus some server-side code for handling bodies delivered in multiple parts.
2420
    def test_multiple_bytes_parts(self):
2421
        multiple_bytes_parts = (
2422
            'oS' # successful response
2423
            's\0\0\0\x02le' # empty args
2424
            'b\0\0\0\x0bSome bytes\n' # some bytes
2425
            'b\0\0\0\x0aMore bytes' # more bytes
2426
            'e' # message end
2427
            )
2428
        response_handler = self.make_response_handler(multiple_bytes_parts)
2429
        self.assertEqual(
2430
            'Some bytes\nMore bytes', response_handler.read_body_bytes())
2431
        response_handler = self.make_response_handler(multiple_bytes_parts)
2432
        self.assertEqual(
2433
            ['Some bytes\n', 'More bytes'],
2434
            list(response_handler.read_streamed_body()))
2435
2436
3923.5.6 by Andrew Bennetts
Fix a style nit.
2437
class FakeResponder(object):
2438
3923.5.1 by Andrew Bennetts
Add _SmartClient.call_with_body_bytes, plus some server-side code for handling bodies delivered in multiple parts.
2439
    response_sent = False
3923.5.6 by Andrew Bennetts
Fix a style nit.
2440
3923.5.1 by Andrew Bennetts
Add _SmartClient.call_with_body_bytes, plus some server-side code for handling bodies delivered in multiple parts.
2441
    def send_error(self, exc):
2442
        raise exc
3923.5.6 by Andrew Bennetts
Fix a style nit.
2443
3923.5.1 by Andrew Bennetts
Add _SmartClient.call_with_body_bytes, plus some server-side code for handling bodies delivered in multiple parts.
2444
    def send_response(self, response):
2445
        pass
2446
2447
2448
class TestConventionalRequestHandlerBodyStream(tests.TestCase):
2449
    """Tests for ConventionalRequestHandler's handling of request bodies."""
2450
2451
    def make_request_handler(self, request_bytes):
2452
        """Make a ConventionalRequestHandler for the given bytes using test
2453
        doubles for the request_handler and the responder.
2454
        """
2455
        from bzrlib.smart.message import ConventionalRequestHandler
2456
        request_handler = InstrumentedRequestHandler()
2457
        request_handler.response = _mod_request.SuccessfulSmartServerResponse(('arg', 'arg'))
3923.5.6 by Andrew Bennetts
Fix a style nit.
2458
        responder = FakeResponder()
3923.5.1 by Andrew Bennetts
Add _SmartClient.call_with_body_bytes, plus some server-side code for handling bodies delivered in multiple parts.
2459
        message_handler = ConventionalRequestHandler(request_handler, responder)
2460
        protocol_decoder = protocol.ProtocolThreeDecoder(message_handler)
2461
        # put decoder in desired state (waiting for message parts)
2462
        protocol_decoder.state_accept = protocol_decoder._state_accept_expecting_message_part
2463
        protocol_decoder.accept_bytes(request_bytes)
2464
        return request_handler
2465
2466
    def test_multiple_bytes_parts(self):
2467
        """Each bytes part triggers a call to the request_handler's
2468
        accept_body method.
2469
        """
2470
        multiple_bytes_parts = (
2471
            's\0\0\0\x07l3:fooe' # args
2472
            'b\0\0\0\x0bSome bytes\n' # some bytes
2473
            'b\0\0\0\x0aMore bytes' # more bytes
2474
            'e' # message end
2475
            )
2476
        request_handler = self.make_request_handler(multiple_bytes_parts)
2477
        accept_body_calls = [
2478
            call_info[1] for call_info in request_handler.calls
2479
            if call_info[0] == 'accept_body']
2480
        self.assertEqual(
2481
            ['Some bytes\n', 'More bytes'], accept_body_calls)
2482
3923.5.4 by Andrew Bennetts
Allow a request's body part(s) to be followed by an error.
2483
    def test_error_flag_after_body(self):
2484
        body_then_error = (
2485
            's\0\0\0\x07l3:fooe' # request args
2486
            'b\0\0\0\x0bSome bytes\n' # some bytes
2487
            'b\0\0\0\x0aMore bytes' # more bytes
2488
            'oE' # error flag
2489
            's\0\0\0\x07l3:bare' # error args
2490
            'e' # message end
2491
            )
2492
        request_handler = self.make_request_handler(body_then_error)
2493
        self.assertEqual(
2494
            [('post_body_error_received', ('bar',)), ('end_received',)],
2495
            request_handler.calls[-2:])
2496
3245.4.5 by Andrew Bennetts
Implement interrupting body streams with an error.
2497
3245.4.49 by Andrew Bennetts
Distinguish between errors in decoding a message into message parts from errors in handling decoded message parts, and use that to make sure that entire requests are read even when they result in exceptions.
2498
class TestMessageHandlerErrors(tests.TestCase):
2499
    """Tests for v3 that unrecognised (but well-formed) requests/responses are
2500
    still fully read off the wire, so that subsequent requests/responses on the
2501
    same medium can be decoded.
2502
    """
2503
2504
    def test_non_conventional_request(self):
2505
        """ConventionalRequestHandler (the default message handler on the
2506
        server side) will reject an unconventional message, but still consume
2507
        all the bytes of that message and signal when it has done so.
2508
2509
        This is what allows a server to continue to accept requests after the
2510
        client sends a completely unrecognised request.
2511
        """
2512
        # Define an invalid request (but one that is a well-formed message).
2513
        # This particular invalid request not only lacks the mandatory
2514
        # verb+args tuple, it has a single-byte part, which is forbidden.  In
2515
        # fact it has that part twice, to trigger multiple errors.
2516
        invalid_request = (
2517
            protocol.MESSAGE_VERSION_THREE +  # protocol version marker
2518
            '\0\0\0\x02de' + # empty headers
2519
            'oX' + # a single byte part: 'X'.  ConventionalRequestHandler will
2520
                   # error at this part.
2521
            'oX' + # and again.
2522
            'e' # end of message
2523
            )
2524
2525
        to_server = StringIO(invalid_request)
2526
        from_server = StringIO()
2527
        transport = memory.MemoryTransport('memory:///')
2528
        server = medium.SmartServerPipeStreamMedium(
2529
            to_server, from_server, transport)
2530
        proto = server._build_protocol()
2531
        message_handler = proto.message_handler
2532
        server._serve_one_request(proto)
2533
        # All the bytes have been read from the medium...
2534
        self.assertEqual('', to_server.read())
2535
        # ...and the protocol decoder has consumed all the bytes, and has
2536
        # finished reading.
2537
        self.assertEqual('', proto.unused_data)
2538
        self.assertEqual(0, proto.next_read_size())
2539
2540
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
2541
class InstrumentedRequestHandler(object):
2542
    """Test Double of SmartServerRequestHandler."""
2543
2544
    def __init__(self):
2545
        self.calls = []
3923.5.1 by Andrew Bennetts
Add _SmartClient.call_with_body_bytes, plus some server-side code for handling bodies delivered in multiple parts.
2546
        self.finished_reading = False
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
2547
2548
    def no_body_received(self):
2549
        self.calls.append(('no_body_received',))
2550
3195.3.4 by Andrew Bennetts
Make the general request handler dispatch version 3 events to the specific request handler (i.e. to the SmartServerRequest instance).
2551
    def end_received(self):
2552
        self.calls.append(('end_received',))
3923.5.1 by Andrew Bennetts
Add _SmartClient.call_with_body_bytes, plus some server-side code for handling bodies delivered in multiple parts.
2553
        self.finished_reading = True
2554
4634.6.30 by Andrew Bennetts
Remove SmartServerRequest.dispatch_command, fix SmartServerRequest.args_received.
2555
    def args_received(self, args):
2556
        self.calls.append(('args_received', args))
3923.5.1 by Andrew Bennetts
Add _SmartClient.call_with_body_bytes, plus some server-side code for handling bodies delivered in multiple parts.
2557
2558
    def accept_body(self, bytes):
2559
        self.calls.append(('accept_body', bytes))
2560
2561
    def end_of_body(self):
2562
        self.calls.append(('end_of_body',))
2563
        self.finished_reading = True
3195.3.4 by Andrew Bennetts
Make the general request handler dispatch version 3 events to the specific request handler (i.e. to the SmartServerRequest instance).
2564
3923.5.4 by Andrew Bennetts
Allow a request's body part(s) to be followed by an error.
2565
    def post_body_error_received(self, error_args):
2566
        self.calls.append(('post_body_error_received', error_args))
2567
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
2568
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
2569
class StubRequest(object):
2570
2571
    def finished_reading(self):
2572
        pass
2573
2574
3245.4.22 by Andrew Bennetts
Uncomment TestClientDecodingProtocolThree.test_trivial_response_decoding.
2575
class TestClientDecodingProtocolThree(TestSmartProtocol):
2576
    """Tests for v3 of the client-side protocol decoding."""
2577
3245.4.55 by Andrew Bennetts
Test improvements suggested by John's review.
2578
    def make_logging_response_decoder(self):
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
2579
        """Make v3 response decoder using a test response handler."""
2580
        response_handler = LoggingMessageHandler()
2581
        decoder = protocol.ProtocolThreeDecoder(response_handler)
2582
        return decoder, response_handler
2583
2584
    def make_conventional_response_decoder(self):
3245.4.23 by Andrew Bennetts
Improve test_trivial_response_decoding slightly.
2585
        """Make v3 response decoder using a conventional response handler."""
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
2586
        response_handler = message.ConventionalResponseHandler()
3245.4.23 by Andrew Bennetts
Improve test_trivial_response_decoding slightly.
2587
        decoder = protocol.ProtocolThreeDecoder(response_handler)
3245.4.26 by Andrew Bennetts
Rename 'setProtoAndMedium' to more accurate 'setProtoAndMediumRequest', add ABCs for Requesters and ResponseHandlers.
2588
        response_handler.setProtoAndMediumRequest(decoder, StubRequest())
3245.4.23 by Andrew Bennetts
Improve test_trivial_response_decoding slightly.
2589
        return decoder, response_handler
2590
3245.4.22 by Andrew Bennetts
Uncomment TestClientDecodingProtocolThree.test_trivial_response_decoding.
2591
    def test_trivial_response_decoding(self):
2592
        """Smoke test for the simplest possible v3 response: empty headers,
3245.4.23 by Andrew Bennetts
Improve test_trivial_response_decoding slightly.
2593
        status byte, empty args, no body.
3245.4.22 by Andrew Bennetts
Uncomment TestClientDecodingProtocolThree.test_trivial_response_decoding.
2594
        """
2595
        headers = '\0\0\0\x02de'  # length-prefixed, bencoded empty dict
2596
        response_status = 'oS' # success
2597
        args = 's\0\0\0\x02le' # length-prefixed, bencoded empty list
2598
        end = 'e' # end marker
3245.4.23 by Andrew Bennetts
Improve test_trivial_response_decoding slightly.
2599
        message_bytes = headers + response_status + args + end
3245.4.55 by Andrew Bennetts
Test improvements suggested by John's review.
2600
        decoder, response_handler = self.make_logging_response_decoder()
3245.4.23 by Andrew Bennetts
Improve test_trivial_response_decoding slightly.
2601
        decoder.accept_bytes(message_bytes)
2602
        # The protocol decoder has finished, and consumed all bytes
3245.4.22 by Andrew Bennetts
Uncomment TestClientDecodingProtocolThree.test_trivial_response_decoding.
2603
        self.assertEqual(0, decoder.next_read_size())
2604
        self.assertEqual('', decoder.unused_data)
3245.4.23 by Andrew Bennetts
Improve test_trivial_response_decoding slightly.
2605
        # The message handler has been invoked with all the parts of the
2606
        # trivial response: empty headers, status byte, no args, end.
2607
        self.assertEqual(
3842.3.6 by Andrew Bennetts
Tweak bencode.py to decode sequences as tuples, not lists.
2608
            [('headers', {}), ('byte', 'S'), ('structure', ()), ('end',)],
3245.4.23 by Andrew Bennetts
Improve test_trivial_response_decoding slightly.
2609
            response_handler.event_log)
3195.3.5 by Andrew Bennetts
Start writing the client-side protocol logic for HPSS v3.
2610
3245.4.55 by Andrew Bennetts
Test improvements suggested by John's review.
2611
    def test_incomplete_message(self):
2612
        """A decoder will keep signalling that it needs more bytes via
2613
        next_read_size() != 0 until it has seen a complete message, regardless
2614
        which state it is in.
2615
        """
2616
        # Define a simple response that uses all possible message parts.
2617
        headers = '\0\0\0\x02de'  # length-prefixed, bencoded empty dict
2618
        response_status = 'oS' # success
2619
        args = 's\0\0\0\x02le' # length-prefixed, bencoded empty list
2620
        body = 'b\0\0\0\x04BODY' # a body: 'BODY'
2621
        end = 'e' # end marker
2622
        simple_response = headers + response_status + args + body + end
2623
        # Feed the request to the decoder one byte at a time.
2624
        decoder, response_handler = self.make_logging_response_decoder()
2625
        for byte in simple_response:
2626
            self.assertNotEqual(0, decoder.next_read_size())
2627
            decoder.accept_bytes(byte)
2628
        # Now the response is complete
2629
        self.assertEqual(0, decoder.next_read_size())
2630
2631
    def test_read_response_tuple_raises_UnknownSmartMethod(self):
2632
        """read_response_tuple raises UnknownSmartMethod if the server replied
2633
        with 'UnknownMethod'.
2634
        """
3245.4.35 by Andrew Bennetts
Remove some commented out cruft, test (and fix) handling of an 'UnknownMethod' response.
2635
        headers = '\0\0\0\x02de'  # length-prefixed, bencoded empty dict
2636
        response_status = 'oE' # error flag
2637
        # args: ('UnknownMethod', 'method-name')
2638
        args = 's\0\0\0\x20l13:UnknownMethod11:method-namee'
2639
        end = 'e' # end marker
2640
        message_bytes = headers + response_status + args + end
2641
        decoder, response_handler = self.make_conventional_response_decoder()
2642
        decoder.accept_bytes(message_bytes)
2643
        error = self.assertRaises(
2644
            errors.UnknownSmartMethod, response_handler.read_response_tuple)
2645
        self.assertEqual('method-name', error.verb)
2646
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
2647
    def test_read_response_tuple_error(self):
2648
        """If the response has an error, it is raised as an exception."""
2649
        headers = '\0\0\0\x02de'  # length-prefixed, bencoded empty dict
2650
        response_status = 'oE' # error
2651
        args = 's\0\0\0\x1al9:first arg10:second arge' # two args
2652
        end = 'e' # end marker
2653
        message_bytes = headers + response_status + args + end
2654
        decoder, response_handler = self.make_conventional_response_decoder()
2655
        decoder.accept_bytes(message_bytes)
2656
        error = self.assertRaises(
2657
            errors.ErrorFromSmartServer, response_handler.read_response_tuple)
2658
        self.assertEqual(('first arg', 'second arg'), error.error_tuple)
2659
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
2660
3195.3.14 by Andrew Bennetts
Add some tests for how the client encodes requests.
2661
class TestClientEncodingProtocolThree(TestSmartProtocol):
2662
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
2663
    request_encoder = protocol.ProtocolThreeRequester
2664
    response_decoder = protocol.ProtocolThreeDecoder
3245.4.7 by Andrew Bennetts
Rename _ProtocolThreeBase to ProtocolThreeDecoder, remove SmartServerRequestProtocolThree.
2665
    server_protocol_class = protocol.ProtocolThreeDecoder
3195.3.14 by Andrew Bennetts
Add some tests for how the client encodes requests.
2666
2667
    def make_client_encoder_and_output(self):
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
2668
        result = self.make_client_protocol_and_output()
2669
        requester, response_handler, output = result
2670
        return requester, output
3195.3.14 by Andrew Bennetts
Add some tests for how the client encodes requests.
2671
2672
    def test_call_smoke_test(self):
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
2673
        """A smoke test for ProtocolThreeRequester.call.
3195.3.14 by Andrew Bennetts
Add some tests for how the client encodes requests.
2674
2675
        This test checks that a particular simple invocation of call emits the
2676
        correct bytes for that invocation.
2677
        """
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
2678
        requester, output = self.make_client_encoder_and_output()
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
2679
        requester.set_headers({'header name': 'header value'})
2680
        requester.call('one arg')
3195.3.14 by Andrew Bennetts
Add some tests for how the client encodes requests.
2681
        self.assertEquals(
3245.4.60 by Andrew Bennetts
Update the protocol v3 version string to say 'bzr 1.6'.
2682
            'bzr message 3 (bzr 1.6)\n' # protocol version
3195.3.14 by Andrew Bennetts
Add some tests for how the client encodes requests.
2683
            '\x00\x00\x00\x1fd11:header name12:header valuee' # headers
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
2684
            's\x00\x00\x00\x0bl7:one arge' # args
2685
            'e', # end
3195.3.14 by Andrew Bennetts
Add some tests for how the client encodes requests.
2686
            output.getvalue())
2687
2688
    def test_call_with_body_bytes_smoke_test(self):
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
2689
        """A smoke test for ProtocolThreeRequester.call_with_body_bytes.
3195.3.14 by Andrew Bennetts
Add some tests for how the client encodes requests.
2690
2691
        This test checks that a particular simple invocation of
2692
        call_with_body_bytes emits the correct bytes for that invocation.
2693
        """
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
2694
        requester, output = self.make_client_encoder_and_output()
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
2695
        requester.set_headers({'header name': 'header value'})
2696
        requester.call_with_body_bytes(('one arg',), 'body bytes')
3195.3.14 by Andrew Bennetts
Add some tests for how the client encodes requests.
2697
        self.assertEquals(
3245.4.60 by Andrew Bennetts
Update the protocol v3 version string to say 'bzr 1.6'.
2698
            'bzr message 3 (bzr 1.6)\n' # protocol version
3195.3.14 by Andrew Bennetts
Add some tests for how the client encodes requests.
2699
            '\x00\x00\x00\x1fd11:header name12:header valuee' # headers
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
2700
            's\x00\x00\x00\x0bl7:one arge' # args
2701
            'b' # there is a prefixed body
2702
            '\x00\x00\x00\nbody bytes' # the prefixed body
2703
            'e', # end
3195.3.14 by Andrew Bennetts
Add some tests for how the client encodes requests.
2704
            output.getvalue())
2705
3441.3.1 by Andrew Bennetts
Buffer encoding of v3 messages to minimise write/send calls. Doubles the speed of pushing over TCP with 500ms latency loopback.
2706
    def test_call_writes_just_once(self):
2707
        """A bodyless request is written to the medium all at once."""
2708
        medium_request = StubMediumRequest()
2709
        encoder = protocol.ProtocolThreeRequester(medium_request)
2710
        encoder.call('arg1', 'arg2', 'arg3')
2711
        self.assertEqual(
2712
            ['accept_bytes', 'finished_writing'], medium_request.calls)
2713
2714
    def test_call_with_body_bytes_writes_just_once(self):
2715
        """A request with body bytes is written to the medium all at once."""
2716
        medium_request = StubMediumRequest()
2717
        encoder = protocol.ProtocolThreeRequester(medium_request)
2718
        encoder.call_with_body_bytes(('arg', 'arg'), 'body bytes')
2719
        self.assertEqual(
2720
            ['accept_bytes', 'finished_writing'], medium_request.calls)
2721
3923.5.1 by Andrew Bennetts
Add _SmartClient.call_with_body_bytes, plus some server-side code for handling bodies delivered in multiple parts.
2722
    def test_call_with_body_stream_smoke_test(self):
2723
        """A smoke test for ProtocolThreeRequester.call_with_body_stream.
2724
2725
        This test checks that a particular simple invocation of
2726
        call_with_body_stream emits the correct bytes for that invocation.
2727
        """
2728
        requester, output = self.make_client_encoder_and_output()
2729
        requester.set_headers({'header name': 'header value'})
2730
        stream = ['chunk 1', 'chunk two']
2731
        requester.call_with_body_stream(('one arg',), stream)
2732
        self.assertEquals(
2733
            'bzr message 3 (bzr 1.6)\n' # protocol version
2734
            '\x00\x00\x00\x1fd11:header name12:header valuee' # headers
2735
            's\x00\x00\x00\x0bl7:one arge' # args
2736
            'b\x00\x00\x00\x07chunk 1' # a prefixed body chunk
2737
            'b\x00\x00\x00\x09chunk two' # a prefixed body chunk
2738
            'e', # end
2739
            output.getvalue())
2740
2741
    def test_call_with_body_stream_empty_stream(self):
2742
        """call_with_body_stream with an empty stream."""
2743
        requester, output = self.make_client_encoder_and_output()
2744
        requester.set_headers({})
2745
        stream = []
2746
        requester.call_with_body_stream(('one arg',), stream)
2747
        self.assertEquals(
2748
            'bzr message 3 (bzr 1.6)\n' # protocol version
2749
            '\x00\x00\x00\x02de' # headers
2750
            's\x00\x00\x00\x0bl7:one arge' # args
2751
            # no body chunks
2752
            'e', # end
2753
            output.getvalue())
2754
3923.5.5 by Andrew Bennetts
Cleanly abort the request if an error occurs while iterating a body stream.
2755
    def test_call_with_body_stream_error(self):
2756
        """call_with_body_stream will abort the streamed body with an
2757
        error if the stream raises an error during iteration.
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2758
3923.5.5 by Andrew Bennetts
Cleanly abort the request if an error occurs while iterating a body stream.
2759
        The resulting request will still be a complete message.
2760
        """
2761
        requester, output = self.make_client_encoder_and_output()
2762
        requester.set_headers({})
2763
        def stream_that_fails():
2764
            yield 'aaa'
2765
            yield 'bbb'
2766
            raise Exception('Boom!')
4022.1.8 by Robert Collins
Fix test_call_with_body_stream_error which was broken by a debugging change to still pass tests.
2767
        self.assertRaises(Exception, requester.call_with_body_stream,
2768
            ('one arg',), stream_that_fails())
3923.5.5 by Andrew Bennetts
Cleanly abort the request if an error occurs while iterating a body stream.
2769
        self.assertEquals(
2770
            'bzr message 3 (bzr 1.6)\n' # protocol version
2771
            '\x00\x00\x00\x02de' # headers
2772
            's\x00\x00\x00\x0bl7:one arge' # args
2773
            'b\x00\x00\x00\x03aaa' # body
2774
            'b\x00\x00\x00\x03bbb' # more body
2775
            'oE' # error flag
2776
            's\x00\x00\x00\x09l5:errore' # error args: ('error',)
2777
            'e', # end
2778
            output.getvalue())
2779
3441.3.1 by Andrew Bennetts
Buffer encoding of v3 messages to minimise write/send calls. Doubles the speed of pushing over TCP with 500ms latency loopback.
2780
2781
class StubMediumRequest(object):
2782
    """A stub medium request that tracks the number of times accept_bytes is
2783
    called.
2784
    """
3441.3.3 by Andrew Bennetts
Fix PEP 8 nit.
2785
3441.3.1 by Andrew Bennetts
Buffer encoding of v3 messages to minimise write/send calls. Doubles the speed of pushing over TCP with 500ms latency loopback.
2786
    def __init__(self):
2787
        self.calls = []
3461.2.1 by Andrew Bennetts
Avoid unnecessary reconnections to old servers when the first HPSS is an error in the right protocol version.
2788
        self._medium = 'dummy medium'
3441.3.3 by Andrew Bennetts
Fix PEP 8 nit.
2789
3441.3.1 by Andrew Bennetts
Buffer encoding of v3 messages to minimise write/send calls. Doubles the speed of pushing over TCP with 500ms latency loopback.
2790
    def accept_bytes(self, bytes):
2791
        self.calls.append('accept_bytes')
3441.3.3 by Andrew Bennetts
Fix PEP 8 nit.
2792
3441.3.1 by Andrew Bennetts
Buffer encoding of v3 messages to minimise write/send calls. Doubles the speed of pushing over TCP with 500ms latency loopback.
2793
    def finished_writing(self):
2794
        self.calls.append('finished_writing')
2795
3195.3.14 by Andrew Bennetts
Add some tests for how the client encodes requests.
2796
4064.1.2 by Andrew Bennetts
Refactor server-side error translation, improve tests.
2797
interrupted_body_stream = (
2798
    'oS' # status flag (success)
2799
    's\x00\x00\x00\x08l4:argse' # args struct ('args,')
2800
    'b\x00\x00\x00\x03aaa' # body part ('aaa')
2801
    'b\x00\x00\x00\x03bbb' # body part ('bbb')
2802
    'oE' # status flag (error)
2803
    's\x00\x00\x00\x10l5:error5:Boom!e' # err struct ('error', 'Boom!')
2804
    'e' # EOM
2805
    )
2806
2807
3245.4.37 by Andrew Bennetts
Add test for sending ProtocolThreeResponder.send_error(UnknownSmartMethod(...)).
2808
class TestResponseEncodingProtocolThree(tests.TestCase):
2809
2810
    def make_response_encoder(self):
2811
        out_stream = StringIO()
2812
        response_encoder = protocol.ProtocolThreeResponder(out_stream.write)
2813
        return response_encoder, out_stream
2814
2815
    def test_send_error_unknown_method(self):
2816
        encoder, out_stream = self.make_response_encoder()
2817
        encoder.send_error(errors.UnknownSmartMethod('method name'))
2818
        # Use assertEndsWith so that we don't compare the header, which varies
2819
        # by bzrlib.__version__.
2820
        self.assertEndsWith(
2821
            out_stream.getvalue(),
2822
            # error status
2823
            'oE' +
2824
            # tuple: 'UnknownMethod', 'method name'
2825
            's\x00\x00\x00\x20l13:UnknownMethod11:method namee'
2826
            # end of message
2827
            'e')
2828
4064.1.1 by Andrew Bennetts
Add TestResponseEncodingProtocolThree.test_send_broken_body_stream, and make it pass.
2829
    def test_send_broken_body_stream(self):
2830
        encoder, out_stream = self.make_response_encoder()
2831
        encoder._headers = {}
2832
        def stream_that_fails():
2833
            yield 'aaa'
2834
            yield 'bbb'
2835
            raise Exception('Boom!')
2836
        response = _mod_request.SuccessfulSmartServerResponse(
2837
            ('args',), body_stream=stream_that_fails())
2838
        encoder.send_response(response)
4064.1.2 by Andrew Bennetts
Refactor server-side error translation, improve tests.
2839
        expected_response = (
4064.1.1 by Andrew Bennetts
Add TestResponseEncodingProtocolThree.test_send_broken_body_stream, and make it pass.
2840
            'bzr message 3 (bzr 1.6)\n'  # protocol marker
2841
            '\x00\x00\x00\x02de' # headers dict (empty)
4064.1.2 by Andrew Bennetts
Refactor server-side error translation, improve tests.
2842
            + interrupted_body_stream)
2843
        self.assertEqual(expected_response, out_stream.getvalue())
4064.1.1 by Andrew Bennetts
Add TestResponseEncodingProtocolThree.test_send_broken_body_stream, and make it pass.
2844
3245.4.37 by Andrew Bennetts
Add test for sending ProtocolThreeResponder.send_error(UnknownSmartMethod(...)).
2845
3441.3.1 by Andrew Bennetts
Buffer encoding of v3 messages to minimise write/send calls. Doubles the speed of pushing over TCP with 500ms latency loopback.
2846
class TestResponseEncoderBufferingProtocolThree(tests.TestCase):
2847
    """Tests for buffering of responses.
2848
2849
    We want to avoid doing many small writes when one would do, to avoid
2850
    unnecessary network overhead.
2851
    """
2852
2853
    def setUp(self):
4153.1.2 by Andrew Bennetts
Add missing TestCase.setUp upcalls.
2854
        tests.TestCase.setUp(self)
3441.3.1 by Andrew Bennetts
Buffer encoding of v3 messages to minimise write/send calls. Doubles the speed of pushing over TCP with 500ms latency loopback.
2855
        self.writes = []
2856
        self.responder = protocol.ProtocolThreeResponder(self.writes.append)
2857
2858
    def assertWriteCount(self, expected_count):
2859
        self.assertEqual(
2860
            expected_count, len(self.writes),
2861
            "Too many writes: %r" % (self.writes,))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2862
3441.3.1 by Andrew Bennetts
Buffer encoding of v3 messages to minimise write/send calls. Doubles the speed of pushing over TCP with 500ms latency loopback.
2863
    def test_send_error_writes_just_once(self):
2864
        """An error response is written to the medium all at once."""
2865
        self.responder.send_error(Exception('An exception string.'))
2866
        self.assertWriteCount(1)
2867
2868
    def test_send_response_writes_just_once(self):
2869
        """A normal response with no body is written to the medium all at once.
2870
        """
2871
        response = _mod_request.SuccessfulSmartServerResponse(('arg', 'arg'))
2872
        self.responder.send_response(response)
2873
        self.assertWriteCount(1)
2874
2875
    def test_send_response_with_body_writes_just_once(self):
2876
        """A normal response with a monolithic body is written to the medium
2877
        all at once.
2878
        """
2879
        response = _mod_request.SuccessfulSmartServerResponse(
2880
            ('arg', 'arg'), body='body bytes')
2881
        self.responder.send_response(response)
2882
        self.assertWriteCount(1)
2883
4078.1.2 by Andrew Bennetts
Adjust write buffering tests for improved buffering.
2884
    def test_send_response_with_body_stream_buffers_writes(self):
2885
        """A normal response with a stream body writes to the medium once."""
3441.3.1 by Andrew Bennetts
Buffer encoding of v3 messages to minimise write/send calls. Doubles the speed of pushing over TCP with 500ms latency loopback.
2886
        # Construct a response with stream with 2 chunks in it.
2887
        response = _mod_request.SuccessfulSmartServerResponse(
2888
            ('arg', 'arg'), body_stream=['chunk1', 'chunk2'])
2889
        self.responder.send_response(response)
4078.1.2 by Andrew Bennetts
Adjust write buffering tests for improved buffering.
2890
        # We will write just once, despite the multiple chunks, due to
2891
        # buffering.
2892
        self.assertWriteCount(1)
2893
2894
    def test_send_response_with_body_stream_flushes_buffers_sometimes(self):
2895
        """When there are many chunks (>100), multiple writes will occur rather
2896
        than buffering indefinitely.
2897
        """
2898
        # Construct a response with stream with 40 chunks in it.  Every chunk
2899
        # triggers 3 buffered writes, so we expect > 100 buffered writes, but <
2900
        # 200.
2901
        body_stream = ['chunk %d' % count for count in range(40)]
2902
        response = _mod_request.SuccessfulSmartServerResponse(
2903
            ('arg', 'arg'), body_stream=body_stream)
2904
        self.responder.send_response(response)
2905
        # The write buffer is flushed every 100 buffered writes, so we expect 2
2906
        # actual writes.
2907
        self.assertWriteCount(2)
3441.3.1 by Andrew Bennetts
Buffer encoding of v3 messages to minimise write/send calls. Doubles the speed of pushing over TCP with 500ms latency loopback.
2908
2909
2018.5.131 by Andrew Bennetts
Be strict about unicode passed to transport.put_{bytes,file} and SmartClient.call_with_body_bytes, fixing part of TestLockableFiles_RemoteLockDir.test_read_write.
2910
class TestSmartClientUnicode(tests.TestCase):
2414.1.4 by Andrew Bennetts
Rename SmartClient to _SmartClient.
2911
    """_SmartClient tests for unicode arguments.
2018.5.131 by Andrew Bennetts
Be strict about unicode passed to transport.put_{bytes,file} and SmartClient.call_with_body_bytes, fixing part of TestLockableFiles_RemoteLockDir.test_read_write.
2912
2913
    Unicode arguments to call_with_body_bytes are not correct (remote method
2914
    names, arguments, and bodies must all be expressed as byte strings), but
2414.1.4 by Andrew Bennetts
Rename SmartClient to _SmartClient.
2915
    _SmartClient should gracefully reject them, rather than getting into a
2916
    broken state that prevents future correct calls from working.  That is, it
2917
    should be possible to issue more requests on the medium afterwards, rather
2918
    than allowing one bad call to call_with_body_bytes to cause later calls to
2018.5.131 by Andrew Bennetts
Be strict about unicode passed to transport.put_{bytes,file} and SmartClient.call_with_body_bytes, fixing part of TestLockableFiles_RemoteLockDir.test_read_write.
2919
    mysteriously fail with TooManyConcurrentRequests.
2920
    """
2921
2922
    def assertCallDoesNotBreakMedium(self, method, args, body):
2923
        """Call a medium with the given method, args and body, then assert that
2924
        the medium is left in a sane state, i.e. is capable of allowing further
2925
        requests.
2926
        """
2927
        input = StringIO("\n")
2928
        output = StringIO()
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
2929
        client_medium = medium.SmartSimplePipesClientMedium(
2930
            input, output, 'ignored base')
3431.3.2 by Andrew Bennetts
Remove 'base' from _SmartClient entirely, now that the medium has it.
2931
        smart_client = client._SmartClient(client_medium)
2018.5.131 by Andrew Bennetts
Be strict about unicode passed to transport.put_{bytes,file} and SmartClient.call_with_body_bytes, fixing part of TestLockableFiles_RemoteLockDir.test_read_write.
2932
        self.assertRaises(TypeError,
2933
            smart_client.call_with_body_bytes, method, args, body)
2934
        self.assertEqual("", output.getvalue())
2935
        self.assertEqual(None, client_medium._current_request)
2936
2937
    def test_call_with_body_bytes_unicode_method(self):
2938
        self.assertCallDoesNotBreakMedium(u'method', ('args',), 'body')
2939
2940
    def test_call_with_body_bytes_unicode_args(self):
2941
        self.assertCallDoesNotBreakMedium('method', (u'args',), 'body')
2414.1.2 by Andrew Bennetts
Deal with review comments.
2942
        self.assertCallDoesNotBreakMedium('method', ('arg1', u'arg2'), 'body')
2018.5.131 by Andrew Bennetts
Be strict about unicode passed to transport.put_{bytes,file} and SmartClient.call_with_body_bytes, fixing part of TestLockableFiles_RemoteLockDir.test_read_write.
2943
2944
    def test_call_with_body_bytes_unicode_body(self):
2945
        self.assertCallDoesNotBreakMedium('method', ('args',), u'body')
2946
2947
3453.4.4 by Andrew Bennetts
Small optimisation: don't bother trying RPCs from >= 1.6 if the server doesn't support protocol v3.
2948
class MockMedium(medium.SmartClientMedium):
3245.4.45 by Andrew Bennetts
Improve documentation of MockMedium.
2949
    """A mock medium that can be used to test _SmartClient.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2950
3245.4.45 by Andrew Bennetts
Improve documentation of MockMedium.
2951
    It can be given a series of requests to expect (and responses it should
2952
    return for them).  It can also be told when the client is expected to
2953
    disconnect a medium.  Expectations must be satisfied in the order they are
2954
    given, or else an AssertionError will be raised.
2955
2956
    Typical use looks like::
2957
2958
        medium = MockMedium()
2959
        medium.expect_request(...)
2960
        medium.expect_request(...)
2961
        medium.expect_request(...)
2962
    """
2963
2964
    def __init__(self):
3453.4.4 by Andrew Bennetts
Small optimisation: don't bother trying RPCs from >= 1.6 if the server doesn't support protocol v3.
2965
        super(MockMedium, self).__init__('dummy base')
3245.4.45 by Andrew Bennetts
Improve documentation of MockMedium.
2966
        self._mock_request = _MockMediumRequest(self)
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
2967
        self._expected_events = []
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2968
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
2969
    def expect_request(self, request_bytes, response_bytes,
2970
                       allow_partial_read=False):
3245.4.45 by Andrew Bennetts
Improve documentation of MockMedium.
2971
        """Expect 'request_bytes' to be sent, and reply with 'response_bytes'.
2972
2973
        No assumption is made about how many times accept_bytes should be
2974
        called to send the request.  Similarly, no assumption is made about how
2975
        many times read_bytes/read_line are called by protocol code to read a
2976
        response.  e.g.::
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2977
3245.4.45 by Andrew Bennetts
Improve documentation of MockMedium.
2978
            request.accept_bytes('ab')
2979
            request.accept_bytes('cd')
2980
            request.finished_writing()
2981
2982
        and::
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2983
3245.4.45 by Andrew Bennetts
Improve documentation of MockMedium.
2984
            request.accept_bytes('abcd')
2985
            request.finished_writing()
2986
2987
        Will both satisfy ``medium.expect_request('abcd', ...)``.  Thus tests
2988
        using this should not break due to irrelevant changes in protocol
2989
        implementations.
2990
2991
        :param allow_partial_read: if True, no assertion is raised if a
2992
            response is not fully read.  Setting this is useful when the client
2993
            is expected to disconnect without needing to read the complete
2994
            response.  Default is False.
2995
        """
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
2996
        self._expected_events.append(('send request', request_bytes))
2997
        if allow_partial_read:
2998
            self._expected_events.append(
2999
                ('read response (partial)', response_bytes))
3000
        else:
3001
            self._expected_events.append(('read response', response_bytes))
3002
3003
    def expect_disconnect(self):
3245.4.45 by Andrew Bennetts
Improve documentation of MockMedium.
3004
        """Expect the client to call ``medium.disconnect()``."""
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3005
        self._expected_events.append('disconnect')
3006
3245.4.45 by Andrew Bennetts
Improve documentation of MockMedium.
3007
    def _assertEvent(self, observed_event):
3008
        """Raise AssertionError unless observed_event matches the next expected
3009
        event.
3010
3011
        :seealso: expect_request
3012
        :seealso: expect_disconnect
3013
        """
3245.4.44 by Andrew Bennetts
Remove auto-detection of protocol v1; it's complex and there's a high risk of false positives. Also remove unused mock object.
3014
        try:
3015
            expected_event = self._expected_events.pop(0)
3016
        except IndexError:
3017
            raise AssertionError(
3018
                'Mock medium observed event %r, but no more events expected'
3019
                % (observed_event,))
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3020
        if expected_event[0] == 'read response (partial)':
3021
            if observed_event[0] != 'read response':
3022
                raise AssertionError(
3023
                    'Mock medium observed event %r, but expected event %r'
3024
                    % (observed_event, expected_event))
3025
        elif observed_event != expected_event:
3026
            raise AssertionError(
3027
                'Mock medium observed event %r, but expected event %r'
3028
                % (observed_event, expected_event))
3029
        if self._expected_events:
3030
            next_event = self._expected_events[0]
3031
            if next_event[0].startswith('read response'):
3032
                self._mock_request._response = next_event[1]
3033
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
3034
    def get_request(self):
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3035
        return self._mock_request
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
3036
3037
    def disconnect(self):
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3038
        if self._mock_request._read_bytes:
3245.4.45 by Andrew Bennetts
Improve documentation of MockMedium.
3039
            self._assertEvent(('read response', self._mock_request._read_bytes))
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3040
            self._mock_request._read_bytes = ''
3245.4.45 by Andrew Bennetts
Improve documentation of MockMedium.
3041
        self._assertEvent('disconnect')
3042
3043
3044
class _MockMediumRequest(object):
3045
    """A mock ClientMediumRequest used by MockMedium."""
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
3046
3047
    def __init__(self, mock_medium):
3048
        self._medium = mock_medium
3049
        self._written_bytes = ''
3050
        self._read_bytes = ''
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3051
        self._response = None
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
3052
3053
    def accept_bytes(self, bytes):
3054
        self._written_bytes += bytes
3055
3056
    def finished_writing(self):
3245.4.45 by Andrew Bennetts
Improve documentation of MockMedium.
3057
        self._medium._assertEvent(('send request', self._written_bytes))
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
3058
        self._written_bytes = ''
3059
3060
    def finished_reading(self):
3245.4.45 by Andrew Bennetts
Improve documentation of MockMedium.
3061
        self._medium._assertEvent(('read response', self._read_bytes))
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
3062
        self._read_bytes = ''
3063
3064
    def read_bytes(self, size):
3065
        resp = self._response
3066
        bytes, resp = resp[:size], resp[size:]
3067
        self._response = resp
3068
        self._read_bytes += bytes
3069
        return bytes
3070
3071
    def read_line(self):
3072
        resp = self._response
3073
        try:
3074
            line, resp = resp.split('\n', 1)
3075
            line += '\n'
3076
        except ValueError:
3077
            line, resp = resp, ''
3078
        self._response = resp
3079
        self._read_bytes += line
3080
        return line
3081
3082
3083
class Test_SmartClientVersionDetection(tests.TestCase):
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3084
    """Tests for _SmartClient's automatic protocol version detection.
3085
3086
    On the first remote call, _SmartClient will keep retrying the request with
3087
    different protocol versions until it finds one that works.
3088
    """
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
3089
3090
    def test_version_three_server(self):
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3091
        """With a protocol 3 server, only one request is needed."""
3092
        medium = MockMedium()
3431.3.2 by Andrew Bennetts
Remove 'base' from _SmartClient entirely, now that the medium has it.
3093
        smart_client = client._SmartClient(medium, headers={})
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3094
        message_start = protocol.MESSAGE_VERSION_THREE + '\x00\x00\x00\x02de'
3095
        medium.expect_request(
3096
            message_start +
3097
            's\x00\x00\x00\x1el11:method-name5:arg 15:arg 2ee',
3098
            message_start + 's\0\0\0\x13l14:response valueee')
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
3099
        result = smart_client.call('method-name', 'arg 1', 'arg 2')
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3100
        # The call succeeded without raising any exceptions from the mock
3101
        # medium, and the smart_client returns the response from the server.
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
3102
        self.assertEqual(('response value',), result)
3245.4.44 by Andrew Bennetts
Remove auto-detection of protocol v1; it's complex and there's a high risk of false positives. Also remove unused mock object.
3103
        self.assertEqual([], medium._expected_events)
3453.4.4 by Andrew Bennetts
Small optimisation: don't bother trying RPCs from >= 1.6 if the server doesn't support protocol v3.
3104
        # Also, the v3 works then the server should be assumed to support RPCs
3105
        # introduced in 1.6.
3453.4.10 by Andrew Bennetts
Change _is_remote_at_least to _is_remote_before.
3106
        self.assertFalse(medium._is_remote_before((1, 6)))
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
3107
3108
    def test_version_two_server(self):
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3109
        """If the server only speaks protocol 2, the client will first try
3110
        version 3, then fallback to protocol 2.
3111
3112
        Further, _SmartClient caches the detection, so future requests will all
3113
        use protocol 2 immediately.
3114
        """
3115
        medium = MockMedium()
3431.3.2 by Andrew Bennetts
Remove 'base' from _SmartClient entirely, now that the medium has it.
3116
        smart_client = client._SmartClient(medium, headers={})
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3117
        # First the client should send a v3 request, but the server will reply
3118
        # with a v2 error.
3119
        medium.expect_request(
3245.4.60 by Andrew Bennetts
Update the protocol v3 version string to say 'bzr 1.6'.
3120
            'bzr message 3 (bzr 1.6)\n\x00\x00\x00\x02de' +
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3121
            's\x00\x00\x00\x1el11:method-name5:arg 15:arg 2ee',
3122
            'bzr response 2\nfailed\n\n')
3123
        # So then the client should disconnect to reset the connection, because
3124
        # the client needs to assume the server cannot read any further
3125
        # requests off the original connection.
3126
        medium.expect_disconnect()
3127
        # The client should then retry the original request in v2
3128
        medium.expect_request(
3129
            'bzr request 2\nmethod-name\x01arg 1\x01arg 2\n',
3130
            'bzr response 2\nsuccess\nresponse value\n')
3131
        result = smart_client.call('method-name', 'arg 1', 'arg 2')
3132
        # The smart_client object will return the result of the successful
3133
        # query.
3134
        self.assertEqual(('response value',), result)
3135
3136
        # Now try another request, and this time the client will just use
3137
        # protocol 2.  (i.e. the autodetection won't be repeated)
3138
        medium.expect_request(
3139
            'bzr request 2\nanother-method\n',
3140
            'bzr response 2\nsuccess\nanother response\n')
3141
        result = smart_client.call('another-method')
3142
        self.assertEqual(('another response',), result)
3245.4.44 by Andrew Bennetts
Remove auto-detection of protocol v1; it's complex and there's a high risk of false positives. Also remove unused mock object.
3143
        self.assertEqual([], medium._expected_events)
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3144
3453.4.4 by Andrew Bennetts
Small optimisation: don't bother trying RPCs from >= 1.6 if the server doesn't support protocol v3.
3145
        # Also, because v3 is not supported, the client medium should assume
3146
        # that RPCs introduced in 1.6 aren't supported either.
3453.4.10 by Andrew Bennetts
Change _is_remote_at_least to _is_remote_before.
3147
        self.assertTrue(medium._is_remote_before((1, 6)))
3453.4.4 by Andrew Bennetts
Small optimisation: don't bother trying RPCs from >= 1.6 if the server doesn't support protocol v3.
3148
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3149
    def test_unknown_version(self):
3245.4.44 by Andrew Bennetts
Remove auto-detection of protocol v1; it's complex and there's a high risk of false positives. Also remove unused mock object.
3150
        """If the server does not use any known (or at least supported)
3151
        protocol version, a SmartProtocolError is raised.
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3152
        """
3153
        medium = MockMedium()
3431.3.2 by Andrew Bennetts
Remove 'base' from _SmartClient entirely, now that the medium has it.
3154
        smart_client = client._SmartClient(medium, headers={})
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3155
        unknown_protocol_bytes = 'Unknown protocol!'
3245.4.44 by Andrew Bennetts
Remove auto-detection of protocol v1; it's complex and there's a high risk of false positives. Also remove unused mock object.
3156
        # The client will try v3 and v2 before eventually giving up.
3157
        medium.expect_request(
3245.4.60 by Andrew Bennetts
Update the protocol v3 version string to say 'bzr 1.6'.
3158
            'bzr message 3 (bzr 1.6)\n\x00\x00\x00\x02de' +
3245.4.44 by Andrew Bennetts
Remove auto-detection of protocol v1; it's complex and there's a high risk of false positives. Also remove unused mock object.
3159
            's\x00\x00\x00\x1el11:method-name5:arg 15:arg 2ee',
3160
            unknown_protocol_bytes)
3161
        medium.expect_disconnect()
3162
        medium.expect_request(
3163
            'bzr request 2\nmethod-name\x01arg 1\x01arg 2\n',
3164
            unknown_protocol_bytes)
3165
        medium.expect_disconnect()
3166
        self.assertRaises(
3167
            errors.SmartProtocolError,
3168
            smart_client.call, 'method-name', 'arg 1', 'arg 2')
3169
        self.assertEqual([], medium._expected_events)
3461.2.1 by Andrew Bennetts
Avoid unnecessary reconnections to old servers when the first HPSS is an error in the right protocol version.
3170
3171
    def test_first_response_is_error(self):
3172
        """If the server replies with an error, then the version detection
3173
        should be complete.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3174
3461.2.1 by Andrew Bennetts
Avoid unnecessary reconnections to old servers when the first HPSS is an error in the right protocol version.
3175
        This test is very similar to test_version_two_server, but catches a bug
3176
        we had in the case where the first reply was an error response.
3177
        """
3178
        medium = MockMedium()
3179
        smart_client = client._SmartClient(medium, headers={})
3180
        message_start = protocol.MESSAGE_VERSION_THREE + '\x00\x00\x00\x02de'
3181
        # Issue a request that gets an error reply in a non-default protocol
3182
        # version.
3183
        medium.expect_request(
3184
            message_start +
3185
            's\x00\x00\x00\x10l11:method-nameee',
3186
            'bzr response 2\nfailed\n\n')
3187
        medium.expect_disconnect()
3188
        medium.expect_request(
3189
            'bzr request 2\nmethod-name\n',
3190
            'bzr response 2\nfailed\nFooBarError\n')
3191
        err = self.assertRaises(
3192
            errors.ErrorFromSmartServer,
3193
            smart_client.call, 'method-name')
3194
        self.assertEqual(('FooBarError',), err.error_tuple)
3195
        # Now the medium should have remembered the protocol version, so
3196
        # subsequent requests will use the remembered version immediately.
3197
        medium.expect_request(
3198
            'bzr request 2\nmethod-name\n',
3199
            'bzr response 2\nsuccess\nresponse value\n')
3200
        result = smart_client.call('method-name')
3201
        self.assertEqual(('response value',), result)
3202
        self.assertEqual([], medium._expected_events)
3203
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
3204
3205
class Test_SmartClient(tests.TestCase):
3206
3207
    def test_call_default_headers(self):
3208
        """ProtocolThreeRequester.call by default sends a 'Software
3209
        version' header.
3210
        """
3431.3.4 by Andrew Bennetts
Revert now unnecessary test change from bzr.dev.
3211
        smart_client = client._SmartClient('dummy medium')
3245.4.55 by Andrew Bennetts
Test improvements suggested by John's review.
3212
        self.assertEqual(
3213
            bzrlib.__version__, smart_client._headers['Software version'])
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
3214
        # XXX: need a test that smart_client._headers is passed to the request
3215
        # encoder.
3216
3217
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3218
class LengthPrefixedBodyDecoder(tests.TestCase):
3219
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3220
    # XXX: TODO: make accept_reading_trailer invoke translate_response or
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
3221
    # something similar to the ProtocolBase method.
3222
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3223
    def test_construct(self):
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
3224
        decoder = protocol.LengthPrefixedBodyDecoder()
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3225
        self.assertFalse(decoder.finished_reading)
2018.2.10 by Andrew Bennetts
Tidy up TODOs, further testing and fixes for SmartServerRequestProtocolOne, and remove a read_bytes(1) call.
3226
        self.assertEqual(6, decoder.next_read_size())
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3227
        self.assertEqual('', decoder.read_pending_data())
3228
        self.assertEqual('', decoder.unused_data)
3229
3230
    def test_accept_bytes(self):
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
3231
        decoder = protocol.LengthPrefixedBodyDecoder()
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3232
        decoder.accept_bytes('')
3233
        self.assertFalse(decoder.finished_reading)
2018.2.10 by Andrew Bennetts
Tidy up TODOs, further testing and fixes for SmartServerRequestProtocolOne, and remove a read_bytes(1) call.
3234
        self.assertEqual(6, decoder.next_read_size())
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3235
        self.assertEqual('', decoder.read_pending_data())
3236
        self.assertEqual('', decoder.unused_data)
3237
        decoder.accept_bytes('7')
3238
        self.assertFalse(decoder.finished_reading)
2018.2.10 by Andrew Bennetts
Tidy up TODOs, further testing and fixes for SmartServerRequestProtocolOne, and remove a read_bytes(1) call.
3239
        self.assertEqual(6, decoder.next_read_size())
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3240
        self.assertEqual('', decoder.read_pending_data())
3241
        self.assertEqual('', decoder.unused_data)
3242
        decoder.accept_bytes('\na')
3243
        self.assertFalse(decoder.finished_reading)
2018.2.10 by Andrew Bennetts
Tidy up TODOs, further testing and fixes for SmartServerRequestProtocolOne, and remove a read_bytes(1) call.
3244
        self.assertEqual(11, decoder.next_read_size())
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3245
        self.assertEqual('a', decoder.read_pending_data())
3246
        self.assertEqual('', decoder.unused_data)
3247
        decoder.accept_bytes('bcdefgd')
3248
        self.assertFalse(decoder.finished_reading)
2018.2.10 by Andrew Bennetts
Tidy up TODOs, further testing and fixes for SmartServerRequestProtocolOne, and remove a read_bytes(1) call.
3249
        self.assertEqual(4, decoder.next_read_size())
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3250
        self.assertEqual('bcdefg', decoder.read_pending_data())
3251
        self.assertEqual('', decoder.unused_data)
3252
        decoder.accept_bytes('one')
3253
        self.assertFalse(decoder.finished_reading)
2018.2.10 by Andrew Bennetts
Tidy up TODOs, further testing and fixes for SmartServerRequestProtocolOne, and remove a read_bytes(1) call.
3254
        self.assertEqual(1, decoder.next_read_size())
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3255
        self.assertEqual('', decoder.read_pending_data())
3256
        self.assertEqual('', decoder.unused_data)
3257
        decoder.accept_bytes('\nblarg')
3258
        self.assertTrue(decoder.finished_reading)
2018.2.10 by Andrew Bennetts
Tidy up TODOs, further testing and fixes for SmartServerRequestProtocolOne, and remove a read_bytes(1) call.
3259
        self.assertEqual(1, decoder.next_read_size())
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3260
        self.assertEqual('', decoder.read_pending_data())
3261
        self.assertEqual('blarg', decoder.unused_data)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3262
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3263
    def test_accept_bytes_all_at_once_with_excess(self):
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
3264
        decoder = protocol.LengthPrefixedBodyDecoder()
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3265
        decoder.accept_bytes('1\nadone\nunused')
3266
        self.assertTrue(decoder.finished_reading)
2018.2.10 by Andrew Bennetts
Tidy up TODOs, further testing and fixes for SmartServerRequestProtocolOne, and remove a read_bytes(1) call.
3267
        self.assertEqual(1, decoder.next_read_size())
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3268
        self.assertEqual('a', decoder.read_pending_data())
3269
        self.assertEqual('unused', decoder.unused_data)
3270
3271
    def test_accept_bytes_exact_end_of_body(self):
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
3272
        decoder = protocol.LengthPrefixedBodyDecoder()
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3273
        decoder.accept_bytes('1\na')
3274
        self.assertFalse(decoder.finished_reading)
2018.2.10 by Andrew Bennetts
Tidy up TODOs, further testing and fixes for SmartServerRequestProtocolOne, and remove a read_bytes(1) call.
3275
        self.assertEqual(5, decoder.next_read_size())
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3276
        self.assertEqual('a', decoder.read_pending_data())
3277
        self.assertEqual('', decoder.unused_data)
3278
        decoder.accept_bytes('done\n')
3279
        self.assertTrue(decoder.finished_reading)
2018.2.10 by Andrew Bennetts
Tidy up TODOs, further testing and fixes for SmartServerRequestProtocolOne, and remove a read_bytes(1) call.
3280
        self.assertEqual(1, decoder.next_read_size())
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3281
        self.assertEqual('', decoder.read_pending_data())
3282
        self.assertEqual('', decoder.unused_data)
3283
3284
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3285
class TestChunkedBodyDecoder(tests.TestCase):
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
3286
    """Tests for ChunkedBodyDecoder.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3287
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
3288
    This is the body decoder used for protocol version two.
3289
    """
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3290
3291
    def test_construct(self):
3292
        decoder = protocol.ChunkedBodyDecoder()
3293
        self.assertFalse(decoder.finished_reading)
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
3294
        self.assertEqual(8, decoder.next_read_size())
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
3295
        self.assertEqual(None, decoder.read_next_chunk())
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3296
        self.assertEqual('', decoder.unused_data)
3297
3298
    def test_empty_content(self):
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
3299
        """'chunked\nEND\n' is the complete encoding of a zero-length body.
3300
        """
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3301
        decoder = protocol.ChunkedBodyDecoder()
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
3302
        decoder.accept_bytes('chunked\n')
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
3303
        decoder.accept_bytes('END\n')
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3304
        self.assertTrue(decoder.finished_reading)
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
3305
        self.assertEqual(None, decoder.read_next_chunk())
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3306
        self.assertEqual('', decoder.unused_data)
3307
3308
    def test_one_chunk(self):
3309
        """A body in a single chunk is decoded correctly."""
3310
        decoder = protocol.ChunkedBodyDecoder()
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
3311
        decoder.accept_bytes('chunked\n')
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3312
        chunk_length = 'f\n'
3313
        chunk_content = '123456789abcdef'
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
3314
        finish = 'END\n'
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3315
        decoder.accept_bytes(chunk_length + chunk_content + finish)
3316
        self.assertTrue(decoder.finished_reading)
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
3317
        self.assertEqual(chunk_content, decoder.read_next_chunk())
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3318
        self.assertEqual('', decoder.unused_data)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3319
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3320
    def test_incomplete_chunk(self):
3321
        """When there are less bytes in the chunk than declared by the length,
3322
        then we haven't finished reading yet.
3323
        """
3324
        decoder = protocol.ChunkedBodyDecoder()
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
3325
        decoder.accept_bytes('chunked\n')
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3326
        chunk_length = '8\n'
3327
        three_bytes = '123'
3328
        decoder.accept_bytes(chunk_length + three_bytes)
3329
        self.assertFalse(decoder.finished_reading)
3330
        self.assertEqual(
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
3331
            5 + 4, decoder.next_read_size(),
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3332
            "The next_read_size hint should be the number of missing bytes in "
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
3333
            "this chunk plus 4 (the length of the end-of-body marker: "
3334
            "'END\\n')")
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
3335
        self.assertEqual(None, decoder.read_next_chunk())
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3336
3337
    def test_incomplete_length(self):
3338
        """A chunk length hasn't been read until a newline byte has been read.
3339
        """
3340
        decoder = protocol.ChunkedBodyDecoder()
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
3341
        decoder.accept_bytes('chunked\n')
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3342
        decoder.accept_bytes('9')
3343
        self.assertEqual(
3344
            1, decoder.next_read_size(),
3345
            "The next_read_size hint should be 1, because we don't know the "
3346
            "length yet.")
3347
        decoder.accept_bytes('\n')
3348
        self.assertEqual(
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
3349
            9 + 4, decoder.next_read_size(),
3350
            "The next_read_size hint should be the length of the chunk plus 4 "
3351
            "(the length of the end-of-body marker: 'END\\n')")
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3352
        self.assertFalse(decoder.finished_reading)
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
3353
        self.assertEqual(None, decoder.read_next_chunk())
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3354
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
3355
    def test_two_chunks(self):
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3356
        """Content from multiple chunks is concatenated."""
3357
        decoder = protocol.ChunkedBodyDecoder()
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
3358
        decoder.accept_bytes('chunked\n')
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3359
        chunk_one = '3\naaa'
3360
        chunk_two = '5\nbbbbb'
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
3361
        finish = 'END\n'
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3362
        decoder.accept_bytes(chunk_one + chunk_two + finish)
3363
        self.assertTrue(decoder.finished_reading)
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
3364
        self.assertEqual('aaa', decoder.read_next_chunk())
3365
        self.assertEqual('bbbbb', decoder.read_next_chunk())
3366
        self.assertEqual(None, decoder.read_next_chunk())
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3367
        self.assertEqual('', decoder.unused_data)
3368
3369
    def test_excess_bytes(self):
3370
        """Bytes after the chunked body are reported as unused bytes."""
3371
        decoder = protocol.ChunkedBodyDecoder()
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
3372
        decoder.accept_bytes('chunked\n')
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
3373
        chunked_body = "5\naaaaaEND\n"
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3374
        excess_bytes = "excess bytes"
3375
        decoder.accept_bytes(chunked_body + excess_bytes)
3376
        self.assertTrue(decoder.finished_reading)
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
3377
        self.assertEqual('aaaaa', decoder.read_next_chunk())
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3378
        self.assertEqual(excess_bytes, decoder.unused_data)
3379
        self.assertEqual(
3380
            1, decoder.next_read_size(),
3381
            "next_read_size hint should be 1 when finished_reading.")
3382
3383
    def test_multidigit_length(self):
3384
        """Lengths in the chunk prefixes can have multiple digits."""
3385
        decoder = protocol.ChunkedBodyDecoder()
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
3386
        decoder.accept_bytes('chunked\n')
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3387
        length = 0x123
3388
        chunk_prefix = hex(length) + '\n'
3389
        chunk_bytes = 'z' * length
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
3390
        finish = 'END\n'
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3391
        decoder.accept_bytes(chunk_prefix + chunk_bytes + finish)
3392
        self.assertTrue(decoder.finished_reading)
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
3393
        self.assertEqual(chunk_bytes, decoder.read_next_chunk())
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3394
3395
    def test_byte_at_a_time(self):
3396
        """A complete body fed to the decoder one byte at a time should not
3397
        confuse the decoder.  That is, it should give the same result as if the
3398
        bytes had been received in one batch.
3399
3400
        This test is the same as test_one_chunk apart from the way accept_bytes
3401
        is called.
3402
        """
3403
        decoder = protocol.ChunkedBodyDecoder()
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
3404
        decoder.accept_bytes('chunked\n')
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3405
        chunk_length = 'f\n'
3406
        chunk_content = '123456789abcdef'
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
3407
        finish = 'END\n'
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3408
        for byte in (chunk_length + chunk_content + finish):
3409
            decoder.accept_bytes(byte)
3410
        self.assertTrue(decoder.finished_reading)
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
3411
        self.assertEqual(chunk_content, decoder.read_next_chunk())
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3412
        self.assertEqual('', decoder.unused_data)
3413
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
3414
    def test_read_pending_data_resets(self):
3415
        """read_pending_data does not return the same bytes twice."""
3416
        decoder = protocol.ChunkedBodyDecoder()
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
3417
        decoder.accept_bytes('chunked\n')
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
3418
        chunk_one = '3\naaa'
3419
        chunk_two = '3\nbbb'
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
3420
        finish = 'END\n'
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
3421
        decoder.accept_bytes(chunk_one)
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
3422
        self.assertEqual('aaa', decoder.read_next_chunk())
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
3423
        decoder.accept_bytes(chunk_two)
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
3424
        self.assertEqual('bbb', decoder.read_next_chunk())
3425
        self.assertEqual(None, decoder.read_next_chunk())
3426
3427
    def test_decode_error(self):
3428
        decoder = protocol.ChunkedBodyDecoder()
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
3429
        decoder.accept_bytes('chunked\n')
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
3430
        chunk_one = 'b\nfirst chunk'
2748.4.6 by Andrew Bennetts
Use chunks for stream errors, rather than the response tuple format.
3431
        error_signal = 'ERR\n'
3432
        error_chunks = '5\npart1' + '5\npart2'
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
3433
        finish = 'END\n'
2748.4.6 by Andrew Bennetts
Use chunks for stream errors, rather than the response tuple format.
3434
        decoder.accept_bytes(chunk_one + error_signal + error_chunks + finish)
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
3435
        self.assertTrue(decoder.finished_reading)
3436
        self.assertEqual('first chunk', decoder.read_next_chunk())
2692.1.2 by Andrew Bennetts
Merge from bzr.dev.
3437
        expected_failure = _mod_request.FailedSmartServerResponse(
2748.4.6 by Andrew Bennetts
Use chunks for stream errors, rather than the response tuple format.
3438
            ('part1', 'part2'))
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
3439
        self.assertEqual(expected_failure, decoder.read_next_chunk())
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
3440
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
3441
    def test_bad_header(self):
3442
        """accept_bytes raises a SmartProtocolError if a chunked body does not
3443
        start with the right header.
3444
        """
3445
        decoder = protocol.ChunkedBodyDecoder()
3446
        self.assertRaises(
3447
            errors.SmartProtocolError, decoder.accept_bytes, 'bad header\n')
3448
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3449
2432.4.1 by Robert Collins
Add SuccessfulSmartServerResponse.
3450
class TestSuccessfulSmartServerResponse(tests.TestCase):
3451
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
3452
    def test_construct_no_body(self):
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
3453
        response = _mod_request.SuccessfulSmartServerResponse(('foo', 'bar'))
2432.4.1 by Robert Collins
Add SuccessfulSmartServerResponse.
3454
        self.assertEqual(('foo', 'bar'), response.args)
3455
        self.assertEqual(None, response.body)
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
3456
3457
    def test_construct_with_body(self):
2692.1.2 by Andrew Bennetts
Merge from bzr.dev.
3458
        response = _mod_request.SuccessfulSmartServerResponse(('foo', 'bar'),
3459
                                                              'bytes')
2432.4.1 by Robert Collins
Add SuccessfulSmartServerResponse.
3460
        self.assertEqual(('foo', 'bar'), response.args)
3461
        self.assertEqual('bytes', response.body)
2781.2.1 by Andrew Bennetts
Fix SmartServerResponse.__repr__.
3462
        # repr(response) doesn't trigger exceptions.
3463
        repr(response)
2432.4.1 by Robert Collins
Add SuccessfulSmartServerResponse.
3464
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
3465
    def test_construct_with_body_stream(self):
3466
        bytes_iterable = ['abc']
2692.1.2 by Andrew Bennetts
Merge from bzr.dev.
3467
        response = _mod_request.SuccessfulSmartServerResponse(
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
3468
            ('foo', 'bar'), body_stream=bytes_iterable)
3469
        self.assertEqual(('foo', 'bar'), response.args)
3470
        self.assertEqual(bytes_iterable, response.body_stream)
3471
3472
    def test_construct_rejects_body_and_body_stream(self):
3473
        """'body' and 'body_stream' are mutually exclusive."""
3474
        self.assertRaises(
3475
            errors.BzrError,
2692.1.2 by Andrew Bennetts
Merge from bzr.dev.
3476
            _mod_request.SuccessfulSmartServerResponse, (), 'body', ['stream'])
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
3477
2432.4.1 by Robert Collins
Add SuccessfulSmartServerResponse.
3478
    def test_is_successful(self):
3479
        """is_successful should return True for SuccessfulSmartServerResponse."""
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
3480
        response = _mod_request.SuccessfulSmartServerResponse(('error',))
2432.4.1 by Robert Collins
Add SuccessfulSmartServerResponse.
3481
        self.assertEqual(True, response.is_successful())
3482
3483
2432.4.2 by Robert Collins
Add FailedSmartServerResponse.
3484
class TestFailedSmartServerResponse(tests.TestCase):
3485
3486
    def test_construct(self):
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
3487
        response = _mod_request.FailedSmartServerResponse(('foo', 'bar'))
2432.4.2 by Robert Collins
Add FailedSmartServerResponse.
3488
        self.assertEqual(('foo', 'bar'), response.args)
3489
        self.assertEqual(None, response.body)
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
3490
        response = _mod_request.FailedSmartServerResponse(('foo', 'bar'), 'bytes')
2432.4.2 by Robert Collins
Add FailedSmartServerResponse.
3491
        self.assertEqual(('foo', 'bar'), response.args)
3492
        self.assertEqual('bytes', response.body)
2781.2.1 by Andrew Bennetts
Fix SmartServerResponse.__repr__.
3493
        # repr(response) doesn't trigger exceptions.
3494
        repr(response)
2432.4.2 by Robert Collins
Add FailedSmartServerResponse.
3495
3496
    def test_is_successful(self):
3497
        """is_successful should return False for FailedSmartServerResponse."""
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
3498
        response = _mod_request.FailedSmartServerResponse(('error',))
2432.4.2 by Robert Collins
Add FailedSmartServerResponse.
3499
        self.assertEqual(False, response.is_successful())
3500
2432.4.1 by Robert Collins
Add SuccessfulSmartServerResponse.
3501
2018.2.6 by Andrew Bennetts
HTTP client starting to work (pycurl for the moment).
3502
class FakeHTTPMedium(object):
3503
    def __init__(self):
3504
        self.written_request = None
3505
        self._current_request = None
2018.2.8 by Andrew Bennetts
Make HttpTransportBase.get_smart_client return self again.
3506
    def send_http_smart_request(self, bytes):
2018.2.6 by Andrew Bennetts
HTTP client starting to work (pycurl for the moment).
3507
        self.written_request = bytes
3508
        return None
3509
3510
3111.1.25 by Vincent Ladeuil
Fix the smart server failing test and use it against protocol combinations.
3511
class HTTPTunnellingSmokeTest(tests.TestCase):
3512
2018.5.24 by Andrew Bennetts
Setting NO_SMART_VFS in environment will disable VFS methods in the smart server. (Robert Collins, John Arbash Meinel, Andrew Bennetts)
3513
    def setUp(self):
3514
        super(HTTPTunnellingSmokeTest, self).setUp()
3515
        # We use the VFS layer as part of HTTP tunnelling tests.
2402.1.2 by Andrew Bennetts
Deal with review comments.
3516
        self._captureVar('BZR_NO_SMART_VFS', None)
2018.5.24 by Andrew Bennetts
Setting NO_SMART_VFS in environment will disable VFS methods in the smart server. (Robert Collins, John Arbash Meinel, Andrew Bennetts)
3517
2018.2.6 by Andrew Bennetts
HTTP client starting to work (pycurl for the moment).
3518
    def test_smart_http_medium_request_accept_bytes(self):
3519
        medium = FakeHTTPMedium()
2018.2.8 by Andrew Bennetts
Make HttpTransportBase.get_smart_client return self again.
3520
        request = SmartClientHTTPMediumRequest(medium)
2018.2.6 by Andrew Bennetts
HTTP client starting to work (pycurl for the moment).
3521
        request.accept_bytes('abc')
3522
        request.accept_bytes('def')
3523
        self.assertEqual(None, medium.written_request)
3524
        request.finished_writing()
3525
        self.assertEqual('abcdef', medium.written_request)
3526
2018.5.26 by Andrew Bennetts
Extract a simple SmartClient class from RemoteTransport, and a hack to avoid VFS operations when probing for a bzrdir over a smart transport.
3527
2208.4.4 by Andrew Bennetts
Merge bzr.dev.
3528
class RemoteHTTPTransportTestCase(tests.TestCase):
2208.4.2 by Andrew Bennetts
Always POST to the same .bzr/smart URL for a given branch, even when accessing files in subdirectories.
3529
2208.4.3 by Andrew Bennetts
Let SmartHTTPTransport.clone('..') continue to POST to the cloned URL (unlike clone('child')).
3530
    def test_remote_path_after_clone_child(self):
2208.4.2 by Andrew Bennetts
Always POST to the same .bzr/smart URL for a given branch, even when accessing files in subdirectories.
3531
        # If a user enters "bzr+http://host/foo", we want to sent all smart
2208.4.3 by Andrew Bennetts
Let SmartHTTPTransport.clone('..') continue to POST to the cloned URL (unlike clone('child')).
3532
        # requests for child URLs of that to the original URL.  i.e., we want to
3533
        # POST to "bzr+http://host/foo/.bzr/smart" and never something like
3534
        # "bzr+http://host/foo/.bzr/branch/.bzr/smart".  So, a cloned
3878.4.6 by Vincent Ladeuil
Fix bug #270863 by preserving 'bzr+http[s]' decorator.
3535
        # RemoteHTTPTransport remembers the initial URL, and adjusts the
3536
        # relpaths it sends in smart requests accordingly.
2208.4.4 by Andrew Bennetts
Merge bzr.dev.
3537
        base_transport = remote.RemoteHTTPTransport('bzr+http://host/path')
2208.4.2 by Andrew Bennetts
Always POST to the same .bzr/smart URL for a given branch, even when accessing files in subdirectories.
3538
        new_transport = base_transport.clone('child_dir')
2208.4.3 by Andrew Bennetts
Let SmartHTTPTransport.clone('..') continue to POST to the cloned URL (unlike clone('child')).
3539
        self.assertEqual(base_transport._http_transport,
3540
                         new_transport._http_transport)
2208.4.2 by Andrew Bennetts
Always POST to the same .bzr/smart URL for a given branch, even when accessing files in subdirectories.
3541
        self.assertEqual('child_dir/foo', new_transport._remote_path('foo'))
3431.3.8 by Andrew Bennetts
Add two tests that fail without the fixes in this branch.
3542
        self.assertEqual(
3543
            'child_dir/',
3544
            new_transport._client.remote_path_from_transport(new_transport))
2208.4.3 by Andrew Bennetts
Let SmartHTTPTransport.clone('..') continue to POST to the cloned URL (unlike clone('child')).
3545
2466.3.1 by Andrew Bennetts
Normalise URLs in RemoteHTTPTransport before doing URL calculations to fix bad results.
3546
    def test_remote_path_unnormal_base(self):
3547
        # If the transport's base isn't normalised, the _remote_path should
3548
        # still be calculated correctly.
3549
        base_transport = remote.RemoteHTTPTransport('bzr+http://host/%7Ea/b')
3550
        self.assertEqual('c', base_transport._remote_path('c'))
3551
3552
    def test_clone_unnormal_base(self):
3553
        # If the transport's base isn't normalised, cloned transports should
3554
        # still work correctly.
3555
        base_transport = remote.RemoteHTTPTransport('bzr+http://host/%7Ea/b')
3556
        new_transport = base_transport.clone('c')
4505.3.2 by Jonathan Lange
Tilde escaping changed.
3557
        self.assertEqual('bzr+http://host/~a/b/c/', new_transport.base)
3431.3.8 by Andrew Bennetts
Add two tests that fail without the fixes in this branch.
3558
        self.assertEqual(
3559
            'c/',
3560
            new_transport._client.remote_path_from_transport(new_transport))
2466.3.1 by Andrew Bennetts
Normalise URLs in RemoteHTTPTransport before doing URL calculations to fix bad results.
3561
3878.4.6 by Vincent Ladeuil
Fix bug #270863 by preserving 'bzr+http[s]' decorator.
3562
    def test__redirect_to(self):
3563
        t = remote.RemoteHTTPTransport('bzr+http://www.example.com/foo')
3564
        r = t._redirected_to('http://www.example.com/foo',
3565
                             'http://www.example.com/bar')
3566
        self.assertEquals(type(r), type(t))
3567
3568
    def test__redirect_sibling_protocol(self):
3569
        t = remote.RemoteHTTPTransport('bzr+http://www.example.com/foo')
3570
        r = t._redirected_to('http://www.example.com/foo',
3571
                             'https://www.example.com/bar')
3572
        self.assertEquals(type(r), type(t))
3573
        self.assertStartsWith(r.base, 'bzr+https')
3574
3575
    def test__redirect_to_with_user(self):
3576
        t = remote.RemoteHTTPTransport('bzr+http://joe@www.example.com/foo')
3577
        r = t._redirected_to('http://www.example.com/foo',
3578
                             'http://www.example.com/bar')
3579
        self.assertEquals(type(r), type(t))
3580
        self.assertEquals('joe', t._user)
3581
        self.assertEquals(t._user, r._user)
3582
3583
    def test_redirected_to_same_host_different_protocol(self):
3584
        t = remote.RemoteHTTPTransport('bzr+http://joe@www.example.com/foo')
3585
        r = t._redirected_to('http://www.example.com/foo',
3586
                             'ftp://www.example.com/foo')
3587
        self.assertNotEquals(type(r), type(t))
3588
3589