/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')
660
        transport.put_bytes(utf8_filename, 'contents\nof\nfile\n')
661
        to_server = StringIO('get\001' + utf8_filename + '\n')
662
        from_server = StringIO()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
663
        server = medium.SmartServerPipeStreamMedium(
2018.2.31 by Andrew Bennetts
Fix dispatching of smart server requests involving unicode paths.
664
            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
665
        smart_protocol = protocol.SmartServerRequestProtocolOne(transport,
2018.2.31 by Andrew Bennetts
Fix dispatching of smart server requests involving unicode paths.
666
                from_server.write)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
667
        server._serve_one_request(smart_protocol)
2018.2.31 by Andrew Bennetts
Fix dispatching of smart server requests involving unicode paths.
668
        self.assertEqual('ok\n'
669
                         '17\n'
670
                         'contents\nof\nfile\n'
671
                         'done\n',
672
                         from_server.getvalue())
673
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
674
    def test_pipe_like_stream_with_bulk_data(self):
675
        sample_request_bytes = 'command\n9\nbulk datadone\n'
676
        to_server = StringIO(sample_request_bytes)
677
        from_server = StringIO()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
678
        server = medium.SmartServerPipeStreamMedium(
679
            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.
680
        sample_protocol = SampleRequest(expected_bytes=sample_request_bytes)
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
681
        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.
682
        self.assertEqual('', from_server.getvalue())
683
        self.assertEqual(sample_request_bytes, sample_protocol.accepted_bytes)
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
684
        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.
685
686
    def test_socket_stream_with_bulk_data(self):
687
        sample_request_bytes = 'command\n9\nbulk datadone\n'
688
        server_sock, client_sock = self.portable_socket_pair()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
689
        server = medium.SmartServerSocketStreamMedium(
2018.2.23 by Andrew Bennetts
Clean up SmartServerStreamMedium implementations, including removing unnecessary flushes.
690
            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.
691
        sample_protocol = SampleRequest(expected_bytes=sample_request_bytes)
692
        client_sock.sendall(sample_request_bytes)
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
693
        server._serve_one_request(sample_protocol)
2018.2.23 by Andrew Bennetts
Clean up SmartServerStreamMedium implementations, including removing unnecessary flushes.
694
        server_sock.close()
695
        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.
696
        self.assertEqual(sample_request_bytes, sample_protocol.accepted_bytes)
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
697
        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.
698
699
    def test_pipe_like_stream_shutdown_detection(self):
700
        to_server = StringIO('')
701
        from_server = StringIO()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
702
        server = medium.SmartServerPipeStreamMedium(to_server, from_server, None)
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
703
        server._serve_one_request(SampleRequest('x'))
704
        self.assertTrue(server.finished)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
705
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
706
    def test_socket_stream_shutdown_detection(self):
707
        server_sock, client_sock = self.portable_socket_pair()
708
        client_sock.close()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
709
        server = medium.SmartServerSocketStreamMedium(
2018.2.23 by Andrew Bennetts
Clean up SmartServerStreamMedium implementations, including removing unnecessary flushes.
710
            server_sock, None)
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
711
        server._serve_one_request(SampleRequest('x'))
712
        self.assertTrue(server.finished)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
713
3236.3.1 by Andrew Bennetts
Fix a bug in SmartServerSocketStreamMedium._get_line, and add some asserts to catch this sort of mistake sooner.
714
    def test_socket_stream_incomplete_request(self):
715
        """The medium should still construct the right protocol version even if
716
        the initial read only reads part of the request.
717
718
        Specifically, it should correctly read the protocol version line even
719
        if the partial read doesn't end in a newline.  An older, naive
720
        implementation of _get_line in the server used to have a bug in that
721
        case.
722
        """
723
        incomplete_request_bytes = protocol.REQUEST_VERSION_TWO + 'hel'
724
        rest_of_request_bytes = 'lo\n'
725
        expected_response = (
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
726
            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.
727
        server_sock, client_sock = self.portable_socket_pair()
728
        server = medium.SmartServerSocketStreamMedium(
729
            server_sock, None)
730
        client_sock.sendall(incomplete_request_bytes)
731
        server_protocol = server._build_protocol()
732
        client_sock.sendall(rest_of_request_bytes)
733
        server._serve_one_request(server_protocol)
734
        server_sock.close()
735
        self.assertEqual(expected_response, client_sock.recv(50),
736
                         "Not a version 2 response to 'hello' request.")
737
        self.assertEqual('', client_sock.recv(1))
738
3236.3.2 by Andrew Bennetts
Fix SmartServerPipeStreamMedium._get_line too.
739
    def test_pipe_stream_incomplete_request(self):
740
        """The medium should still construct the right protocol version even if
741
        the initial read only reads part of the request.
742
743
        Specifically, it should correctly read the protocol version line even
744
        if the partial read doesn't end in a newline.  An older, naive
745
        implementation of _get_line in the server used to have a bug in that
746
        case.
747
        """
748
        incomplete_request_bytes = protocol.REQUEST_VERSION_TWO + 'hel'
749
        rest_of_request_bytes = 'lo\n'
750
        expected_response = (
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
751
            protocol.RESPONSE_VERSION_TWO + 'success\nok\x012\n')
3236.3.2 by Andrew Bennetts
Fix SmartServerPipeStreamMedium._get_line too.
752
        # Make a pair of pipes, to and from the server
753
        to_server, to_server_w = os.pipe()
754
        from_server_r, from_server = os.pipe()
755
        to_server = os.fdopen(to_server, 'r', 0)
756
        to_server_w = os.fdopen(to_server_w, 'w', 0)
757
        from_server_r = os.fdopen(from_server_r, 'r', 0)
758
        from_server = os.fdopen(from_server, 'w', 0)
759
        server = medium.SmartServerPipeStreamMedium(
760
            to_server, from_server, None)
761
        # Like test_socket_stream_incomplete_request, write an incomplete
762
        # request (that does not end in '\n') and build a protocol from it.
763
        to_server_w.write(incomplete_request_bytes)
764
        server_protocol = server._build_protocol()
765
        # Send the rest of the request, and finish serving it.
766
        to_server_w.write(rest_of_request_bytes)
767
        server._serve_one_request(server_protocol)
768
        to_server_w.close()
769
        from_server.close()
770
        self.assertEqual(expected_response, from_server_r.read(),
771
                         "Not a version 2 response to 'hello' request.")
772
        self.assertEqual('', from_server_r.read(1))
773
        from_server_r.close()
774
        to_server.close()
775
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
776
    def test_pipe_like_stream_with_two_requests(self):
777
        # If two requests are read in one go, then two calls to
778
        # _serve_one_request should still process both of them as if they had
4031.3.1 by Frank Aspell
Fixing various typos
779
        # 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.
780
        sample_request_bytes = 'command\n'
781
        to_server = StringIO(sample_request_bytes * 2)
782
        from_server = StringIO()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
783
        server = medium.SmartServerPipeStreamMedium(
784
            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.
785
        first_protocol = SampleRequest(expected_bytes=sample_request_bytes)
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
786
        server._serve_one_request(first_protocol)
2018.2.15 by Andrew Bennetts
Remove SmartServerRequestProtocolOne.finished_reading attribute, replace with next_read_size method.
787
        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.
788
        self.assertEqual('', from_server.getvalue())
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
789
        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.
790
        # Make a new protocol, call _serve_one_request with it to collect the
791
        # second request.
792
        second_protocol = SampleRequest(expected_bytes=sample_request_bytes)
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
793
        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.
794
        self.assertEqual('', from_server.getvalue())
795
        self.assertEqual(sample_request_bytes, second_protocol.accepted_bytes)
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
796
        self.assertFalse(server.finished)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
797
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
798
    def test_socket_stream_with_two_requests(self):
799
        # If two requests are read in one go, then two calls to
800
        # _serve_one_request should still process both of them as if they had
4031.3.1 by Frank Aspell
Fixing various typos
801
        # 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.
802
        sample_request_bytes = 'command\n'
803
        server_sock, client_sock = self.portable_socket_pair()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
804
        server = medium.SmartServerSocketStreamMedium(
2018.2.23 by Andrew Bennetts
Clean up SmartServerStreamMedium implementations, including removing unnecessary flushes.
805
            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.
806
        first_protocol = SampleRequest(expected_bytes=sample_request_bytes)
807
        # Put two whole requests on the wire.
808
        client_sock.sendall(sample_request_bytes * 2)
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
809
        server._serve_one_request(first_protocol)
2018.2.15 by Andrew Bennetts
Remove SmartServerRequestProtocolOne.finished_reading attribute, replace with next_read_size method.
810
        self.assertEqual(0, first_protocol.next_read_size())
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
811
        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.
812
        # Make a new protocol, call _serve_one_request with it to collect the
813
        # second request.
814
        second_protocol = SampleRequest(expected_bytes=sample_request_bytes)
815
        stream_still_open = server._serve_one_request(second_protocol)
816
        self.assertEqual(sample_request_bytes, second_protocol.accepted_bytes)
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
817
        self.assertFalse(server.finished)
2018.2.23 by Andrew Bennetts
Clean up SmartServerStreamMedium implementations, including removing unnecessary flushes.
818
        server_sock.close()
819
        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.
820
821
    def test_pipe_like_stream_error_handling(self):
822
        # Use plain python StringIO so we can monkey-patch the close method to
823
        # not discard the contents.
824
        from StringIO import StringIO
825
        to_server = StringIO('')
826
        from_server = StringIO()
827
        self.closed = False
828
        def close():
829
            self.closed = True
830
        from_server.close = close
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
831
        server = medium.SmartServerPipeStreamMedium(
832
            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.
833
        fake_protocol = ErrorRaisingProtocol(Exception('boom'))
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
834
        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.
835
        self.assertEqual('', from_server.getvalue())
836
        self.assertTrue(self.closed)
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
837
        self.assertTrue(server.finished)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
838
2018.2.18 by Andrew Bennetts
Just close the pipe/socket if the medium catches an error, and add tests for medium exception handling.
839
    def test_socket_stream_error_handling(self):
840
        server_sock, client_sock = self.portable_socket_pair()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
841
        server = medium.SmartServerSocketStreamMedium(
2018.2.23 by Andrew Bennetts
Clean up SmartServerStreamMedium implementations, including removing unnecessary flushes.
842
            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.
843
        fake_protocol = ErrorRaisingProtocol(Exception('boom'))
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
844
        server._serve_one_request(fake_protocol)
2018.2.23 by Andrew Bennetts
Clean up SmartServerStreamMedium implementations, including removing unnecessary flushes.
845
        # recv should not block, because the other end of the socket has been
846
        # closed.
847
        self.assertEqual('', client_sock.recv(1))
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
848
        self.assertTrue(server.finished)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
849
2018.2.18 by Andrew Bennetts
Just close the pipe/socket if the medium catches an error, and add tests for medium exception handling.
850
    def test_pipe_like_stream_keyboard_interrupt_handling(self):
851
        to_server = StringIO('')
852
        from_server = StringIO()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
853
        server = medium.SmartServerPipeStreamMedium(
854
            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.
855
        fake_protocol = ErrorRaisingProtocol(KeyboardInterrupt('boom'))
856
        self.assertRaises(
857
            KeyboardInterrupt, server._serve_one_request, fake_protocol)
858
        self.assertEqual('', from_server.getvalue())
859
860
    def test_socket_stream_keyboard_interrupt_handling(self):
861
        server_sock, client_sock = self.portable_socket_pair()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
862
        server = medium.SmartServerSocketStreamMedium(
2018.2.23 by Andrew Bennetts
Clean up SmartServerStreamMedium implementations, including removing unnecessary flushes.
863
            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.
864
        fake_protocol = ErrorRaisingProtocol(KeyboardInterrupt('boom'))
865
        self.assertRaises(
866
            KeyboardInterrupt, server._serve_one_request, fake_protocol)
2018.2.23 by Andrew Bennetts
Clean up SmartServerStreamMedium implementations, including removing unnecessary flushes.
867
        server_sock.close()
868
        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.
869
870
    def build_protocol_pipe_like(self, bytes):
871
        to_server = StringIO(bytes)
872
        from_server = StringIO()
873
        server = medium.SmartServerPipeStreamMedium(
874
            to_server, from_server, None)
875
        return server._build_protocol()
876
877
    def build_protocol_socket(self, bytes):
878
        server_sock, client_sock = self.portable_socket_pair()
879
        server = medium.SmartServerSocketStreamMedium(
880
            server_sock, None)
881
        client_sock.sendall(bytes)
882
        client_sock.close()
883
        return server._build_protocol()
884
885
    def assertProtocolOne(self, server_protocol):
886
        # Use assertIs because assertIsInstance will wrongly pass
887
        # SmartServerRequestProtocolTwo (because it subclasses
888
        # SmartServerRequestProtocolOne).
889
        self.assertIs(
890
            type(server_protocol), protocol.SmartServerRequestProtocolOne)
891
892
    def assertProtocolTwo(self, server_protocol):
893
        self.assertIsInstance(
894
            server_protocol, protocol.SmartServerRequestProtocolTwo)
895
896
    def test_pipe_like_build_protocol_empty_bytes(self):
897
        # Any empty request (i.e. no bytes) is detected as protocol version one.
898
        server_protocol = self.build_protocol_pipe_like('')
899
        self.assertProtocolOne(server_protocol)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
900
2432.2.2 by Andrew Bennetts
Smart server mediums now detect which protocol version a request is and dispatch accordingly.
901
    def test_socket_like_build_protocol_empty_bytes(self):
902
        # Any empty request (i.e. no bytes) is detected as protocol version one.
903
        server_protocol = self.build_protocol_socket('')
904
        self.assertProtocolOne(server_protocol)
905
906
    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.
907
        # A request that doesn't start with "bzr request 2\n" is version one.
908
        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.
909
        self.assertProtocolOne(server_protocol)
910
911
    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.
912
        # A request that doesn't start with "bzr request 2\n" is version one.
913
        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.
914
        self.assertProtocolOne(server_protocol)
915
916
    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.
917
        # A request that starts with "bzr request 2\n" is version two.
918
        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.
919
        self.assertProtocolTwo(server_protocol)
920
921
    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.
922
        # A request that starts with "bzr request 2\n" is version two.
923
        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.
924
        self.assertProtocolTwo(server_protocol)
3245.4.41 by Andrew Bennetts
Add TestGetProtocolFactoryForBytes.
925
926
927
class TestGetProtocolFactoryForBytes(tests.TestCase):
928
    """_get_protocol_factory_for_bytes identifies the protocol factory a server
929
    should use to decode a given request.  Any bytes not part of the version
930
    marker string (and thus part of the actual request) are returned alongside
931
    the protocol factory.
932
    """
933
934
    def test_version_three(self):
935
        result = medium._get_protocol_factory_for_bytes(
3245.4.60 by Andrew Bennetts
Update the protocol v3 version string to say 'bzr 1.6'.
936
            'bzr message 3 (bzr 1.6)\nextra bytes')
3245.4.41 by Andrew Bennetts
Add TestGetProtocolFactoryForBytes.
937
        protocol_factory, remainder = result
938
        self.assertEqual(
939
            protocol.build_server_protocol_three, protocol_factory)
940
        self.assertEqual('extra bytes', remainder)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
941
3245.4.41 by Andrew Bennetts
Add TestGetProtocolFactoryForBytes.
942
    def test_version_two(self):
943
        result = medium._get_protocol_factory_for_bytes(
944
            'bzr request 2\nextra bytes')
945
        protocol_factory, remainder = result
946
        self.assertEqual(
947
            protocol.SmartServerRequestProtocolTwo, protocol_factory)
948
        self.assertEqual('extra bytes', remainder)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
949
3245.4.41 by Andrew Bennetts
Add TestGetProtocolFactoryForBytes.
950
    def test_version_one(self):
951
        """Version one requests have no version markers."""
952
        result = medium._get_protocol_factory_for_bytes('anything\n')
953
        protocol_factory, remainder = result
954
        self.assertEqual(
955
            protocol.SmartServerRequestProtocolOne, protocol_factory)
956
        self.assertEqual('anything\n', remainder)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
957
2018.2.20 by Andrew Bennetts
Tidy up _serve_one_request.
958
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
959
class TestSmartTCPServer(tests.TestCase):
960
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
961
    def test_get_error_unexpected(self):
962
        """Error reported by server with no specific representation"""
2402.1.2 by Andrew Bennetts
Deal with review comments.
963
        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
964
        class FlakyTransport(object):
2376.3.3 by Robert Collins
Fix all smart_transport tests.
965
            base = 'a_url'
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
966
            def external_url(self):
967
                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.
968
            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
969
                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.
970
        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.
971
        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
972
        try:
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
973
            transport = remote.RemoteTCPTransport(smart_server.get_url())
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
974
            err = self.assertRaises(errors.UnknownErrorFromSmartServer,
975
                transport.get, 'something')
976
            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.
977
            transport.disconnect()
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
978
        finally:
2018.5.14 by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.
979
            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
980
981
982
class SmartTCPTests(tests.TestCase):
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
983
    """Tests for connection/end to end behaviour using the TCP server.
984
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
985
    All of these tests are run with a server running on another thread serving
986
    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`.
987
988
    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
989
    """
990
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
991
    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`.
992
        """Setup the server.
993
994
        :param readonly: Create a readonly server.
995
        """
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
996
        if not backing_transport:
997
            self.backing_transport = memory.MemoryTransport()
998
        else:
999
            self.backing_transport = backing_transport
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
1000
        if readonly:
1001
            self.real_backing_transport = self.backing_transport
1002
            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.
1003
        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.
1004
        self.server.start_background_thread('-' + self.id())
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
1005
        self.transport = remote.RemoteTCPTransport(self.server.get_url())
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1006
        self.addCleanup(self.tearDownServer)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
1007
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1008
    def tearDownServer(self):
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
1009
        if getattr(self, 'transport', None):
1010
            self.transport.disconnect()
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1011
            del self.transport
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
1012
        if getattr(self, 'server', None):
1013
            self.server.stop_background_thread()
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1014
            del self.server
1015
1016
1017
class TestServerSocketUsage(SmartTCPTests):
1018
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.
1019
    def test_server_setup_teardown(self):
1020
        """It should be safe to teardown the server with no requests."""
1021
        self.setUpServer()
1022
        server = self.server
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
1023
        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.
1024
        self.tearDownServer()
1025
        self.assertRaises(errors.ConnectionError, transport.has, '.')
1026
1027
    def test_server_closes_listening_sock_on_shutdown_after_request(self):
2370.4.2 by Robert Collins
Review feedback.
1028
        """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
1029
        self.setUpServer()
2370.4.2 by Robert Collins
Review feedback.
1030
        server = self.server
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1031
        self.transport.has('.')
1032
        self.tearDownServer()
1033
        # if the listening socket has closed, we should get a BADFD error
1034
        # when connecting, rather than a hang.
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
1035
        transport = remote.RemoteTCPTransport(server.get_url())
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1036
        self.assertRaises(errors.ConnectionError, transport.has, '.')
1037
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
1038
1039
class WritableEndToEndTests(SmartTCPTests):
1040
    """Client to server tests that require a writable transport."""
1041
1042
    def setUp(self):
1043
        super(WritableEndToEndTests, self).setUp()
1044
        self.setUpServer()
1045
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
1046
    def test_start_tcp_server(self):
1047
        url = self.server.get_url()
1048
        self.assertContainsRe(url, r'^bzr://127\.0\.0\.1:[0-9]{2,}/')
1049
1050
    def test_smart_transport_has(self):
1051
        """Checking for file existence over smart."""
2402.1.2 by Andrew Bennetts
Deal with review comments.
1052
        self._captureVar('BZR_NO_SMART_VFS', None)
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
1053
        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
1054
        self.assertTrue(self.transport.has("foo"))
1055
        self.assertFalse(self.transport.has("non-foo"))
1056
1057
    def test_smart_transport_get(self):
1058
        """Read back a file over smart."""
2402.1.2 by Andrew Bennetts
Deal with review comments.
1059
        self._captureVar('BZR_NO_SMART_VFS', None)
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
1060
        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
1061
        fp = self.transport.get("foo")
1062
        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`.
1063
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
1064
    def test_get_error_enoent(self):
1065
        """Error reported from server getting nonexistent file."""
1752.2.81 by Andrew Bennetts
Merge cleaned up underlying dependencies for remote bzrdir.
1066
        # The path in a raised NoSuchFile exception should be the precise path
1067
        # asked for by the client. This gives meaningful and unsurprising errors
1068
        # for users.
2402.1.2 by Andrew Bennetts
Deal with review comments.
1069
        self._captureVar('BZR_NO_SMART_VFS', None)
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
1070
        err = self.assertRaises(
1071
            errors.NoSuchFile, self.transport.get, 'not%20a%20file')
4294.2.9 by Robert Collins
Fixup tests broken by cleaning up the layering.
1072
        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
1073
1074
    def test_simple_clone_conn(self):
1075
        """Test that cloning reuses the same connection."""
1076
        # we create a real connection not a loopback one, but it will use the
1077
        # 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__.
1078
        conn2 = self.transport.clone('.')
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
1079
        self.assertIs(self.transport.get_smart_medium(),
1080
                      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
1081
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)
1082
    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
1083
        self.assertEquals('/foo/bar',
1084
                          self.transport._remote_path('foo/bar'))
1085
1086
    def test_clone_changes_base(self):
1087
        """Cloning transport produces one with a new base location"""
1088
        conn2 = self.transport.clone('subdir')
1089
        self.assertEquals(self.transport.base + 'subdir/',
1090
                          conn2.base)
1091
1092
    def test_open_dir(self):
1093
        """Test changing directory"""
2402.1.2 by Andrew Bennetts
Deal with review comments.
1094
        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
1095
        transport = self.transport
1096
        self.backing_transport.mkdir('toffee')
1097
        self.backing_transport.mkdir('toffee/apple')
1098
        self.assertEquals('/toffee', transport._remote_path('toffee'))
1910.19.13 by Andrew Bennetts
Address various review comments.
1099
        toffee_trans = transport.clone('toffee')
1100
        # Check that each transport has only the contents of its directory
1101
        # directly visible. If state was being held in the wrong object, it's
1102
        # conceivable that cloning a transport would alter the state of the
1103
        # cloned-from transport.
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
1104
        self.assertTrue(transport.has('toffee'))
1910.19.13 by Andrew Bennetts
Address various review comments.
1105
        self.assertFalse(toffee_trans.has('toffee'))
1106
        self.assertFalse(transport.has('apple'))
1107
        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
1108
1109
    def test_open_bzrdir(self):
1110
        """Open an existing bzrdir over smart transport"""
1111
        transport = self.transport
1112
        t = self.backing_transport
1113
        bzrdir.BzrDirFormat.get_default_format().initialize_on_transport(t)
1114
        result_dir = bzrdir.BzrDir.open_containing_from_transport(transport)
1115
1116
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
1117
class ReadOnlyEndToEndTests(SmartTCPTests):
1118
    """Tests from the client to the server using a readonly backing transport."""
1119
1120
    def test_mkdir_error_readonly(self):
1121
        """TransportNotPossible should be preserved from the backing transport."""
2402.1.2 by Andrew Bennetts
Deal with review comments.
1122
        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`.
1123
        self.setUpServer(readonly=True)
1124
        self.assertRaises(errors.TransportNotPossible, self.transport.mkdir,
1125
            'foo')
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1126
1127
1128
class TestServerHooks(SmartTCPTests):
1129
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
1130
    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
1131
        """Record a server_started|stopped hook firing."""
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
1132
        self.hook_calls.append((backing_urls, public_url))
1133
1134
    def test_server_started_hook_memory(self):
1135
        """The server_started hook fires when the server is started."""
1136
        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.
1137
        server.SmartTCPServer.hooks.install_named_hook('server_started',
1138
            self.capture_server_call, None)
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
1139
        self.setUpServer()
1140
        # at this point, the server will be starting a thread up.
1141
        # there is no indicator at the moment, so bodge it by doing a request.
1142
        self.transport.has('.')
1143
        # The default test server uses MemoryTransport and that has no external
1144
        # url:
1145
        self.assertEqual([([self.backing_transport.base], self.transport.base)],
1146
            self.hook_calls)
1147
1148
    def test_server_started_hook_file(self):
1149
        """The server_started hook fires when the server is started."""
1150
        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.
1151
        server.SmartTCPServer.hooks.install_named_hook('server_started',
1152
            self.capture_server_call, None)
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
1153
        self.setUpServer(backing_transport=get_transport("."))
1154
        # at this point, the server will be starting a thread up.
1155
        # there is no indicator at the moment, so bodge it by doing a request.
1156
        self.transport.has('.')
1157
        # The default test server uses MemoryTransport and that has no external
1158
        # url:
1159
        self.assertEqual([([
1160
            self.backing_transport.base, self.backing_transport.external_url()],
1161
             self.transport.base)],
1162
            self.hook_calls)
1163
1164
    def test_server_stopped_hook_simple_memory(self):
1165
        """The server_stopped hook fires when the server is stopped."""
1166
        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.
1167
        server.SmartTCPServer.hooks.install_named_hook('server_stopped',
1168
            self.capture_server_call, None)
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
1169
        self.setUpServer()
1170
        result = [([self.backing_transport.base], self.transport.base)]
1171
        # check the stopping message isn't emitted up front.
1172
        self.assertEqual([], self.hook_calls)
1173
        # nor after a single message
1174
        self.transport.has('.')
1175
        self.assertEqual([], self.hook_calls)
1176
        # clean up the server
1177
        self.tearDownServer()
1178
        # now it should have fired.
1179
        self.assertEqual(result, self.hook_calls)
1180
1181
    def test_server_stopped_hook_simple_file(self):
1182
        """The server_stopped hook fires when the server is stopped."""
1183
        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.
1184
        server.SmartTCPServer.hooks.install_named_hook('server_stopped',
1185
            self.capture_server_call, None)
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
1186
        self.setUpServer(backing_transport=get_transport("."))
1187
        result = [(
1188
            [self.backing_transport.base, self.backing_transport.external_url()]
1189
            , 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.
1190
        # check the stopping message isn't emitted up front.
1191
        self.assertEqual([], self.hook_calls)
1192
        # nor after a single message
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1193
        self.transport.has('.')
1194
        self.assertEqual([], self.hook_calls)
1195
        # clean up the server
1196
        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.
1197
        # now it should have fired.
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1198
        self.assertEqual(result, self.hook_calls)
1199
1200
# TODO: test that when the server suffers an exception that it calls the
1201
# server-stopped hook.
1202
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
1203
2018.5.17 by Andrew Bennetts
Paramaterise the commands handled by SmartServerRequestHandler.
1204
class SmartServerCommandTests(tests.TestCaseWithTransport):
1205
    """Tests that call directly into the command objects, bypassing the network
1206
    and the request dispatching.
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
1207
1208
    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.
1209
    test_smart.py.
2018.5.17 by Andrew Bennetts
Paramaterise the commands handled by SmartServerRequestHandler.
1210
    """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1211
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
1212
    def test_hello(self):
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1213
        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)
1214
        response = cmd.execute()
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
1215
        self.assertEqual(('ok', '2'), response.args)
2018.5.17 by Andrew Bennetts
Paramaterise the commands handled by SmartServerRequestHandler.
1216
        self.assertEqual(None, response.body)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1217
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
1218
    def test_get_bundle(self):
1219
        from bzrlib.bundle import serializer
1220
        wt = self.make_branch_and_tree('.')
1910.19.13 by Andrew Bennetts
Address various review comments.
1221
        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
1222
        wt.add('hello')
1910.19.13 by Andrew Bennetts
Address various review comments.
1223
        rev_id = wt.commit('add hello')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1224
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1225
        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)
1226
        response = cmd.execute('.', rev_id)
2018.5.17 by Andrew Bennetts
Paramaterise the commands handled by SmartServerRequestHandler.
1227
        bundle = serializer.read_bundle(StringIO(response.body))
1228
        self.assertEqual((), response.args)
1229
1230
1231
class SmartServerRequestHandlerTests(tests.TestCaseWithTransport):
1232
    """Test that call directly into the handler logic, bypassing the network."""
1233
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)
1234
    def setUp(self):
1235
        super(SmartServerRequestHandlerTests, self).setUp()
2402.1.2 by Andrew Bennetts
Deal with review comments.
1236
        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)
1237
2018.5.17 by Andrew Bennetts
Paramaterise the commands handled by SmartServerRequestHandler.
1238
    def build_handler(self, transport):
1239
        """Returns a handler for the commands in protocol version one."""
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1240
        return _mod_request.SmartServerRequestHandler(
1241
            transport, _mod_request.request_handlers, '/')
2018.5.17 by Andrew Bennetts
Paramaterise the commands handled by SmartServerRequestHandler.
1242
1243
    def test_construct_request_handler(self):
1244
        """Constructing a request handler should be easy and set defaults."""
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1245
        handler = _mod_request.SmartServerRequestHandler(None, commands=None,
1246
                root_client_path='/')
2018.5.17 by Andrew Bennetts
Paramaterise the commands handled by SmartServerRequestHandler.
1247
        self.assertFalse(handler.finished_reading)
1248
1249
    def test_hello(self):
1250
        handler = self.build_handler(None)
1251
        handler.dispatch_command('hello', ())
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
1252
        self.assertEqual(('ok', '2'), handler.response.args)
2018.5.17 by Andrew Bennetts
Paramaterise the commands handled by SmartServerRequestHandler.
1253
        self.assertEqual(None, handler.response.body)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1254
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)
1255
    def test_disable_vfs_handler_classes_via_environment(self):
2018.5.140 by Andrew Bennetts
Merge from bzr.dev
1256
        # VFS handler classes will raise an error from "execute" if
1257
        # BZR_NO_SMART_VFS is set.
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1258
        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)
1259
        # set environment variable after construction to make sure it's
1260
        # examined.
2018.5.140 by Andrew Bennetts
Merge from bzr.dev
1261
        # Note that we can safely clobber BZR_NO_SMART_VFS here, because setUp
1262
        # 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)
1263
        # afterwards.
2402.1.2 by Andrew Bennetts
Deal with review comments.
1264
        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)
1265
        self.assertRaises(errors.DisabledMethod, handler.execute)
1266
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
1267
    def test_readonly_exception_becomes_transport_not_possible(self):
1268
        """The response for a read-only error is ('ReadOnlyError')."""
2018.5.17 by Andrew Bennetts
Paramaterise the commands handled by SmartServerRequestHandler.
1269
        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`.
1270
        # send a mkdir for foo, with no explicit mode - should fail.
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1271
        handler.dispatch_command('mkdir', ('foo', ''))
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
1272
        # and the failure should be an explicit ReadOnlyError
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1273
        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`.
1274
        # XXX: TODO: test that other TransportNotPossible errors are
1275
        # presented as TransportNotPossible - not possible to do that
1276
        # until I figure out how to trigger that relatively cleanly via
1277
        # the api. RBC 20060918
1278
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1279
    def test_hello_has_finished_body_on_dispatch(self):
1280
        """The 'hello' command should set finished_reading."""
2018.5.17 by Andrew Bennetts
Paramaterise the commands handled by SmartServerRequestHandler.
1281
        handler = self.build_handler(None)
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1282
        handler.dispatch_command('hello', ())
1283
        self.assertTrue(handler.finished_reading)
1284
        self.assertNotEqual(None, handler.response)
1285
1286
    def test_put_bytes_non_atomic(self):
1287
        """'put_...' should set finished_reading after reading the bytes."""
2018.5.17 by Andrew Bennetts
Paramaterise the commands handled by SmartServerRequestHandler.
1288
        handler = self.build_handler(self.get_transport())
2018.2.36 by Andrew Bennetts
Don't UTF-8 decode paths in requests. They should be url-quoted (and thus
1289
        handler.dispatch_command('put_non_atomic', ('a-file', '', 'F', ''))
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1290
        self.assertFalse(handler.finished_reading)
1291
        handler.accept_body('1234')
1292
        self.assertFalse(handler.finished_reading)
1293
        handler.accept_body('5678')
1294
        handler.end_of_body()
1295
        self.assertTrue(handler.finished_reading)
1296
        self.assertEqual(('ok', ), handler.response.args)
1297
        self.assertEqual(None, handler.response.body)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1298
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1299
    def test_readv_accept_body(self):
1300
        """'readv' should set finished_reading after reading offsets."""
1301
        self.build_tree(['a-file'])
2018.5.17 by Andrew Bennetts
Paramaterise the commands handled by SmartServerRequestHandler.
1302
        handler = self.build_handler(self.get_readonly_transport())
2018.2.36 by Andrew Bennetts
Don't UTF-8 decode paths in requests. They should be url-quoted (and thus
1303
        handler.dispatch_command('readv', ('a-file', ))
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1304
        self.assertFalse(handler.finished_reading)
1305
        handler.accept_body('2,')
1306
        self.assertFalse(handler.finished_reading)
1307
        handler.accept_body('3')
1308
        handler.end_of_body()
1309
        self.assertTrue(handler.finished_reading)
1310
        self.assertEqual(('readv', ), handler.response.args)
1311
        # co - nte - nt of a-file is the file contents we are extracting from.
1312
        self.assertEqual('nte', handler.response.body)
1313
1314
    def test_readv_short_read_response_contents(self):
1315
        """'readv' when a short read occurs sets the response appropriately."""
1316
        self.build_tree(['a-file'])
2018.5.17 by Andrew Bennetts
Paramaterise the commands handled by SmartServerRequestHandler.
1317
        handler = self.build_handler(self.get_readonly_transport())
2018.2.36 by Andrew Bennetts
Don't UTF-8 decode paths in requests. They should be url-quoted (and thus
1318
        handler.dispatch_command('readv', ('a-file', ))
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1319
        # read beyond the end of the file.
1320
        handler.accept_body('100,1')
1321
        handler.end_of_body()
1322
        self.assertTrue(handler.finished_reading)
2692.1.8 by Andrew Bennetts
Fix trivial test failure.
1323
        self.assertEqual(('ShortReadvError', './a-file', '100', '1', '0'),
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1324
            handler.response.args)
1325
        self.assertEqual(None, handler.response.body)
1326
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.
1327
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)
1328
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.
1329
1330
    def test_registration(self):
1331
        t = get_transport('bzr+ssh://example.com/path')
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
1332
        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.
1333
        self.assertEqual('example.com', t._host)
1334
2814.2.2 by Martin Pool
merge bzr+https patch from johnf and add a basic test
1335
    def test_bzr_https(self):
1336
        # https://bugs.launchpad.net/bzr/+bug/128456
1337
        t = get_transport('bzr+https://example.com/path')
1338
        self.assertIsInstance(t, remote.RemoteHTTPTransport)
1339
        self.assertStartsWith(
1340
            t._http_transport.base,
1341
            'https://')
1342
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
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)
1344
class TestRemoteTransport(tests.TestCase):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1345
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
1346
    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)
1347
        # 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.
1348
        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.
1349
        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.
1350
        client_medium = medium.SmartSimplePipesClientMedium(
1351
            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)
1352
        transport = remote.RemoteTransport(
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1353
            '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.
1354
        # 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).
1355
        client_medium._protocol_version = 1
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
1356
1357
        # 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.
1358
        # method is called.  No data should have been sent, or read.
1359
        self.assertEqual(0, input.tell())
1360
        self.assertEqual('', output.getvalue())
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
1361
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1362
        # 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.
1363
        # transport makes its own protocol instances, we check on the wire.
1364
        # XXX: TODO: give the transport a protocol factory, which can make
1365
        # an instrumented protocol for us.
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
1366
        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.
1367
        # 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.
1368
        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.
1369
        self.assertEqual('get\x01/foo\n', output.getvalue())
1910.19.11 by Andrew Bennetts
General code cleanup based on review comments and other observations.
1370
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
1371
    def test__translate_error_readonly(self):
1372
        """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.
1373
        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)
1374
        transport = remote.RemoteTransport(
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1375
            'bzr://localhost/', medium=client_medium)
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
1376
        err = errors.ErrorFromSmartServer(("ReadOnlyError", ))
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
1377
        self.assertRaises(errors.TransportNotPossible,
3779.3.2 by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote.
1378
            transport._translate_error, err)
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
1379
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.
1380
2432.2.5 by Andrew Bennetts
Reduce duplication in test_smart_transport.
1381
class TestSmartProtocol(tests.TestCase):
1382
    """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.
1383
1384
    Each test case gets a smart_server and smart_client created during setUp().
1385
1386
    It is planned that the client can be called with self.call_client() giving
1387
    it an expected server response, which will be fed into it when it tries to
1388
    read. Likewise, self.call_server will call a servers method with a canned
1389
    serialised client request. Output done by the client or server for these
1390
    calls will be captured to self.to_server and self.to_client. Each element
1391
    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.
1392
1393
    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.
1394
    """
1395
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1396
    request_encoder = None
1397
    response_decoder = None
1398
    server_protocol_class = None
2432.2.5 by Andrew Bennetts
Reduce duplication in test_smart_transport.
1399
    client_protocol_class = None
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1400
1401
    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.
1402
        """
1403
        :returns: a Request
1404
        """
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1405
        # This is very similar to
1406
        # 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.
1407
        # XXX: make this use _SmartClient!
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1408
        if input_bytes is None:
1409
            input = StringIO()
1410
        else:
1411
            input = StringIO(input_bytes)
1412
        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.
1413
        client_medium = medium.SmartSimplePipesClientMedium(
1414
            input, output, 'base')
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1415
        request = client_medium.get_request()
1416
        if self.client_protocol_class is not None:
1417
            client_protocol = self.client_protocol_class(request)
1418
            return client_protocol, client_protocol, output
1419
        else:
3245.4.55 by Andrew Bennetts
Test improvements suggested by John's review.
1420
            self.assertNotEqual(None, self.request_encoder)
1421
            self.assertNotEqual(None, self.response_decoder)
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1422
            requester = self.request_encoder(request)
1423
            response_handler = message.ConventionalResponseHandler()
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
1424
            response_protocol = self.response_decoder(
1425
                response_handler, expect_version_marker=True)
3245.4.26 by Andrew Bennetts
Rename 'setProtoAndMedium' to more accurate 'setProtoAndMediumRequest', add ABCs for Requesters and ResponseHandlers.
1426
            response_handler.setProtoAndMediumRequest(
1427
                response_protocol, request)
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1428
            return requester, response_handler, output
1429
1430
    def make_client_protocol(self, input_bytes=None):
1431
        result = self.make_client_protocol_and_output(input_bytes=input_bytes)
1432
        requester, response_handler, output = result
1433
        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.
1434
3245.1.11 by Andrew Bennetts
Add make_server_protocol helper to TestSmartProtocol.
1435
    def make_server_protocol(self):
1436
        out_stream = StringIO()
3245.4.34 by Andrew Bennetts
Remove another insignificant change vs. bzr.dev.
1437
        smart_protocol = self.server_protocol_class(None, out_stream.write)
3245.1.11 by Andrew Bennetts
Add make_server_protocol helper to TestSmartProtocol.
1438
        return smart_protocol, out_stream
1439
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.
1440
    def setUp(self):
2432.2.5 by Andrew Bennetts
Reduce duplication in test_smart_transport.
1441
        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.
1442
        self.response_marker = getattr(
1443
            self.client_protocol_class, 'response_marker', None)
1444
        self.request_marker = getattr(
1445
            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.
1446
1447
    def assertOffsetSerialisation(self, expected_offsets, expected_serialised,
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1448
        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.
1449
        """Check that smart (de)serialises offsets as expected.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1450
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.
1451
        We check both serialisation and deserialisation at the same time
1452
        to ensure that the round tripping cannot skew: both directions should
1453
        be as expected.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1454
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.
1455
        :param expected_offsets: a readv offset list.
1456
        :param expected_seralised: an expected serial form of the offsets.
1457
        """
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.
1458
        # XXX: '_deserialise_offsets' should be a method of the
1459
        # SmartServerRequestProtocol in future.
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1460
        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.
1461
        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.
1462
        self.assertEqual(expected_offsets, offsets)
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1463
        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.
1464
        self.assertEqual(expected_serialised, serialised)
1465
2018.2.10 by Andrew Bennetts
Tidy up TODOs, further testing and fixes for SmartServerRequestProtocolOne, and remove a read_bytes(1) call.
1466
    def build_protocol_waiting_for_body(self):
3245.1.11 by Andrew Bennetts
Add make_server_protocol helper to TestSmartProtocol.
1467
        smart_protocol, out_stream = self.make_server_protocol()
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
1468
        smart_protocol._has_dispatched = True
3245.1.14 by Andrew Bennetts
Merge from bzr.dev
1469
        smart_protocol.request = _mod_request.SmartServerRequestHandler(
1470
            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.
1471
        class FakeCommand(_mod_request.SmartServerRequest):
1472
            def do_body(self_cmd, body_bytes):
2018.5.7 by Andrew Bennetts
Simplify dispatch_command.
1473
                self.end_received = True
1474
                self.assertEqual('abcdefg', body_bytes)
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1475
                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.
1476
        smart_protocol.request._command = FakeCommand(None)
2400.1.4 by Andrew Bennetts
Tidy up accidental changes.
1477
        # Call accept_bytes to make sure that internal state like _body_decoder
1478
        # is initialised.  This test should probably be given a clearer
1479
        # interface to work with that will not cause this inconsistency.
1480
        #   -- 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
1481
        smart_protocol.accept_bytes('')
1482
        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.
1483
2432.2.5 by Andrew Bennetts
Reduce duplication in test_smart_transport.
1484
    def assertServerToClientEncoding(self, expected_bytes, expected_tuple,
1485
            input_tuples):
1486
        """Assert that each input_tuple serialises as expected_bytes, and the
1487
        bytes deserialise as expected_tuple.
1488
        """
1489
        # check the encoding of the server for all input_tuples matches
1490
        # expected bytes
1491
        for input_tuple in input_tuples:
3245.1.11 by Andrew Bennetts
Add make_server_protocol helper to TestSmartProtocol.
1492
            server_protocol, server_output = self.make_server_protocol()
2432.4.4 by Robert Collins
Merge hpss-protocol2.
1493
            server_protocol._send_response(
1494
                _mod_request.SuccessfulSmartServerResponse(input_tuple))
2432.2.5 by Andrew Bennetts
Reduce duplication in test_smart_transport.
1495
            self.assertEqual(expected_bytes, server_output.getvalue())
1496
        # 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.
1497
        requester, response_handler = self.make_client_protocol(expected_bytes)
1498
        requester.call('foo')
1499
        self.assertEqual(expected_tuple, response_handler.read_response_tuple())
2432.2.5 by Andrew Bennetts
Reduce duplication in test_smart_transport.
1500
1501
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.
1502
class CommonSmartProtocolTestMixin(object):
1503
3195.2.1 by Andrew Bennetts
Improve test coverage, and fix a bug revealed by the improved coverage.
1504
    def test_connection_closed_reporting(self):
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1505
        requester, response_handler = self.make_client_protocol()
1506
        requester.call('hello')
3245.1.10 by Andrew Bennetts
Remove trailing whitespace.
1507
        ex = self.assertRaises(errors.ConnectionReset,
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1508
            response_handler.read_response_tuple)
3195.2.1 by Andrew Bennetts
Improve test coverage, and fix a bug revealed by the improved coverage.
1509
        self.assertEqual("Connection closed: "
4070.8.1 by Martin Pool
Remove 'try -Dhpss' from error messages
1510
            "please check connectivity and permissions ",
1511
            str(ex))
3195.2.1 by Andrew Bennetts
Improve test coverage, and fix a bug revealed by the improved coverage.
1512
3245.1.8 by Andrew Bennetts
Remove TestSmartProtocol.setUp entirely.
1513
    def test_server_offset_serialisation(self):
1514
        """The Smart protocol serialises offsets as a comma and \n string.
1515
1516
        We check a number of boundary cases are as expected: empty, one offset,
1517
        one with the order of reads not increasing (an out of order read), and
1518
        one that should coalesce.
1519
        """
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1520
        requester, response_handler = self.make_client_protocol()
1521
        self.assertOffsetSerialisation([], '', requester)
1522
        self.assertOffsetSerialisation([(1,2)], '1,2', requester)
3245.1.8 by Andrew Bennetts
Remove TestSmartProtocol.setUp entirely.
1523
        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.
1524
            requester)
3245.1.8 by Andrew Bennetts
Remove TestSmartProtocol.setUp entirely.
1525
        self.assertOffsetSerialisation([(1,2), (3,4), (100, 200)],
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1526
            '1,2\n3,4\n100,200', requester)
3245.1.8 by Andrew Bennetts
Remove TestSmartProtocol.setUp entirely.
1527
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.
1528
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.
1529
class TestVersionOneFeaturesInProtocolOne(
1530
    TestSmartProtocol, CommonSmartProtocolTestMixin):
1531
    """Tests for version one smart protocol features as implemeted by version
1532
    one."""
2432.2.5 by Andrew Bennetts
Reduce duplication in test_smart_transport.
1533
1534
    client_protocol_class = protocol.SmartClientRequestProtocolOne
1535
    server_protocol_class = protocol.SmartServerRequestProtocolOne
1536
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
1537
    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
1538
        smart_protocol = protocol.SmartServerRequestProtocolOne(None, None)
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
1539
        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
1540
        self.assertEqual('', smart_protocol.in_buffer)
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
1541
        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
1542
        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.
1543
1544
    def test_construct_version_one_client_protocol(self):
1545
        # we can construct a client protocol from a client medium request
1546
        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.
1547
        client_medium = medium.SmartSimplePipesClientMedium(
1548
            None, output, 'base')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1549
        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
1550
        client_protocol = protocol.SmartClientRequestProtocolOne(request)
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1551
2018.3.2 by Andrew Bennetts
Ensure that a request's next_read_size() is 0 once an error response is sent.
1552
    def test_accept_bytes_of_bad_request_to_protocol(self):
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1553
        out_stream = StringIO()
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1554
        smart_protocol = protocol.SmartServerRequestProtocolOne(
1555
            None, out_stream.write)
1556
        smart_protocol.accept_bytes('abc')
1557
        self.assertEqual('abc', smart_protocol.in_buffer)
1558
        smart_protocol.accept_bytes('\n')
1559
        self.assertEqual(
1560
            "error\x01Generic bzr smart protocol error: bad request 'abc'\n",
1561
            out_stream.getvalue())
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
1562
        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
1563
        self.assertEqual(0, smart_protocol.next_read_size())
2018.2.26 by Andrew Bennetts
Changes prompted by j-a-meinel's review.
1564
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1565
    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.
1566
        protocol = self.build_protocol_waiting_for_body()
2018.2.15 by Andrew Bennetts
Remove SmartServerRequestProtocolOne.finished_reading attribute, replace with next_read_size method.
1567
        self.assertEqual(6, protocol.next_read_size())
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1568
        protocol.accept_bytes('7\nabc')
2018.2.15 by Andrew Bennetts
Remove SmartServerRequestProtocolOne.finished_reading attribute, replace with next_read_size method.
1569
        self.assertEqual(9, protocol.next_read_size())
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1570
        protocol.accept_bytes('defgd')
1571
        protocol.accept_bytes('one\n')
2018.2.15 by Andrew Bennetts
Remove SmartServerRequestProtocolOne.finished_reading attribute, replace with next_read_size method.
1572
        self.assertEqual(0, protocol.next_read_size())
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1573
        self.assertTrue(self.end_received)
1574
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
1575
    def test_accept_request_and_body_all_at_once(self):
2402.1.2 by Andrew Bennetts
Deal with review comments.
1576
        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.
1577
        mem_transport = memory.MemoryTransport()
1578
        mem_transport.put_bytes('foo', 'abcdefghij')
1579
        out_stream = StringIO()
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1580
        smart_protocol = protocol.SmartServerRequestProtocolOne(mem_transport,
2018.2.23 by Andrew Bennetts
Clean up SmartServerStreamMedium implementations, including removing unnecessary flushes.
1581
                out_stream.write)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1582
        smart_protocol.accept_bytes('readv\x01foo\n3\n3,3done\n')
1583
        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.
1584
        self.assertEqual('readv\n3\ndefdone\n', out_stream.getvalue())
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
1585
        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
1586
        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.
1587
2018.2.10 by Andrew Bennetts
Tidy up TODOs, further testing and fixes for SmartServerRequestProtocolOne, and remove a read_bytes(1) call.
1588
    def test_accept_excess_bytes_are_preserved(self):
1589
        out_stream = StringIO()
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1590
        smart_protocol = protocol.SmartServerRequestProtocolOne(
1591
            None, out_stream.write)
1592
        smart_protocol.accept_bytes('hello\nhello\n')
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
1593
        self.assertEqual("ok\x012\n", out_stream.getvalue())
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
1594
        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
1595
        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.
1596
1597
    def test_accept_excess_bytes_after_body(self):
1598
        protocol = self.build_protocol_waiting_for_body()
1599
        protocol.accept_bytes('7\nabcdefgdone\nX')
1600
        self.assertTrue(self.end_received)
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
1601
        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.
1602
        self.assertEqual("", protocol.in_buffer)
1603
        protocol.accept_bytes('Y')
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
1604
        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.
1605
        self.assertEqual("", protocol.in_buffer)
1606
1607
    def test_accept_excess_bytes_after_dispatch(self):
1608
        out_stream = StringIO()
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1609
        smart_protocol = protocol.SmartServerRequestProtocolOne(
1610
            None, out_stream.write)
1611
        smart_protocol.accept_bytes('hello\n')
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
1612
        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
1613
        smart_protocol.accept_bytes('hel')
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
1614
        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
1615
        smart_protocol.accept_bytes('lo\n')
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
1616
        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
1617
        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.
1618
2018.3.2 by Andrew Bennetts
Ensure that a request's next_read_size() is 0 once an error response is sent.
1619
    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
1620
        smart_protocol = protocol.SmartServerRequestProtocolOne(
1621
            None, lambda x: None)
1622
        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.
1623
        smart_protocol._send_response(
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1624
            _mod_request.SuccessfulSmartServerResponse(('x',)))
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
1625
        self.assertEqual(0, smart_protocol.next_read_size())
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1626
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
1627
    def test__send_response_errors_with_base_response(self):
1628
        """Ensure that only the Successful/Failed subclasses are used."""
1629
        smart_protocol = protocol.SmartServerRequestProtocolOne(
1630
            None, lambda x: None)
1631
        self.assertRaises(AttributeError, smart_protocol._send_response,
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1632
            _mod_request.SmartServerResponse(('x',)))
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
1633
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
1634
    def test_query_version(self):
1635
        """query_version on a SmartClientProtocolOne should return a number.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1636
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
1637
        The protocol provides the query_version because the domain level clients
1638
        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.
1639
        """
1640
        # What we really want to test here is that SmartClientProtocolOne calls
1641
        # accept_bytes(tuple_based_encoding_of_hello) and reads and parses the
4031.3.1 by Frank Aspell
Fixing various typos
1642
        # 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.
1643
        # the error if the response is a non-understood version.
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
1644
        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.
1645
        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.
1646
        client_medium = medium.SmartSimplePipesClientMedium(
1647
            input, output, 'base')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1648
        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
1649
        smart_protocol = protocol.SmartClientRequestProtocolOne(request)
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
1650
        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.
1651
1652
    def test_client_call_empty_response(self):
1653
        # protocol.call() can get back an empty tuple as a response. This occurs
1654
        # when the parsed line is an empty line, and results in a tuple with
1655
        # one element - an empty string.
1656
        self.assertServerToClientEncoding('\n', ('', ), [(), ('', )])
1657
1658
    def test_client_call_three_element_response(self):
1659
        # protocol.call() can get back tuples of other lengths. A three element
1660
        # tuple should be unpacked as three strings.
1661
        self.assertServerToClientEncoding('a\x01b\x0134\n', ('a', 'b', '34'),
1662
            [('a', 'b', '34')])
1663
1664
    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.
1665
        # 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.
1666
        # wire.
1667
        expected_bytes = "foo\n7\nabcdefgdone\n"
1668
        input = StringIO("\n")
1669
        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.
1670
        client_medium = medium.SmartSimplePipesClientMedium(
1671
            input, output, 'base')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1672
        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
1673
        smart_protocol = protocol.SmartClientRequestProtocolOne(request)
1674
        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.
1675
        self.assertEqual(expected_bytes, output.getvalue())
1676
1677
    def test_client_call_with_body_readv_array(self):
1678
        # protocol.call_with_upload should encode the readv array and then
1679
        # length-prefix the bytes onto the wire.
1680
        expected_bytes = "foo\n7\n1,2\n5,6done\n"
1681
        input = StringIO("\n")
1682
        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.
1683
        client_medium = medium.SmartSimplePipesClientMedium(
1684
            input, output, 'base')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1685
        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
1686
        smart_protocol = protocol.SmartClientRequestProtocolOne(request)
1687
        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.
1688
        self.assertEqual(expected_bytes, output.getvalue())
1689
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.
1690
    def _test_client_read_response_tuple_raises_UnknownSmartMethod(self,
1691
            server_bytes):
3297.3.1 by Andrew Bennetts
Raise UnknownSmartMethod automatically from read_response_tuple.
1692
        input = StringIO(server_bytes)
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')
3297.3.1 by Andrew Bennetts
Raise UnknownSmartMethod automatically from read_response_tuple.
1696
        request = client_medium.get_request()
1697
        smart_protocol = protocol.SmartClientRequestProtocolOne(request)
1698
        smart_protocol.call('foo')
1699
        self.assertRaises(
1700
            errors.UnknownSmartMethod, smart_protocol.read_response_tuple)
1701
        # The request has been finished.  There is no body to read, and
1702
        # attempts to read one will fail.
1703
        self.assertRaises(
1704
            errors.ReadingCompleted, smart_protocol.read_body_bytes)
1705
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.
1706
    def test_client_read_response_tuple_raises_UnknownSmartMethod(self):
1707
        """read_response_tuple raises UnknownSmartMethod if the response says
1708
        the server did not recognise the request.
1709
        """
1710
        server_bytes = (
1711
            "error\x01Generic bzr smart protocol error: bad request 'foo'\n")
1712
        self._test_client_read_response_tuple_raises_UnknownSmartMethod(
1713
            server_bytes)
1714
1715
    def test_client_read_response_tuple_raises_UnknownSmartMethod_0_11(self):
1716
        """read_response_tuple also raises UnknownSmartMethod if the response
1717
        from a bzr 0.11 says the server did not recognise the request.
1718
1719
        (bzr 0.11 sends a slightly different error message to later versions.)
1720
        """
1721
        server_bytes = (
1722
            "error\x01Generic bzr smart protocol error: bad request u'foo'\n")
1723
        self._test_client_read_response_tuple_raises_UnknownSmartMethod(
1724
            server_bytes)
1725
2018.2.4 by Robert Collins
separate out the client medium from the client encoding protocol for the smart server.
1726
    def test_client_read_body_bytes_all(self):
1727
        # read_body_bytes should decode the body bytes from the wire into
1728
        # a response.
1729
        expected_bytes = "1234567"
1730
        server_bytes = "ok\n7\n1234567done\n"
1731
        input = StringIO(server_bytes)
1732
        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.
1733
        client_medium = medium.SmartSimplePipesClientMedium(
1734
            input, output, 'base')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1735
        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
1736
        smart_protocol = protocol.SmartClientRequestProtocolOne(request)
1737
        smart_protocol.call('foo')
1738
        smart_protocol.read_response_tuple(True)
1739
        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.
1740
1741
    def test_client_read_body_bytes_incremental(self):
1742
        # test reading a few bytes at a time from the body
1743
        # 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.
1744
        # 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.
1745
        # LengthPrefixedBodyDecoder that is already well tested - we can skip
1746
        # that.
1747
        expected_bytes = "1234567"
1748
        server_bytes = "ok\n7\n1234567done\n"
1749
        input = StringIO(server_bytes)
1750
        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.
1751
        client_medium = medium.SmartSimplePipesClientMedium(
1752
            input, output, 'base')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1753
        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
1754
        smart_protocol = protocol.SmartClientRequestProtocolOne(request)
1755
        smart_protocol.call('foo')
1756
        smart_protocol.read_response_tuple(True)
1757
        self.assertEqual(expected_bytes[0:2], smart_protocol.read_body_bytes(2))
1758
        self.assertEqual(expected_bytes[2:4], smart_protocol.read_body_bytes(2))
1759
        self.assertEqual(expected_bytes[4:6], smart_protocol.read_body_bytes(2))
1760
        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.
1761
1762
    def test_client_cancel_read_body_does_not_eat_body_bytes(self):
1763
        # cancelling the expected body needs to finish the request, but not
1764
        # read any more bytes.
1765
        expected_bytes = "1234567"
1766
        server_bytes = "ok\n7\n1234567done\n"
1767
        input = StringIO(server_bytes)
1768
        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.
1769
        client_medium = medium.SmartSimplePipesClientMedium(
1770
            input, output, 'base')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1771
        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
1772
        smart_protocol = protocol.SmartClientRequestProtocolOne(request)
1773
        smart_protocol.call('foo')
1774
        smart_protocol.read_response_tuple(True)
1775
        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.
1776
        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
1777
        self.assertRaises(
1778
            errors.ReadingCompleted, smart_protocol.read_body_bytes)
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
1779
3464.4.1 by Andrew Bennetts
Fix infinite busy-loop caused by connection loss during read of response body in HPSS v1 and v2.
1780
    def test_client_read_body_bytes_interrupted_connection(self):
1781
        server_bytes = "ok\n999\nincomplete body"
1782
        input = StringIO(server_bytes)
1783
        output = StringIO()
1784
        client_medium = medium.SmartSimplePipesClientMedium(
1785
            input, output, 'base')
1786
        request = client_medium.get_request()
1787
        smart_protocol = self.client_protocol_class(request)
1788
        smart_protocol.call('foo')
1789
        smart_protocol.read_response_tuple(True)
1790
        self.assertRaises(
1791
            errors.ConnectionReset, smart_protocol.read_body_bytes)
1792
2018.2.15 by Andrew Bennetts
Remove SmartServerRequestProtocolOne.finished_reading attribute, replace with next_read_size method.
1793
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.
1794
class TestVersionOneFeaturesInProtocolTwo(
1795
    TestSmartProtocol, CommonSmartProtocolTestMixin):
1796
    """Tests for version one smart protocol features as implemeted by version
1797
    two.
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
1798
    """
1799
2432.2.5 by Andrew Bennetts
Reduce duplication in test_smart_transport.
1800
    client_protocol_class = protocol.SmartClientRequestProtocolTwo
1801
    server_protocol_class = protocol.SmartServerRequestProtocolTwo
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
1802
1803
    def test_construct_version_two_server_protocol(self):
1804
        smart_protocol = protocol.SmartServerRequestProtocolTwo(None, None)
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
1805
        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.
1806
        self.assertEqual('', smart_protocol.in_buffer)
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
1807
        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.
1808
        self.assertEqual(1, smart_protocol.next_read_size())
1809
1810
    def test_construct_version_two_client_protocol(self):
1811
        # we can construct a client protocol from a client medium request
1812
        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.
1813
        client_medium = medium.SmartSimplePipesClientMedium(
1814
            None, output, 'base')
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
1815
        request = client_medium.get_request()
1816
        client_protocol = protocol.SmartClientRequestProtocolTwo(request)
1817
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1818
    def test_accept_bytes_of_bad_request_to_protocol(self):
1819
        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.
1820
        smart_protocol = self.server_protocol_class(None, out_stream.write)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1821
        smart_protocol.accept_bytes('abc')
1822
        self.assertEqual('abc', smart_protocol.in_buffer)
1823
        smart_protocol.accept_bytes('\n')
1824
        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.
1825
            self.response_marker +
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1826
            "failed\nerror\x01Generic bzr smart protocol error: bad request 'abc'\n",
1827
            out_stream.getvalue())
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
1828
        self.assertTrue(smart_protocol._has_dispatched)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1829
        self.assertEqual(0, smart_protocol.next_read_size())
1830
1831
    def test_accept_body_bytes_to_protocol(self):
1832
        protocol = self.build_protocol_waiting_for_body()
1833
        self.assertEqual(6, protocol.next_read_size())
1834
        protocol.accept_bytes('7\nabc')
1835
        self.assertEqual(9, protocol.next_read_size())
1836
        protocol.accept_bytes('defgd')
1837
        protocol.accept_bytes('one\n')
1838
        self.assertEqual(0, protocol.next_read_size())
1839
        self.assertTrue(self.end_received)
1840
1841
    def test_accept_request_and_body_all_at_once(self):
1842
        self._captureVar('BZR_NO_SMART_VFS', None)
1843
        mem_transport = memory.MemoryTransport()
1844
        mem_transport.put_bytes('foo', 'abcdefghij')
1845
        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.
1846
        smart_protocol = self.server_protocol_class(
1847
            mem_transport, out_stream.write)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1848
        smart_protocol.accept_bytes('readv\x01foo\n3\n3,3done\n')
1849
        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.
1850
        self.assertEqual(self.response_marker +
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1851
                         'success\nreadv\n3\ndefdone\n',
1852
                         out_stream.getvalue())
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
1853
        self.assertEqual('', smart_protocol.unused_data)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1854
        self.assertEqual('', smart_protocol.in_buffer)
1855
1856
    def test_accept_excess_bytes_are_preserved(self):
1857
        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.
1858
        smart_protocol = self.server_protocol_class(None, out_stream.write)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1859
        smart_protocol.accept_bytes('hello\nhello\n')
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
1860
        self.assertEqual(self.response_marker + "success\nok\x012\n",
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1861
                         out_stream.getvalue())
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
1862
        self.assertEqual("hello\n", smart_protocol.unused_data)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1863
        self.assertEqual("", smart_protocol.in_buffer)
1864
1865
    def test_accept_excess_bytes_after_body(self):
1866
        # The excess bytes look like the start of another request.
1867
        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.
1868
        server_protocol.accept_bytes('7\nabcdefgdone\n' + self.response_marker)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1869
        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.
1870
        self.assertEqual(self.response_marker,
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
1871
                         server_protocol.unused_data)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1872
        self.assertEqual("", server_protocol.in_buffer)
1873
        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.
1874
        self.assertEqual(self.response_marker + "Y",
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
1875
                         server_protocol.unused_data)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1876
        self.assertEqual("", server_protocol.in_buffer)
1877
1878
    def test_accept_excess_bytes_after_dispatch(self):
1879
        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.
1880
        smart_protocol = self.server_protocol_class(None, out_stream.write)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1881
        smart_protocol.accept_bytes('hello\n')
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
1882
        self.assertEqual(self.response_marker + "success\nok\x012\n",
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1883
                         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.
1884
        smart_protocol.accept_bytes(self.request_marker + 'hel')
1885
        self.assertEqual(self.request_marker + "hel",
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
1886
                         smart_protocol.unused_data)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1887
        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.
1888
        self.assertEqual(self.request_marker + "hello\n",
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
1889
                         smart_protocol.unused_data)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1890
        self.assertEqual("", smart_protocol.in_buffer)
1891
1892
    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.
1893
        smart_protocol = self.server_protocol_class(None, lambda x: None)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1894
        self.assertEqual(1, smart_protocol.next_read_size())
1895
        smart_protocol._send_response(
3245.4.14 by Andrew Bennetts
Merge from bzr.dev (via loom thread).
1896
            _mod_request.SuccessfulSmartServerResponse(('x',)))
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1897
        self.assertEqual(0, smart_protocol.next_read_size())
1898
1899
    def test__send_response_errors_with_base_response(self):
1900
        """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.
1901
        smart_protocol = self.server_protocol_class(None, lambda x: None)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1902
        self.assertRaises(AttributeError, smart_protocol._send_response,
3245.4.14 by Andrew Bennetts
Merge from bzr.dev (via loom thread).
1903
            _mod_request.SmartServerResponse(('x',)))
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1904
1905
    def test_query_version(self):
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
1906
        """query_version on a SmartClientProtocolTwo should return a number.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1907
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1908
        The protocol provides the query_version because the domain level clients
1909
        may all need to be able to probe for capabilities.
1910
        """
1911
        # What we really want to test here is that SmartClientProtocolTwo calls
1912
        # accept_bytes(tuple_based_encoding_of_hello) and reads and parses the
4031.3.1 by Frank Aspell
Fixing various typos
1913
        # response of tuple-encoded (ok, 1).  Also, separately we should test
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1914
        # the error if the response is a non-understood version.
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
1915
        input = StringIO(self.response_marker + 'success\nok\x012\n')
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1916
        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.
1917
        client_medium = medium.SmartSimplePipesClientMedium(
1918
            input, output, 'base')
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1919
        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.
1920
        smart_protocol = self.client_protocol_class(request)
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
1921
        self.assertEqual(2, smart_protocol.query_version())
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1922
1923
    def test_client_call_empty_response(self):
1924
        # protocol.call() can get back an empty tuple as a response. This occurs
1925
        # when the parsed line is an empty line, and results in a tuple with
1926
        # one element - an empty string.
1927
        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.
1928
            self.response_marker + 'success\n\n', ('', ), [(), ('', )])
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1929
1930
    def test_client_call_three_element_response(self):
1931
        # protocol.call() can get back tuples of other lengths. A three element
1932
        # tuple should be unpacked as three strings.
1933
        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.
1934
            self.response_marker + 'success\na\x01b\x0134\n',
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1935
            ('a', 'b', '34'),
1936
            [('a', 'b', '34')])
1937
1938
    def test_client_call_with_body_bytes_uploads(self):
1939
        # protocol.call_with_body_bytes should length-prefix the bytes onto the
1940
        # 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.
1941
        expected_bytes = self.request_marker + "foo\n7\nabcdefgdone\n"
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1942
        input = StringIO("\n")
1943
        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.
1944
        client_medium = medium.SmartSimplePipesClientMedium(
1945
            input, output, 'base')
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1946
        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.
1947
        smart_protocol = self.client_protocol_class(request)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1948
        smart_protocol.call_with_body_bytes(('foo', ), "abcdefg")
1949
        self.assertEqual(expected_bytes, output.getvalue())
1950
1951
    def test_client_call_with_body_readv_array(self):
1952
        # protocol.call_with_upload should encode the readv array and then
1953
        # 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.
1954
        expected_bytes = self.request_marker + "foo\n7\n1,2\n5,6done\n"
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1955
        input = StringIO("\n")
1956
        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.
1957
        client_medium = medium.SmartSimplePipesClientMedium(
1958
            input, output, 'base')
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1959
        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.
1960
        smart_protocol = self.client_protocol_class(request)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1961
        smart_protocol.call_with_body_readv_array(('foo', ), [(1,2),(5,6)])
1962
        self.assertEqual(expected_bytes, output.getvalue())
1963
1964
    def test_client_read_body_bytes_all(self):
1965
        # read_body_bytes should decode the body bytes from the wire into
1966
        # a response.
1967
        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.
1968
        server_bytes = (self.response_marker +
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1969
                        "success\nok\n7\n1234567done\n")
1970
        input = StringIO(server_bytes)
1971
        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.
1972
        client_medium = medium.SmartSimplePipesClientMedium(
1973
            input, output, 'base')
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1974
        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.
1975
        smart_protocol = self.client_protocol_class(request)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1976
        smart_protocol.call('foo')
1977
        smart_protocol.read_response_tuple(True)
1978
        self.assertEqual(expected_bytes, smart_protocol.read_body_bytes())
1979
1980
    def test_client_read_body_bytes_incremental(self):
1981
        # test reading a few bytes at a time from the body
1982
        # XXX: possibly we should test dribbling the bytes into the stringio
1983
        # to make the state machine work harder: however, as we use the
1984
        # LengthPrefixedBodyDecoder that is already well tested - we can skip
1985
        # that.
1986
        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.
1987
        server_bytes = self.response_marker + "success\nok\n7\n1234567done\n"
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1988
        input = StringIO(server_bytes)
1989
        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.
1990
        client_medium = medium.SmartSimplePipesClientMedium(
1991
            input, output, 'base')
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1992
        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.
1993
        smart_protocol = self.client_protocol_class(request)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
1994
        smart_protocol.call('foo')
1995
        smart_protocol.read_response_tuple(True)
1996
        self.assertEqual(expected_bytes[0:2], smart_protocol.read_body_bytes(2))
1997
        self.assertEqual(expected_bytes[2:4], smart_protocol.read_body_bytes(2))
1998
        self.assertEqual(expected_bytes[4:6], smart_protocol.read_body_bytes(2))
1999
        self.assertEqual(expected_bytes[6], smart_protocol.read_body_bytes())
2000
2001
    def test_client_cancel_read_body_does_not_eat_body_bytes(self):
2002
        # cancelling the expected body needs to finish the request, but not
2003
        # 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.
2004
        server_bytes = self.response_marker + "success\nok\n7\n1234567done\n"
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
2005
        input = StringIO(server_bytes)
2006
        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.
2007
        client_medium = medium.SmartSimplePipesClientMedium(
2008
            input, output, 'base')
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
2009
        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.
2010
        smart_protocol = self.client_protocol_class(request)
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
2011
        smart_protocol.call('foo')
2012
        smart_protocol.read_response_tuple(True)
2013
        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.
2014
        self.assertEqual(len(self.response_marker + 'success\nok\n'),
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
2015
                         input.tell())
2016
        self.assertRaises(
2017
            errors.ReadingCompleted, smart_protocol.read_body_bytes)
2018
3464.4.1 by Andrew Bennetts
Fix infinite busy-loop caused by connection loss during read of response body in HPSS v1 and v2.
2019
    def test_client_read_body_bytes_interrupted_connection(self):
2020
        server_bytes = (self.response_marker +
2021
                        "success\nok\n999\nincomplete body")
2022
        input = StringIO(server_bytes)
2023
        output = StringIO()
2024
        client_medium = medium.SmartSimplePipesClientMedium(
2025
            input, output, 'base')
2026
        request = client_medium.get_request()
2027
        smart_protocol = self.client_protocol_class(request)
2028
        smart_protocol.call('foo')
2029
        smart_protocol.read_response_tuple(True)
2030
        self.assertRaises(
2031
            errors.ConnectionReset, smart_protocol.read_body_bytes)
2032
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
2033
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.
2034
class TestSmartProtocolTwoSpecificsMixin(object):
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
2035
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
2036
    def assertBodyStreamSerialisation(self, expected_serialisation,
2037
                                      body_stream):
2038
        """Assert that body_stream is serialised as expected_serialisation."""
2039
        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.
2040
        protocol._send_stream(body_stream, out_stream.write)
2748.4.4 by Andrew Bennetts
Extract a _send_chunks function to make testing easier.
2041
        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.
2042
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.
2043
    def assertBodyStreamRoundTrips(self, body_stream):
2044
        """Assert that body_stream is the same after being serialised and
2045
        deserialised.
2046
        """
2047
        out_stream = StringIO()
2048
        protocol._send_stream(body_stream, out_stream.write)
2049
        decoder = protocol.ChunkedBodyDecoder()
2050
        decoder.accept_bytes(out_stream.getvalue())
2051
        decoded_stream = list(iter(decoder.read_next_chunk, None))
2052
        self.assertEqual(body_stream, decoded_stream)
2053
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
2054
    def test_body_stream_serialisation_empty(self):
2055
        """A body_stream with no bytes can be serialised."""
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
2056
        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.
2057
        self.assertBodyStreamRoundTrips([])
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
2058
2059
    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.
2060
        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.
2061
        self.assertBodyStreamSerialisation(
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
2062
            'chunked\n' + '9\nchunk one' + '9\nchunk two' + 'b\nchunk three' +
2063
            '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.
2064
            stream)
2065
        self.assertBodyStreamRoundTrips(stream)
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
2066
2067
    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.
2068
        """A body stream can include ''.
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
2069
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
2070
        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.
2071
        """
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.
2072
        stream = ['', 'chunk']
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
2073
        self.assertBodyStreamSerialisation(
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
2074
            '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.
2075
        self.assertBodyStreamRoundTrips(stream)
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
2076
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
2077
    def test_body_stream_error_serialistion(self):
2078
        stream = ['first chunk',
2692.1.2 by Andrew Bennetts
Merge from bzr.dev.
2079
                  _mod_request.FailedSmartServerResponse(
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
2080
                      ('FailureName', 'failure arg'))]
2081
        expected_bytes = (
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
2082
            '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.
2083
            'ERR\n' + 'b\nFailureName' + 'b\nfailure arg' +
2084
            'END\n')
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
2085
        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.
2086
        self.assertBodyStreamRoundTrips(stream)
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
2087
2432.4.6 by Robert Collins
Include success/failure feedback in SmartProtocolTwo responses to allow robust handling in the future.
2088
    def test__send_response_includes_failure_marker(self):
2089
        """FailedSmartServerResponse have 'failed\n' after the version."""
2090
        out_stream = StringIO()
2091
        smart_protocol = protocol.SmartServerRequestProtocolTwo(
2092
            None, out_stream.write)
2093
        smart_protocol._send_response(
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
2094
            _mod_request.FailedSmartServerResponse(('x',)))
2432.3.6 by Andrew Bennetts
Fix a couple of test failures introduced by the previous merge.
2095
        self.assertEqual(protocol.RESPONSE_VERSION_TWO + 'failed\nx\n',
2096
                         out_stream.getvalue())
2432.4.6 by Robert Collins
Include success/failure feedback in SmartProtocolTwo responses to allow robust handling in the future.
2097
2098
    def test__send_response_includes_success_marker(self):
2099
        """SuccessfulSmartServerResponse have 'success\n' after the version."""
2100
        out_stream = StringIO()
2101
        smart_protocol = protocol.SmartServerRequestProtocolTwo(
2102
            None, out_stream.write)
2103
        smart_protocol._send_response(
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
2104
            _mod_request.SuccessfulSmartServerResponse(('x',)))
2432.3.6 by Andrew Bennetts
Fix a couple of test failures introduced by the previous merge.
2105
        self.assertEqual(protocol.RESPONSE_VERSION_TWO + 'success\nx\n',
2106
                         out_stream.getvalue())
2432.4.6 by Robert Collins
Include success/failure feedback in SmartProtocolTwo responses to allow robust handling in the future.
2107
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
2108
    def test__send_response_with_body_stream_sets_finished_reading(self):
2109
        smart_protocol = protocol.SmartServerRequestProtocolTwo(
2110
            None, lambda x: None)
2111
        self.assertEqual(1, smart_protocol.next_read_size())
2112
        smart_protocol._send_response(
3245.4.14 by Andrew Bennetts
Merge from bzr.dev (via loom thread).
2113
            _mod_request.SuccessfulSmartServerResponse(('x',), body_stream=[]))
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
2114
        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.
2115
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
2116
    def test_streamed_body_bytes(self):
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
2117
        body_header = 'chunked\n'
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
2118
        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.
2119
        body_terminator = "END\n"
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
2120
        server_bytes = (protocol.RESPONSE_VERSION_TWO +
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
2121
                        "success\nok\n" + body_header + two_body_chunks +
2122
                        body_terminator)
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
2123
        input = StringIO(server_bytes)
2124
        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.
2125
        client_medium = medium.SmartSimplePipesClientMedium(
2126
            input, output, 'base')
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
2127
        request = client_medium.get_request()
2128
        smart_protocol = protocol.SmartClientRequestProtocolTwo(request)
2129
        smart_protocol.call('foo')
2130
        smart_protocol.read_response_tuple(True)
2131
        stream = smart_protocol.read_streamed_body()
2132
        self.assertEqual(['1234', '567'], list(stream))
2133
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
2134
    def test_read_streamed_body_error(self):
2135
        """When a stream is interrupted by an error..."""
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
2136
        body_header = 'chunked\n'
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
2137
        a_body_chunk = '4\naaaa'
2748.4.6 by Andrew Bennetts
Use chunks for stream errors, rather than the response tuple format.
2138
        err_signal = 'ERR\n'
2139
        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.
2140
        finish = 'END\n'
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
2141
        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.
2142
        server_bytes = (protocol.RESPONSE_VERSION_TWO +
2748.4.6 by Andrew Bennetts
Use chunks for stream errors, rather than the response tuple format.
2143
                        "success\nok\n" + body)
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
2144
        input = StringIO(server_bytes)
2145
        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.
2146
        client_medium = medium.SmartSimplePipesClientMedium(
2147
            input, output, 'base')
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
2148
        smart_request = client_medium.get_request()
2149
        smart_protocol = protocol.SmartClientRequestProtocolTwo(smart_request)
2150
        smart_protocol.call('foo')
2151
        smart_protocol.read_response_tuple(True)
2152
        expected_chunks = [
2153
            'aaaa',
2692.1.2 by Andrew Bennetts
Merge from bzr.dev.
2154
            _mod_request.FailedSmartServerResponse(('error arg1', 'arg2'))]
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
2155
        stream = smart_protocol.read_streamed_body()
2156
        self.assertEqual(expected_chunks, list(stream))
2157
3464.4.1 by Andrew Bennetts
Fix infinite busy-loop caused by connection loss during read of response body in HPSS v1 and v2.
2158
    def test_streamed_body_bytes_interrupted_connection(self):
2159
        body_header = 'chunked\n'
2160
        incomplete_body_chunk = "9999\nincomplete chunk"
2161
        server_bytes = (protocol.RESPONSE_VERSION_TWO +
2162
                        "success\nok\n" + body_header + incomplete_body_chunk)
2163
        input = StringIO(server_bytes)
2164
        output = StringIO()
2165
        client_medium = medium.SmartSimplePipesClientMedium(
2166
            input, output, 'base')
2167
        request = client_medium.get_request()
2168
        smart_protocol = protocol.SmartClientRequestProtocolTwo(request)
2169
        smart_protocol.call('foo')
2170
        smart_protocol.read_response_tuple(True)
2171
        stream = smart_protocol.read_streamed_body()
2172
        self.assertRaises(errors.ConnectionReset, stream.next)
2173
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
2174
    def test_client_read_response_tuple_sets_response_status(self):
2175
        server_bytes = protocol.RESPONSE_VERSION_TWO + "success\nok\n"
2176
        input = StringIO(server_bytes)
2177
        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.
2178
        client_medium = medium.SmartSimplePipesClientMedium(
2179
            input, output, 'base')
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
2180
        request = client_medium.get_request()
2181
        smart_protocol = protocol.SmartClientRequestProtocolTwo(request)
2182
        smart_protocol.call('foo')
2183
        smart_protocol.read_response_tuple(False)
2184
        self.assertEqual(True, smart_protocol.response_status)
2185
3245.4.55 by Andrew Bennetts
Test improvements suggested by John's review.
2186
    def test_client_read_response_tuple_raises_UnknownSmartMethod(self):
2187
        """read_response_tuple raises UnknownSmartMethod if the response says
2188
        the server did not recognise the request.
2189
        """
2190
        server_bytes = (
2191
            protocol.RESPONSE_VERSION_TWO +
2192
            "failed\n" +
2193
            "error\x01Generic bzr smart protocol error: bad request 'foo'\n")
2194
        input = StringIO(server_bytes)
2195
        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.
2196
        client_medium = medium.SmartSimplePipesClientMedium(
2197
            input, output, 'base')
3245.4.55 by Andrew Bennetts
Test improvements suggested by John's review.
2198
        request = client_medium.get_request()
2199
        smart_protocol = protocol.SmartClientRequestProtocolTwo(request)
2200
        smart_protocol.call('foo')
2201
        self.assertRaises(
2202
            errors.UnknownSmartMethod, smart_protocol.read_response_tuple)
2203
        # The request has been finished.  There is no body to read, and
2204
        # attempts to read one will fail.
2205
        self.assertRaises(
2206
            errors.ReadingCompleted, smart_protocol.read_body_bytes)
2207
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
2208
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.
2209
class TestSmartProtocolTwoSpecifics(
2210
        TestSmartProtocol, TestSmartProtocolTwoSpecificsMixin):
2211
    """Tests for aspects of smart protocol version two that are unique to
2212
    version two.
2213
2214
    Thus tests involving body streams and success/failure markers belong here.
2215
    """
2216
2217
    client_protocol_class = protocol.SmartClientRequestProtocolTwo
2218
    server_protocol_class = protocol.SmartServerRequestProtocolTwo
2219
2220
2221
class TestVersionOneFeaturesInProtocolThree(
2222
    TestSmartProtocol, CommonSmartProtocolTestMixin):
2223
    """Tests for version one smart protocol features as implemented by version
2224
    three.
2225
    """
2226
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
2227
    request_encoder = protocol.ProtocolThreeRequester
2228
    response_decoder = protocol.ProtocolThreeDecoder
3245.4.4 by Andrew Bennetts
Fix a KnownFailure.
2229
    # build_server_protocol_three is a function, so we can't set it as a class
2230
    # 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.
2231
    # method.  So we make server_protocol_class be a static method, rather than
2232
    # simply doing:
3245.4.4 by Andrew Bennetts
Fix a KnownFailure.
2233
    # "server_protocol_class = protocol.build_server_protocol_three".
3245.4.10 by Andrew Bennetts
Use a less ugly hack for TestVersionOneFeaturesInProtocolThree.server_protocol_class.
2234
    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.
2235
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
2236
    def setUp(self):
2237
        super(TestVersionOneFeaturesInProtocolThree, self).setUp()
2238
        self.response_marker = protocol.MESSAGE_VERSION_THREE
2239
        self.request_marker = protocol.MESSAGE_VERSION_THREE
2240
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.
2241
    def test_construct_version_three_server_protocol(self):
3245.4.7 by Andrew Bennetts
Rename _ProtocolThreeBase to ProtocolThreeDecoder, remove SmartServerRequestProtocolThree.
2242
        smart_protocol = protocol.ProtocolThreeDecoder(None)
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
2243
        self.assertEqual('', smart_protocol.unused_data)
3649.5.5 by John Arbash Meinel
Fix the test suite.
2244
        self.assertEqual([], smart_protocol._in_buffer_list)
2245
        self.assertEqual(0, smart_protocol._in_buffer_len)
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
2246
        self.assertFalse(smart_protocol._has_dispatched)
3195.3.19 by Andrew Bennetts
Remove a stray pdb, fix a test.
2247
        # The protocol starts by expecting four bytes, a length prefix for the
2248
        # headers.
2249
        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.
2250
2251
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
2252
class LoggingMessageHandler(object):
2253
2254
    def __init__(self):
2255
        self.event_log = []
2256
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
2257
    def _log(self, *args):
2258
        self.event_log.append(args)
2259
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
2260
    def headers_received(self, headers):
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
2261
        self._log('headers', headers)
2262
2263
    def protocol_error(self, exception):
2264
        self._log('protocol_error', exception)
2265
2266
    def byte_part_received(self, byte):
2267
        self._log('byte', byte)
2268
2269
    def bytes_part_received(self, bytes):
2270
        self._log('bytes', bytes)
2271
2272
    def structure_part_received(self, structure):
2273
        self._log('structure', structure)
2274
2275
    def end_received(self):
2276
        self._log('end')
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
2277
2278
2279
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.
2280
    """Tests for v3 of the server-side protocol."""
2281
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
2282
    request_encoder = protocol.ProtocolThreeRequester
2283
    response_decoder = protocol.ProtocolThreeDecoder
3245.4.7 by Andrew Bennetts
Rename _ProtocolThreeBase to ProtocolThreeDecoder, remove SmartServerRequestProtocolThree.
2284
    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.
2285
2286
    def test_trivial_request(self):
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
2287
        """Smoke test for the simplest possible v3 request: empty headers, no
2288
        message parts.
3195.3.1 by Andrew Bennetts
Add TestProtocolTestCoverage.
2289
        """
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.
2290
        output = StringIO()
2291
        headers = '\0\0\0\x02de'  # length-prefixed, bencoded empty dict
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
2292
        end = 'e'
2293
        request_bytes = headers + end
2294
        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.
2295
        smart_protocol.accept_bytes(request_bytes)
2296
        self.assertEqual(0, smart_protocol.next_read_size())
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
2297
        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.
2298
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
2299
    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.
2300
        headers = '\0\0\0\x02de'  # length-prefixed, bencoded empty dict
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
2301
        message_handler = LoggingMessageHandler()
2302
        smart_protocol = self.server_protocol_class(message_handler)
2303
        smart_protocol.accept_bytes(headers)
2304
        # Clear the event log
2305
        del message_handler.event_log[:]
2306
        return smart_protocol, message_handler.event_log
2307
2308
    def test_decode_one_byte(self):
2309
        """The protocol can decode a 'one byte' message part."""
2310
        smart_protocol, event_log = self.make_protocol_expecting_message_part()
2311
        smart_protocol.accept_bytes('ox')
2312
        self.assertEqual([('byte', 'x')], event_log)
2313
2314
    def test_decode_bytes(self):
2315
        """The protocol can decode a 'bytes' message part."""
2316
        smart_protocol, event_log = self.make_protocol_expecting_message_part()
2317
        smart_protocol.accept_bytes(
2318
            'b' # message part kind
2319
            '\0\0\0\x07' # length prefix
2320
            'payload' # payload
2321
            )
2322
        self.assertEqual([('bytes', 'payload')], event_log)
2323
2324
    def test_decode_structure(self):
2325
        """The protocol can decode a 'structure' message part."""
2326
        smart_protocol, event_log = self.make_protocol_expecting_message_part()
2327
        smart_protocol.accept_bytes(
2328
            's' # message part kind
2329
            '\0\0\0\x07' # length prefix
2330
            'l3:ARGe' # ['ARG']
2331
            )
3842.3.6 by Andrew Bennetts
Tweak bencode.py to decode sequences as tuples, not lists.
2332
        self.assertEqual([('structure', ('ARG',))], event_log)
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
2333
2334
    def test_decode_multiple_bytes(self):
2335
        """The protocol can decode a multiple 'bytes' message parts."""
2336
        smart_protocol, event_log = self.make_protocol_expecting_message_part()
2337
        smart_protocol.accept_bytes(
2338
            'b' # message part kind
2339
            '\0\0\0\x05' # length prefix
2340
            'first' # payload
2341
            'b' # message part kind
2342
            '\0\0\0\x06'
2343
            'second'
2344
            )
2345
        self.assertEqual(
2346
            [('bytes', 'first'), ('bytes', 'second')], event_log)
2347
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.
2348
3923.5.1 by Andrew Bennetts
Add _SmartClient.call_with_body_bytes, plus some server-side code for handling bodies delivered in multiple parts.
2349
class TestConventionalResponseHandlerBodyStream(tests.TestCase):
3245.4.5 by Andrew Bennetts
Implement interrupting body streams with an error.
2350
3464.4.1 by Andrew Bennetts
Fix infinite busy-loop caused by connection loss during read of response body in HPSS v1 and v2.
2351
    def make_response_handler(self, response_bytes):
3245.4.5 by Andrew Bennetts
Implement interrupting body streams with an error.
2352
        from bzrlib.smart.message import ConventionalResponseHandler
2353
        response_handler = ConventionalResponseHandler()
3245.4.7 by Andrew Bennetts
Rename _ProtocolThreeBase to ProtocolThreeDecoder, remove SmartServerRequestProtocolThree.
2354
        protocol_decoder = protocol.ProtocolThreeDecoder(response_handler)
3245.4.5 by Andrew Bennetts
Implement interrupting body streams with an error.
2355
        # put decoder in desired state (waiting for message parts)
2356
        protocol_decoder.state_accept = protocol_decoder._state_accept_expecting_message_part
2357
        output = StringIO()
2358
        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.
2359
            StringIO(response_bytes), output, 'base')
3245.4.5 by Andrew Bennetts
Implement interrupting body streams with an error.
2360
        medium_request = client_medium.get_request()
2361
        medium_request.finished_writing()
3245.4.26 by Andrew Bennetts
Rename 'setProtoAndMedium' to more accurate 'setProtoAndMediumRequest', add ABCs for Requesters and ResponseHandlers.
2362
        response_handler.setProtoAndMediumRequest(
2363
            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.
2364
        return response_handler
2365
3923.5.1 by Andrew Bennetts
Add _SmartClient.call_with_body_bytes, plus some server-side code for handling bodies delivered in multiple parts.
2366
    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.
2367
        response_handler = self.make_response_handler(interrupted_body_stream)
3245.4.5 by Andrew Bennetts
Implement interrupting body streams with an error.
2368
        stream = response_handler.read_streamed_body()
4064.1.2 by Andrew Bennetts
Refactor server-side error translation, improve tests.
2369
        self.assertEqual('aaa', stream.next())
2370
        self.assertEqual('bbb', stream.next())
3245.4.5 by Andrew Bennetts
Implement interrupting body streams with an error.
2371
        exc = self.assertRaises(errors.ErrorFromSmartServer, stream.next)
4064.1.2 by Andrew Bennetts
Refactor server-side error translation, improve tests.
2372
        self.assertEqual(('error', 'Boom!'), exc.error_tuple)
3245.4.5 by Andrew Bennetts
Implement interrupting body streams with an error.
2373
3923.5.1 by Andrew Bennetts
Add _SmartClient.call_with_body_bytes, plus some server-side code for handling bodies delivered in multiple parts.
2374
    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.
2375
        interrupted_body_stream = (
2376
            'oS' # successful response
2377
            's\0\0\0\x02le' # empty args
2378
            'b\0\0\xff\xffincomplete chunk')
2379
        response_handler = self.make_response_handler(interrupted_body_stream)
2380
        stream = response_handler.read_streamed_body()
2381
        self.assertRaises(errors.ConnectionReset, stream.next)
2382
2383
    def test_read_body_bytes_interrupted_by_connection_lost(self):
2384
        interrupted_body_stream = (
2385
            'oS' # successful response
2386
            's\0\0\0\x02le' # empty args
2387
            'b\0\0\xff\xffincomplete chunk')
2388
        response_handler = self.make_response_handler(interrupted_body_stream)
2389
        self.assertRaises(
2390
            errors.ConnectionReset, response_handler.read_body_bytes)
2391
3923.5.1 by Andrew Bennetts
Add _SmartClient.call_with_body_bytes, plus some server-side code for handling bodies delivered in multiple parts.
2392
    def test_multiple_bytes_parts(self):
2393
        multiple_bytes_parts = (
2394
            'oS' # successful response
2395
            's\0\0\0\x02le' # empty args
2396
            'b\0\0\0\x0bSome bytes\n' # some bytes
2397
            'b\0\0\0\x0aMore bytes' # more bytes
2398
            'e' # message end
2399
            )
2400
        response_handler = self.make_response_handler(multiple_bytes_parts)
2401
        self.assertEqual(
2402
            'Some bytes\nMore bytes', response_handler.read_body_bytes())
2403
        response_handler = self.make_response_handler(multiple_bytes_parts)
2404
        self.assertEqual(
2405
            ['Some bytes\n', 'More bytes'],
2406
            list(response_handler.read_streamed_body()))
2407
2408
3923.5.6 by Andrew Bennetts
Fix a style nit.
2409
class FakeResponder(object):
2410
3923.5.1 by Andrew Bennetts
Add _SmartClient.call_with_body_bytes, plus some server-side code for handling bodies delivered in multiple parts.
2411
    response_sent = False
3923.5.6 by Andrew Bennetts
Fix a style nit.
2412
3923.5.1 by Andrew Bennetts
Add _SmartClient.call_with_body_bytes, plus some server-side code for handling bodies delivered in multiple parts.
2413
    def send_error(self, exc):
2414
        raise exc
3923.5.6 by Andrew Bennetts
Fix a style nit.
2415
3923.5.1 by Andrew Bennetts
Add _SmartClient.call_with_body_bytes, plus some server-side code for handling bodies delivered in multiple parts.
2416
    def send_response(self, response):
2417
        pass
2418
2419
2420
class TestConventionalRequestHandlerBodyStream(tests.TestCase):
2421
    """Tests for ConventionalRequestHandler's handling of request bodies."""
2422
2423
    def make_request_handler(self, request_bytes):
2424
        """Make a ConventionalRequestHandler for the given bytes using test
2425
        doubles for the request_handler and the responder.
2426
        """
2427
        from bzrlib.smart.message import ConventionalRequestHandler
2428
        request_handler = InstrumentedRequestHandler()
2429
        request_handler.response = _mod_request.SuccessfulSmartServerResponse(('arg', 'arg'))
3923.5.6 by Andrew Bennetts
Fix a style nit.
2430
        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.
2431
        message_handler = ConventionalRequestHandler(request_handler, responder)
2432
        protocol_decoder = protocol.ProtocolThreeDecoder(message_handler)
2433
        # put decoder in desired state (waiting for message parts)
2434
        protocol_decoder.state_accept = protocol_decoder._state_accept_expecting_message_part
2435
        protocol_decoder.accept_bytes(request_bytes)
2436
        return request_handler
2437
2438
    def test_multiple_bytes_parts(self):
2439
        """Each bytes part triggers a call to the request_handler's
2440
        accept_body method.
2441
        """
2442
        multiple_bytes_parts = (
2443
            's\0\0\0\x07l3:fooe' # args
2444
            'b\0\0\0\x0bSome bytes\n' # some bytes
2445
            'b\0\0\0\x0aMore bytes' # more bytes
2446
            'e' # message end
2447
            )
2448
        request_handler = self.make_request_handler(multiple_bytes_parts)
2449
        accept_body_calls = [
2450
            call_info[1] for call_info in request_handler.calls
2451
            if call_info[0] == 'accept_body']
2452
        self.assertEqual(
2453
            ['Some bytes\n', 'More bytes'], accept_body_calls)
2454
3923.5.4 by Andrew Bennetts
Allow a request's body part(s) to be followed by an error.
2455
    def test_error_flag_after_body(self):
2456
        body_then_error = (
2457
            's\0\0\0\x07l3:fooe' # request args
2458
            'b\0\0\0\x0bSome bytes\n' # some bytes
2459
            'b\0\0\0\x0aMore bytes' # more bytes
2460
            'oE' # error flag
2461
            's\0\0\0\x07l3:bare' # error args
2462
            'e' # message end
2463
            )
2464
        request_handler = self.make_request_handler(body_then_error)
2465
        self.assertEqual(
2466
            [('post_body_error_received', ('bar',)), ('end_received',)],
2467
            request_handler.calls[-2:])
2468
3245.4.5 by Andrew Bennetts
Implement interrupting body streams with an error.
2469
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.
2470
class TestMessageHandlerErrors(tests.TestCase):
2471
    """Tests for v3 that unrecognised (but well-formed) requests/responses are
2472
    still fully read off the wire, so that subsequent requests/responses on the
2473
    same medium can be decoded.
2474
    """
2475
2476
    def test_non_conventional_request(self):
2477
        """ConventionalRequestHandler (the default message handler on the
2478
        server side) will reject an unconventional message, but still consume
2479
        all the bytes of that message and signal when it has done so.
2480
2481
        This is what allows a server to continue to accept requests after the
2482
        client sends a completely unrecognised request.
2483
        """
2484
        # Define an invalid request (but one that is a well-formed message).
2485
        # This particular invalid request not only lacks the mandatory
2486
        # verb+args tuple, it has a single-byte part, which is forbidden.  In
2487
        # fact it has that part twice, to trigger multiple errors.
2488
        invalid_request = (
2489
            protocol.MESSAGE_VERSION_THREE +  # protocol version marker
2490
            '\0\0\0\x02de' + # empty headers
2491
            'oX' + # a single byte part: 'X'.  ConventionalRequestHandler will
2492
                   # error at this part.
2493
            'oX' + # and again.
2494
            'e' # end of message
2495
            )
2496
2497
        to_server = StringIO(invalid_request)
2498
        from_server = StringIO()
2499
        transport = memory.MemoryTransport('memory:///')
2500
        server = medium.SmartServerPipeStreamMedium(
2501
            to_server, from_server, transport)
2502
        proto = server._build_protocol()
2503
        message_handler = proto.message_handler
2504
        server._serve_one_request(proto)
2505
        # All the bytes have been read from the medium...
2506
        self.assertEqual('', to_server.read())
2507
        # ...and the protocol decoder has consumed all the bytes, and has
2508
        # finished reading.
2509
        self.assertEqual('', proto.unused_data)
2510
        self.assertEqual(0, proto.next_read_size())
2511
2512
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.
2513
class InstrumentedRequestHandler(object):
2514
    """Test Double of SmartServerRequestHandler."""
2515
2516
    def __init__(self):
2517
        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.
2518
        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.
2519
2520
    def no_body_received(self):
2521
        self.calls.append(('no_body_received',))
2522
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).
2523
    def end_received(self):
2524
        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.
2525
        self.finished_reading = True
2526
2527
    def dispatch_command(self, cmd, args):
2528
        self.calls.append(('dispatch_command', cmd, args))
2529
2530
    def accept_body(self, bytes):
2531
        self.calls.append(('accept_body', bytes))
2532
2533
    def end_of_body(self):
2534
        self.calls.append(('end_of_body',))
2535
        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).
2536
3923.5.4 by Andrew Bennetts
Allow a request's body part(s) to be followed by an error.
2537
    def post_body_error_received(self, error_args):
2538
        self.calls.append(('post_body_error_received', error_args))
2539
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.
2540
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
2541
class StubRequest(object):
2542
2543
    def finished_reading(self):
2544
        pass
2545
2546
3245.4.22 by Andrew Bennetts
Uncomment TestClientDecodingProtocolThree.test_trivial_response_decoding.
2547
class TestClientDecodingProtocolThree(TestSmartProtocol):
2548
    """Tests for v3 of the client-side protocol decoding."""
2549
3245.4.55 by Andrew Bennetts
Test improvements suggested by John's review.
2550
    def make_logging_response_decoder(self):
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
2551
        """Make v3 response decoder using a test response handler."""
2552
        response_handler = LoggingMessageHandler()
2553
        decoder = protocol.ProtocolThreeDecoder(response_handler)
2554
        return decoder, response_handler
2555
2556
    def make_conventional_response_decoder(self):
3245.4.23 by Andrew Bennetts
Improve test_trivial_response_decoding slightly.
2557
        """Make v3 response decoder using a conventional response handler."""
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
2558
        response_handler = message.ConventionalResponseHandler()
3245.4.23 by Andrew Bennetts
Improve test_trivial_response_decoding slightly.
2559
        decoder = protocol.ProtocolThreeDecoder(response_handler)
3245.4.26 by Andrew Bennetts
Rename 'setProtoAndMedium' to more accurate 'setProtoAndMediumRequest', add ABCs for Requesters and ResponseHandlers.
2560
        response_handler.setProtoAndMediumRequest(decoder, StubRequest())
3245.4.23 by Andrew Bennetts
Improve test_trivial_response_decoding slightly.
2561
        return decoder, response_handler
2562
3245.4.22 by Andrew Bennetts
Uncomment TestClientDecodingProtocolThree.test_trivial_response_decoding.
2563
    def test_trivial_response_decoding(self):
2564
        """Smoke test for the simplest possible v3 response: empty headers,
3245.4.23 by Andrew Bennetts
Improve test_trivial_response_decoding slightly.
2565
        status byte, empty args, no body.
3245.4.22 by Andrew Bennetts
Uncomment TestClientDecodingProtocolThree.test_trivial_response_decoding.
2566
        """
2567
        headers = '\0\0\0\x02de'  # length-prefixed, bencoded empty dict
2568
        response_status = 'oS' # success
2569
        args = 's\0\0\0\x02le' # length-prefixed, bencoded empty list
2570
        end = 'e' # end marker
3245.4.23 by Andrew Bennetts
Improve test_trivial_response_decoding slightly.
2571
        message_bytes = headers + response_status + args + end
3245.4.55 by Andrew Bennetts
Test improvements suggested by John's review.
2572
        decoder, response_handler = self.make_logging_response_decoder()
3245.4.23 by Andrew Bennetts
Improve test_trivial_response_decoding slightly.
2573
        decoder.accept_bytes(message_bytes)
2574
        # The protocol decoder has finished, and consumed all bytes
3245.4.22 by Andrew Bennetts
Uncomment TestClientDecodingProtocolThree.test_trivial_response_decoding.
2575
        self.assertEqual(0, decoder.next_read_size())
2576
        self.assertEqual('', decoder.unused_data)
3245.4.23 by Andrew Bennetts
Improve test_trivial_response_decoding slightly.
2577
        # The message handler has been invoked with all the parts of the
2578
        # trivial response: empty headers, status byte, no args, end.
2579
        self.assertEqual(
3842.3.6 by Andrew Bennetts
Tweak bencode.py to decode sequences as tuples, not lists.
2580
            [('headers', {}), ('byte', 'S'), ('structure', ()), ('end',)],
3245.4.23 by Andrew Bennetts
Improve test_trivial_response_decoding slightly.
2581
            response_handler.event_log)
3195.3.5 by Andrew Bennetts
Start writing the client-side protocol logic for HPSS v3.
2582
3245.4.55 by Andrew Bennetts
Test improvements suggested by John's review.
2583
    def test_incomplete_message(self):
2584
        """A decoder will keep signalling that it needs more bytes via
2585
        next_read_size() != 0 until it has seen a complete message, regardless
2586
        which state it is in.
2587
        """
2588
        # Define a simple response that uses all possible message parts.
2589
        headers = '\0\0\0\x02de'  # length-prefixed, bencoded empty dict
2590
        response_status = 'oS' # success
2591
        args = 's\0\0\0\x02le' # length-prefixed, bencoded empty list
2592
        body = 'b\0\0\0\x04BODY' # a body: 'BODY'
2593
        end = 'e' # end marker
2594
        simple_response = headers + response_status + args + body + end
2595
        # Feed the request to the decoder one byte at a time.
2596
        decoder, response_handler = self.make_logging_response_decoder()
2597
        for byte in simple_response:
2598
            self.assertNotEqual(0, decoder.next_read_size())
2599
            decoder.accept_bytes(byte)
2600
        # Now the response is complete
2601
        self.assertEqual(0, decoder.next_read_size())
2602
2603
    def test_read_response_tuple_raises_UnknownSmartMethod(self):
2604
        """read_response_tuple raises UnknownSmartMethod if the server replied
2605
        with 'UnknownMethod'.
2606
        """
3245.4.35 by Andrew Bennetts
Remove some commented out cruft, test (and fix) handling of an 'UnknownMethod' response.
2607
        headers = '\0\0\0\x02de'  # length-prefixed, bencoded empty dict
2608
        response_status = 'oE' # error flag
2609
        # args: ('UnknownMethod', 'method-name')
2610
        args = 's\0\0\0\x20l13:UnknownMethod11:method-namee'
2611
        end = 'e' # end marker
2612
        message_bytes = headers + response_status + args + end
2613
        decoder, response_handler = self.make_conventional_response_decoder()
2614
        decoder.accept_bytes(message_bytes)
2615
        error = self.assertRaises(
2616
            errors.UnknownSmartMethod, response_handler.read_response_tuple)
2617
        self.assertEqual('method-name', error.verb)
2618
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
2619
    def test_read_response_tuple_error(self):
2620
        """If the response has an error, it is raised as an exception."""
2621
        headers = '\0\0\0\x02de'  # length-prefixed, bencoded empty dict
2622
        response_status = 'oE' # error
2623
        args = 's\0\0\0\x1al9:first arg10:second arge' # two args
2624
        end = 'e' # end marker
2625
        message_bytes = headers + response_status + args + end
2626
        decoder, response_handler = self.make_conventional_response_decoder()
2627
        decoder.accept_bytes(message_bytes)
2628
        error = self.assertRaises(
2629
            errors.ErrorFromSmartServer, response_handler.read_response_tuple)
2630
        self.assertEqual(('first arg', 'second arg'), error.error_tuple)
2631
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.
2632
3195.3.14 by Andrew Bennetts
Add some tests for how the client encodes requests.
2633
class TestClientEncodingProtocolThree(TestSmartProtocol):
2634
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
2635
    request_encoder = protocol.ProtocolThreeRequester
2636
    response_decoder = protocol.ProtocolThreeDecoder
3245.4.7 by Andrew Bennetts
Rename _ProtocolThreeBase to ProtocolThreeDecoder, remove SmartServerRequestProtocolThree.
2637
    server_protocol_class = protocol.ProtocolThreeDecoder
3195.3.14 by Andrew Bennetts
Add some tests for how the client encodes requests.
2638
2639
    def make_client_encoder_and_output(self):
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
2640
        result = self.make_client_protocol_and_output()
2641
        requester, response_handler, output = result
2642
        return requester, output
3195.3.14 by Andrew Bennetts
Add some tests for how the client encodes requests.
2643
2644
    def test_call_smoke_test(self):
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
2645
        """A smoke test for ProtocolThreeRequester.call.
3195.3.14 by Andrew Bennetts
Add some tests for how the client encodes requests.
2646
2647
        This test checks that a particular simple invocation of call emits the
2648
        correct bytes for that invocation.
2649
        """
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
2650
        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.
2651
        requester.set_headers({'header name': 'header value'})
2652
        requester.call('one arg')
3195.3.14 by Andrew Bennetts
Add some tests for how the client encodes requests.
2653
        self.assertEquals(
3245.4.60 by Andrew Bennetts
Update the protocol v3 version string to say 'bzr 1.6'.
2654
            'bzr message 3 (bzr 1.6)\n' # protocol version
3195.3.14 by Andrew Bennetts
Add some tests for how the client encodes requests.
2655
            '\x00\x00\x00\x1fd11:header name12:header valuee' # headers
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
2656
            's\x00\x00\x00\x0bl7:one arge' # args
2657
            'e', # end
3195.3.14 by Andrew Bennetts
Add some tests for how the client encodes requests.
2658
            output.getvalue())
2659
2660
    def test_call_with_body_bytes_smoke_test(self):
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
2661
        """A smoke test for ProtocolThreeRequester.call_with_body_bytes.
3195.3.14 by Andrew Bennetts
Add some tests for how the client encodes requests.
2662
2663
        This test checks that a particular simple invocation of
2664
        call_with_body_bytes emits the correct bytes for that invocation.
2665
        """
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
2666
        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.
2667
        requester.set_headers({'header name': 'header value'})
2668
        requester.call_with_body_bytes(('one arg',), 'body bytes')
3195.3.14 by Andrew Bennetts
Add some tests for how the client encodes requests.
2669
        self.assertEquals(
3245.4.60 by Andrew Bennetts
Update the protocol v3 version string to say 'bzr 1.6'.
2670
            'bzr message 3 (bzr 1.6)\n' # protocol version
3195.3.14 by Andrew Bennetts
Add some tests for how the client encodes requests.
2671
            '\x00\x00\x00\x1fd11:header name12:header valuee' # headers
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
2672
            's\x00\x00\x00\x0bl7:one arge' # args
2673
            'b' # there is a prefixed body
2674
            '\x00\x00\x00\nbody bytes' # the prefixed body
2675
            'e', # end
3195.3.14 by Andrew Bennetts
Add some tests for how the client encodes requests.
2676
            output.getvalue())
2677
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.
2678
    def test_call_writes_just_once(self):
2679
        """A bodyless request is written to the medium all at once."""
2680
        medium_request = StubMediumRequest()
2681
        encoder = protocol.ProtocolThreeRequester(medium_request)
2682
        encoder.call('arg1', 'arg2', 'arg3')
2683
        self.assertEqual(
2684
            ['accept_bytes', 'finished_writing'], medium_request.calls)
2685
2686
    def test_call_with_body_bytes_writes_just_once(self):
2687
        """A request with body bytes is written to the medium all at once."""
2688
        medium_request = StubMediumRequest()
2689
        encoder = protocol.ProtocolThreeRequester(medium_request)
2690
        encoder.call_with_body_bytes(('arg', 'arg'), 'body bytes')
2691
        self.assertEqual(
2692
            ['accept_bytes', 'finished_writing'], medium_request.calls)
2693
3923.5.1 by Andrew Bennetts
Add _SmartClient.call_with_body_bytes, plus some server-side code for handling bodies delivered in multiple parts.
2694
    def test_call_with_body_stream_smoke_test(self):
2695
        """A smoke test for ProtocolThreeRequester.call_with_body_stream.
2696
2697
        This test checks that a particular simple invocation of
2698
        call_with_body_stream emits the correct bytes for that invocation.
2699
        """
2700
        requester, output = self.make_client_encoder_and_output()
2701
        requester.set_headers({'header name': 'header value'})
2702
        stream = ['chunk 1', 'chunk two']
2703
        requester.call_with_body_stream(('one arg',), stream)
2704
        self.assertEquals(
2705
            'bzr message 3 (bzr 1.6)\n' # protocol version
2706
            '\x00\x00\x00\x1fd11:header name12:header valuee' # headers
2707
            's\x00\x00\x00\x0bl7:one arge' # args
2708
            'b\x00\x00\x00\x07chunk 1' # a prefixed body chunk
2709
            'b\x00\x00\x00\x09chunk two' # a prefixed body chunk
2710
            'e', # end
2711
            output.getvalue())
2712
2713
    def test_call_with_body_stream_empty_stream(self):
2714
        """call_with_body_stream with an empty stream."""
2715
        requester, output = self.make_client_encoder_and_output()
2716
        requester.set_headers({})
2717
        stream = []
2718
        requester.call_with_body_stream(('one arg',), stream)
2719
        self.assertEquals(
2720
            'bzr message 3 (bzr 1.6)\n' # protocol version
2721
            '\x00\x00\x00\x02de' # headers
2722
            's\x00\x00\x00\x0bl7:one arge' # args
2723
            # no body chunks
2724
            'e', # end
2725
            output.getvalue())
2726
3923.5.5 by Andrew Bennetts
Cleanly abort the request if an error occurs while iterating a body stream.
2727
    def test_call_with_body_stream_error(self):
2728
        """call_with_body_stream will abort the streamed body with an
2729
        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.
2730
3923.5.5 by Andrew Bennetts
Cleanly abort the request if an error occurs while iterating a body stream.
2731
        The resulting request will still be a complete message.
2732
        """
2733
        requester, output = self.make_client_encoder_and_output()
2734
        requester.set_headers({})
2735
        def stream_that_fails():
2736
            yield 'aaa'
2737
            yield 'bbb'
2738
            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.
2739
        self.assertRaises(Exception, requester.call_with_body_stream,
2740
            ('one arg',), stream_that_fails())
3923.5.5 by Andrew Bennetts
Cleanly abort the request if an error occurs while iterating a body stream.
2741
        self.assertEquals(
2742
            'bzr message 3 (bzr 1.6)\n' # protocol version
2743
            '\x00\x00\x00\x02de' # headers
2744
            's\x00\x00\x00\x0bl7:one arge' # args
2745
            'b\x00\x00\x00\x03aaa' # body
2746
            'b\x00\x00\x00\x03bbb' # more body
2747
            'oE' # error flag
2748
            's\x00\x00\x00\x09l5:errore' # error args: ('error',)
2749
            'e', # end
2750
            output.getvalue())
2751
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.
2752
2753
class StubMediumRequest(object):
2754
    """A stub medium request that tracks the number of times accept_bytes is
2755
    called.
2756
    """
3441.3.3 by Andrew Bennetts
Fix PEP 8 nit.
2757
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.
2758
    def __init__(self):
2759
        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.
2760
        self._medium = 'dummy medium'
3441.3.3 by Andrew Bennetts
Fix PEP 8 nit.
2761
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.
2762
    def accept_bytes(self, bytes):
2763
        self.calls.append('accept_bytes')
3441.3.3 by Andrew Bennetts
Fix PEP 8 nit.
2764
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.
2765
    def finished_writing(self):
2766
        self.calls.append('finished_writing')
2767
3195.3.14 by Andrew Bennetts
Add some tests for how the client encodes requests.
2768
4064.1.2 by Andrew Bennetts
Refactor server-side error translation, improve tests.
2769
interrupted_body_stream = (
2770
    'oS' # status flag (success)
2771
    's\x00\x00\x00\x08l4:argse' # args struct ('args,')
2772
    'b\x00\x00\x00\x03aaa' # body part ('aaa')
2773
    'b\x00\x00\x00\x03bbb' # body part ('bbb')
2774
    'oE' # status flag (error)
2775
    's\x00\x00\x00\x10l5:error5:Boom!e' # err struct ('error', 'Boom!')
2776
    'e' # EOM
2777
    )
2778
2779
3245.4.37 by Andrew Bennetts
Add test for sending ProtocolThreeResponder.send_error(UnknownSmartMethod(...)).
2780
class TestResponseEncodingProtocolThree(tests.TestCase):
2781
2782
    def make_response_encoder(self):
2783
        out_stream = StringIO()
2784
        response_encoder = protocol.ProtocolThreeResponder(out_stream.write)
2785
        return response_encoder, out_stream
2786
2787
    def test_send_error_unknown_method(self):
2788
        encoder, out_stream = self.make_response_encoder()
2789
        encoder.send_error(errors.UnknownSmartMethod('method name'))
2790
        # Use assertEndsWith so that we don't compare the header, which varies
2791
        # by bzrlib.__version__.
2792
        self.assertEndsWith(
2793
            out_stream.getvalue(),
2794
            # error status
2795
            'oE' +
2796
            # tuple: 'UnknownMethod', 'method name'
2797
            's\x00\x00\x00\x20l13:UnknownMethod11:method namee'
2798
            # end of message
2799
            'e')
2800
4064.1.1 by Andrew Bennetts
Add TestResponseEncodingProtocolThree.test_send_broken_body_stream, and make it pass.
2801
    def test_send_broken_body_stream(self):
2802
        encoder, out_stream = self.make_response_encoder()
2803
        encoder._headers = {}
2804
        def stream_that_fails():
2805
            yield 'aaa'
2806
            yield 'bbb'
2807
            raise Exception('Boom!')
2808
        response = _mod_request.SuccessfulSmartServerResponse(
2809
            ('args',), body_stream=stream_that_fails())
2810
        encoder.send_response(response)
4064.1.2 by Andrew Bennetts
Refactor server-side error translation, improve tests.
2811
        expected_response = (
4064.1.1 by Andrew Bennetts
Add TestResponseEncodingProtocolThree.test_send_broken_body_stream, and make it pass.
2812
            'bzr message 3 (bzr 1.6)\n'  # protocol marker
2813
            '\x00\x00\x00\x02de' # headers dict (empty)
4064.1.2 by Andrew Bennetts
Refactor server-side error translation, improve tests.
2814
            + interrupted_body_stream)
2815
        self.assertEqual(expected_response, out_stream.getvalue())
4064.1.1 by Andrew Bennetts
Add TestResponseEncodingProtocolThree.test_send_broken_body_stream, and make it pass.
2816
3245.4.37 by Andrew Bennetts
Add test for sending ProtocolThreeResponder.send_error(UnknownSmartMethod(...)).
2817
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.
2818
class TestResponseEncoderBufferingProtocolThree(tests.TestCase):
2819
    """Tests for buffering of responses.
2820
2821
    We want to avoid doing many small writes when one would do, to avoid
2822
    unnecessary network overhead.
2823
    """
2824
2825
    def setUp(self):
4153.1.2 by Andrew Bennetts
Add missing TestCase.setUp upcalls.
2826
        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.
2827
        self.writes = []
2828
        self.responder = protocol.ProtocolThreeResponder(self.writes.append)
2829
2830
    def assertWriteCount(self, expected_count):
2831
        self.assertEqual(
2832
            expected_count, len(self.writes),
2833
            "Too many writes: %r" % (self.writes,))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2834
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.
2835
    def test_send_error_writes_just_once(self):
2836
        """An error response is written to the medium all at once."""
2837
        self.responder.send_error(Exception('An exception string.'))
2838
        self.assertWriteCount(1)
2839
2840
    def test_send_response_writes_just_once(self):
2841
        """A normal response with no body is written to the medium all at once.
2842
        """
2843
        response = _mod_request.SuccessfulSmartServerResponse(('arg', 'arg'))
2844
        self.responder.send_response(response)
2845
        self.assertWriteCount(1)
2846
2847
    def test_send_response_with_body_writes_just_once(self):
2848
        """A normal response with a monolithic body is written to the medium
2849
        all at once.
2850
        """
2851
        response = _mod_request.SuccessfulSmartServerResponse(
2852
            ('arg', 'arg'), body='body bytes')
2853
        self.responder.send_response(response)
2854
        self.assertWriteCount(1)
2855
4078.1.2 by Andrew Bennetts
Adjust write buffering tests for improved buffering.
2856
    def test_send_response_with_body_stream_buffers_writes(self):
2857
        """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.
2858
        # Construct a response with stream with 2 chunks in it.
2859
        response = _mod_request.SuccessfulSmartServerResponse(
2860
            ('arg', 'arg'), body_stream=['chunk1', 'chunk2'])
2861
        self.responder.send_response(response)
4078.1.2 by Andrew Bennetts
Adjust write buffering tests for improved buffering.
2862
        # We will write just once, despite the multiple chunks, due to
2863
        # buffering.
2864
        self.assertWriteCount(1)
2865
2866
    def test_send_response_with_body_stream_flushes_buffers_sometimes(self):
2867
        """When there are many chunks (>100), multiple writes will occur rather
2868
        than buffering indefinitely.
2869
        """
2870
        # Construct a response with stream with 40 chunks in it.  Every chunk
2871
        # triggers 3 buffered writes, so we expect > 100 buffered writes, but <
2872
        # 200.
2873
        body_stream = ['chunk %d' % count for count in range(40)]
2874
        response = _mod_request.SuccessfulSmartServerResponse(
2875
            ('arg', 'arg'), body_stream=body_stream)
2876
        self.responder.send_response(response)
2877
        # The write buffer is flushed every 100 buffered writes, so we expect 2
2878
        # actual writes.
2879
        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.
2880
2881
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.
2882
class TestSmartClientUnicode(tests.TestCase):
2414.1.4 by Andrew Bennetts
Rename SmartClient to _SmartClient.
2883
    """_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.
2884
2885
    Unicode arguments to call_with_body_bytes are not correct (remote method
2886
    names, arguments, and bodies must all be expressed as byte strings), but
2414.1.4 by Andrew Bennetts
Rename SmartClient to _SmartClient.
2887
    _SmartClient should gracefully reject them, rather than getting into a
2888
    broken state that prevents future correct calls from working.  That is, it
2889
    should be possible to issue more requests on the medium afterwards, rather
2890
    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.
2891
    mysteriously fail with TooManyConcurrentRequests.
2892
    """
2893
2894
    def assertCallDoesNotBreakMedium(self, method, args, body):
2895
        """Call a medium with the given method, args and body, then assert that
2896
        the medium is left in a sane state, i.e. is capable of allowing further
2897
        requests.
2898
        """
2899
        input = StringIO("\n")
2900
        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.
2901
        client_medium = medium.SmartSimplePipesClientMedium(
2902
            input, output, 'ignored base')
3431.3.2 by Andrew Bennetts
Remove 'base' from _SmartClient entirely, now that the medium has it.
2903
        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.
2904
        self.assertRaises(TypeError,
2905
            smart_client.call_with_body_bytes, method, args, body)
2906
        self.assertEqual("", output.getvalue())
2907
        self.assertEqual(None, client_medium._current_request)
2908
2909
    def test_call_with_body_bytes_unicode_method(self):
2910
        self.assertCallDoesNotBreakMedium(u'method', ('args',), 'body')
2911
2912
    def test_call_with_body_bytes_unicode_args(self):
2913
        self.assertCallDoesNotBreakMedium('method', (u'args',), 'body')
2414.1.2 by Andrew Bennetts
Deal with review comments.
2914
        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.
2915
2916
    def test_call_with_body_bytes_unicode_body(self):
2917
        self.assertCallDoesNotBreakMedium('method', ('args',), u'body')
2918
2919
3453.4.4 by Andrew Bennetts
Small optimisation: don't bother trying RPCs from >= 1.6 if the server doesn't support protocol v3.
2920
class MockMedium(medium.SmartClientMedium):
3245.4.45 by Andrew Bennetts
Improve documentation of MockMedium.
2921
    """A mock medium that can be used to test _SmartClient.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2922
3245.4.45 by Andrew Bennetts
Improve documentation of MockMedium.
2923
    It can be given a series of requests to expect (and responses it should
2924
    return for them).  It can also be told when the client is expected to
2925
    disconnect a medium.  Expectations must be satisfied in the order they are
2926
    given, or else an AssertionError will be raised.
2927
2928
    Typical use looks like::
2929
2930
        medium = MockMedium()
2931
        medium.expect_request(...)
2932
        medium.expect_request(...)
2933
        medium.expect_request(...)
2934
    """
2935
2936
    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.
2937
        super(MockMedium, self).__init__('dummy base')
3245.4.45 by Andrew Bennetts
Improve documentation of MockMedium.
2938
        self._mock_request = _MockMediumRequest(self)
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
2939
        self._expected_events = []
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2940
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
2941
    def expect_request(self, request_bytes, response_bytes,
2942
                       allow_partial_read=False):
3245.4.45 by Andrew Bennetts
Improve documentation of MockMedium.
2943
        """Expect 'request_bytes' to be sent, and reply with 'response_bytes'.
2944
2945
        No assumption is made about how many times accept_bytes should be
2946
        called to send the request.  Similarly, no assumption is made about how
2947
        many times read_bytes/read_line are called by protocol code to read a
2948
        response.  e.g.::
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2949
3245.4.45 by Andrew Bennetts
Improve documentation of MockMedium.
2950
            request.accept_bytes('ab')
2951
            request.accept_bytes('cd')
2952
            request.finished_writing()
2953
2954
        and::
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2955
3245.4.45 by Andrew Bennetts
Improve documentation of MockMedium.
2956
            request.accept_bytes('abcd')
2957
            request.finished_writing()
2958
2959
        Will both satisfy ``medium.expect_request('abcd', ...)``.  Thus tests
2960
        using this should not break due to irrelevant changes in protocol
2961
        implementations.
2962
2963
        :param allow_partial_read: if True, no assertion is raised if a
2964
            response is not fully read.  Setting this is useful when the client
2965
            is expected to disconnect without needing to read the complete
2966
            response.  Default is False.
2967
        """
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
2968
        self._expected_events.append(('send request', request_bytes))
2969
        if allow_partial_read:
2970
            self._expected_events.append(
2971
                ('read response (partial)', response_bytes))
2972
        else:
2973
            self._expected_events.append(('read response', response_bytes))
2974
2975
    def expect_disconnect(self):
3245.4.45 by Andrew Bennetts
Improve documentation of MockMedium.
2976
        """Expect the client to call ``medium.disconnect()``."""
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
2977
        self._expected_events.append('disconnect')
2978
3245.4.45 by Andrew Bennetts
Improve documentation of MockMedium.
2979
    def _assertEvent(self, observed_event):
2980
        """Raise AssertionError unless observed_event matches the next expected
2981
        event.
2982
2983
        :seealso: expect_request
2984
        :seealso: expect_disconnect
2985
        """
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.
2986
        try:
2987
            expected_event = self._expected_events.pop(0)
2988
        except IndexError:
2989
            raise AssertionError(
2990
                'Mock medium observed event %r, but no more events expected'
2991
                % (observed_event,))
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
2992
        if expected_event[0] == 'read response (partial)':
2993
            if observed_event[0] != 'read response':
2994
                raise AssertionError(
2995
                    'Mock medium observed event %r, but expected event %r'
2996
                    % (observed_event, expected_event))
2997
        elif observed_event != expected_event:
2998
            raise AssertionError(
2999
                'Mock medium observed event %r, but expected event %r'
3000
                % (observed_event, expected_event))
3001
        if self._expected_events:
3002
            next_event = self._expected_events[0]
3003
            if next_event[0].startswith('read response'):
3004
                self._mock_request._response = next_event[1]
3005
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
3006
    def get_request(self):
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3007
        return self._mock_request
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
3008
3009
    def disconnect(self):
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3010
        if self._mock_request._read_bytes:
3245.4.45 by Andrew Bennetts
Improve documentation of MockMedium.
3011
            self._assertEvent(('read response', self._mock_request._read_bytes))
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3012
            self._mock_request._read_bytes = ''
3245.4.45 by Andrew Bennetts
Improve documentation of MockMedium.
3013
        self._assertEvent('disconnect')
3014
3015
3016
class _MockMediumRequest(object):
3017
    """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.
3018
3019
    def __init__(self, mock_medium):
3020
        self._medium = mock_medium
3021
        self._written_bytes = ''
3022
        self._read_bytes = ''
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3023
        self._response = None
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
3024
3025
    def accept_bytes(self, bytes):
3026
        self._written_bytes += bytes
3027
3028
    def finished_writing(self):
3245.4.45 by Andrew Bennetts
Improve documentation of MockMedium.
3029
        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.
3030
        self._written_bytes = ''
3031
3032
    def finished_reading(self):
3245.4.45 by Andrew Bennetts
Improve documentation of MockMedium.
3033
        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.
3034
        self._read_bytes = ''
3035
3036
    def read_bytes(self, size):
3037
        resp = self._response
3038
        bytes, resp = resp[:size], resp[size:]
3039
        self._response = resp
3040
        self._read_bytes += bytes
3041
        return bytes
3042
3043
    def read_line(self):
3044
        resp = self._response
3045
        try:
3046
            line, resp = resp.split('\n', 1)
3047
            line += '\n'
3048
        except ValueError:
3049
            line, resp = resp, ''
3050
        self._response = resp
3051
        self._read_bytes += line
3052
        return line
3053
3054
3055
class Test_SmartClientVersionDetection(tests.TestCase):
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3056
    """Tests for _SmartClient's automatic protocol version detection.
3057
3058
    On the first remote call, _SmartClient will keep retrying the request with
3059
    different protocol versions until it finds one that works.
3060
    """
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
3061
3062
    def test_version_three_server(self):
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3063
        """With a protocol 3 server, only one request is needed."""
3064
        medium = MockMedium()
3431.3.2 by Andrew Bennetts
Remove 'base' from _SmartClient entirely, now that the medium has it.
3065
        smart_client = client._SmartClient(medium, headers={})
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3066
        message_start = protocol.MESSAGE_VERSION_THREE + '\x00\x00\x00\x02de'
3067
        medium.expect_request(
3068
            message_start +
3069
            's\x00\x00\x00\x1el11:method-name5:arg 15:arg 2ee',
3070
            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.
3071
        result = smart_client.call('method-name', 'arg 1', 'arg 2')
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3072
        # The call succeeded without raising any exceptions from the mock
3073
        # 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.
3074
        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.
3075
        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.
3076
        # Also, the v3 works then the server should be assumed to support RPCs
3077
        # introduced in 1.6.
3453.4.10 by Andrew Bennetts
Change _is_remote_at_least to _is_remote_before.
3078
        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.
3079
3080
    def test_version_two_server(self):
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3081
        """If the server only speaks protocol 2, the client will first try
3082
        version 3, then fallback to protocol 2.
3083
3084
        Further, _SmartClient caches the detection, so future requests will all
3085
        use protocol 2 immediately.
3086
        """
3087
        medium = MockMedium()
3431.3.2 by Andrew Bennetts
Remove 'base' from _SmartClient entirely, now that the medium has it.
3088
        smart_client = client._SmartClient(medium, headers={})
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3089
        # First the client should send a v3 request, but the server will reply
3090
        # with a v2 error.
3091
        medium.expect_request(
3245.4.60 by Andrew Bennetts
Update the protocol v3 version string to say 'bzr 1.6'.
3092
            '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.
3093
            's\x00\x00\x00\x1el11:method-name5:arg 15:arg 2ee',
3094
            'bzr response 2\nfailed\n\n')
3095
        # So then the client should disconnect to reset the connection, because
3096
        # the client needs to assume the server cannot read any further
3097
        # requests off the original connection.
3098
        medium.expect_disconnect()
3099
        # The client should then retry the original request in v2
3100
        medium.expect_request(
3101
            'bzr request 2\nmethod-name\x01arg 1\x01arg 2\n',
3102
            'bzr response 2\nsuccess\nresponse value\n')
3103
        result = smart_client.call('method-name', 'arg 1', 'arg 2')
3104
        # The smart_client object will return the result of the successful
3105
        # query.
3106
        self.assertEqual(('response value',), result)
3107
3108
        # Now try another request, and this time the client will just use
3109
        # protocol 2.  (i.e. the autodetection won't be repeated)
3110
        medium.expect_request(
3111
            'bzr request 2\nanother-method\n',
3112
            'bzr response 2\nsuccess\nanother response\n')
3113
        result = smart_client.call('another-method')
3114
        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.
3115
        self.assertEqual([], medium._expected_events)
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3116
3453.4.4 by Andrew Bennetts
Small optimisation: don't bother trying RPCs from >= 1.6 if the server doesn't support protocol v3.
3117
        # Also, because v3 is not supported, the client medium should assume
3118
        # 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.
3119
        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.
3120
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3121
    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.
3122
        """If the server does not use any known (or at least supported)
3123
        protocol version, a SmartProtocolError is raised.
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3124
        """
3125
        medium = MockMedium()
3431.3.2 by Andrew Bennetts
Remove 'base' from _SmartClient entirely, now that the medium has it.
3126
        smart_client = client._SmartClient(medium, headers={})
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
3127
        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.
3128
        # The client will try v3 and v2 before eventually giving up.
3129
        medium.expect_request(
3245.4.60 by Andrew Bennetts
Update the protocol v3 version string to say 'bzr 1.6'.
3130
            '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.
3131
            's\x00\x00\x00\x1el11:method-name5:arg 15:arg 2ee',
3132
            unknown_protocol_bytes)
3133
        medium.expect_disconnect()
3134
        medium.expect_request(
3135
            'bzr request 2\nmethod-name\x01arg 1\x01arg 2\n',
3136
            unknown_protocol_bytes)
3137
        medium.expect_disconnect()
3138
        self.assertRaises(
3139
            errors.SmartProtocolError,
3140
            smart_client.call, 'method-name', 'arg 1', 'arg 2')
3141
        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.
3142
3143
    def test_first_response_is_error(self):
3144
        """If the server replies with an error, then the version detection
3145
        should be complete.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3146
3461.2.1 by Andrew Bennetts
Avoid unnecessary reconnections to old servers when the first HPSS is an error in the right protocol version.
3147
        This test is very similar to test_version_two_server, but catches a bug
3148
        we had in the case where the first reply was an error response.
3149
        """
3150
        medium = MockMedium()
3151
        smart_client = client._SmartClient(medium, headers={})
3152
        message_start = protocol.MESSAGE_VERSION_THREE + '\x00\x00\x00\x02de'
3153
        # Issue a request that gets an error reply in a non-default protocol
3154
        # version.
3155
        medium.expect_request(
3156
            message_start +
3157
            's\x00\x00\x00\x10l11:method-nameee',
3158
            'bzr response 2\nfailed\n\n')
3159
        medium.expect_disconnect()
3160
        medium.expect_request(
3161
            'bzr request 2\nmethod-name\n',
3162
            'bzr response 2\nfailed\nFooBarError\n')
3163
        err = self.assertRaises(
3164
            errors.ErrorFromSmartServer,
3165
            smart_client.call, 'method-name')
3166
        self.assertEqual(('FooBarError',), err.error_tuple)
3167
        # Now the medium should have remembered the protocol version, so
3168
        # subsequent requests will use the remembered version immediately.
3169
        medium.expect_request(
3170
            'bzr request 2\nmethod-name\n',
3171
            'bzr response 2\nsuccess\nresponse value\n')
3172
        result = smart_client.call('method-name')
3173
        self.assertEqual(('response value',), result)
3174
        self.assertEqual([], medium._expected_events)
3175
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
3176
3177
class Test_SmartClient(tests.TestCase):
3178
3179
    def test_call_default_headers(self):
3180
        """ProtocolThreeRequester.call by default sends a 'Software
3181
        version' header.
3182
        """
3431.3.4 by Andrew Bennetts
Revert now unnecessary test change from bzr.dev.
3183
        smart_client = client._SmartClient('dummy medium')
3245.4.55 by Andrew Bennetts
Test improvements suggested by John's review.
3184
        self.assertEqual(
3185
            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.
3186
        # XXX: need a test that smart_client._headers is passed to the request
3187
        # encoder.
3188
3189
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3190
class LengthPrefixedBodyDecoder(tests.TestCase):
3191
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3192
    # 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.
3193
    # something similar to the ProtocolBase method.
3194
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3195
    def test_construct(self):
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
3196
        decoder = protocol.LengthPrefixedBodyDecoder()
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3197
        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.
3198
        self.assertEqual(6, decoder.next_read_size())
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3199
        self.assertEqual('', decoder.read_pending_data())
3200
        self.assertEqual('', decoder.unused_data)
3201
3202
    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
3203
        decoder = protocol.LengthPrefixedBodyDecoder()
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3204
        decoder.accept_bytes('')
3205
        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.
3206
        self.assertEqual(6, decoder.next_read_size())
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3207
        self.assertEqual('', decoder.read_pending_data())
3208
        self.assertEqual('', decoder.unused_data)
3209
        decoder.accept_bytes('7')
3210
        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.
3211
        self.assertEqual(6, decoder.next_read_size())
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3212
        self.assertEqual('', decoder.read_pending_data())
3213
        self.assertEqual('', decoder.unused_data)
3214
        decoder.accept_bytes('\na')
3215
        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.
3216
        self.assertEqual(11, decoder.next_read_size())
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3217
        self.assertEqual('a', decoder.read_pending_data())
3218
        self.assertEqual('', decoder.unused_data)
3219
        decoder.accept_bytes('bcdefgd')
3220
        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.
3221
        self.assertEqual(4, decoder.next_read_size())
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3222
        self.assertEqual('bcdefg', decoder.read_pending_data())
3223
        self.assertEqual('', decoder.unused_data)
3224
        decoder.accept_bytes('one')
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(1, 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
        decoder.accept_bytes('\nblarg')
3230
        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.
3231
        self.assertEqual(1, decoder.next_read_size())
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3232
        self.assertEqual('', decoder.read_pending_data())
3233
        self.assertEqual('blarg', decoder.unused_data)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3234
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3235
    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
3236
        decoder = protocol.LengthPrefixedBodyDecoder()
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3237
        decoder.accept_bytes('1\nadone\nunused')
3238
        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.
3239
        self.assertEqual(1, decoder.next_read_size())
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3240
        self.assertEqual('a', decoder.read_pending_data())
3241
        self.assertEqual('unused', decoder.unused_data)
3242
3243
    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
3244
        decoder = protocol.LengthPrefixedBodyDecoder()
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3245
        decoder.accept_bytes('1\na')
3246
        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.
3247
        self.assertEqual(5, decoder.next_read_size())
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3248
        self.assertEqual('a', decoder.read_pending_data())
3249
        self.assertEqual('', decoder.unused_data)
3250
        decoder.accept_bytes('done\n')
3251
        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.
3252
        self.assertEqual(1, decoder.next_read_size())
2018.2.2 by Andrew Bennetts
Implement HTTP smart server.
3253
        self.assertEqual('', decoder.read_pending_data())
3254
        self.assertEqual('', decoder.unused_data)
3255
3256
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3257
class TestChunkedBodyDecoder(tests.TestCase):
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
3258
    """Tests for ChunkedBodyDecoder.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3259
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
3260
    This is the body decoder used for protocol version two.
3261
    """
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3262
3263
    def test_construct(self):
3264
        decoder = protocol.ChunkedBodyDecoder()
3265
        self.assertFalse(decoder.finished_reading)
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
3266
        self.assertEqual(8, decoder.next_read_size())
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
3267
        self.assertEqual(None, decoder.read_next_chunk())
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3268
        self.assertEqual('', decoder.unused_data)
3269
3270
    def test_empty_content(self):
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
3271
        """'chunked\nEND\n' is the complete encoding of a zero-length body.
3272
        """
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3273
        decoder = protocol.ChunkedBodyDecoder()
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
3274
        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.
3275
        decoder.accept_bytes('END\n')
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3276
        self.assertTrue(decoder.finished_reading)
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
3277
        self.assertEqual(None, decoder.read_next_chunk())
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3278
        self.assertEqual('', decoder.unused_data)
3279
3280
    def test_one_chunk(self):
3281
        """A body in a single chunk is decoded correctly."""
3282
        decoder = protocol.ChunkedBodyDecoder()
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
3283
        decoder.accept_bytes('chunked\n')
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3284
        chunk_length = 'f\n'
3285
        chunk_content = '123456789abcdef'
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
3286
        finish = 'END\n'
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3287
        decoder.accept_bytes(chunk_length + chunk_content + finish)
3288
        self.assertTrue(decoder.finished_reading)
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
3289
        self.assertEqual(chunk_content, decoder.read_next_chunk())
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3290
        self.assertEqual('', decoder.unused_data)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3291
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3292
    def test_incomplete_chunk(self):
3293
        """When there are less bytes in the chunk than declared by the length,
3294
        then we haven't finished reading yet.
3295
        """
3296
        decoder = protocol.ChunkedBodyDecoder()
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
3297
        decoder.accept_bytes('chunked\n')
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3298
        chunk_length = '8\n'
3299
        three_bytes = '123'
3300
        decoder.accept_bytes(chunk_length + three_bytes)
3301
        self.assertFalse(decoder.finished_reading)
3302
        self.assertEqual(
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
3303
            5 + 4, decoder.next_read_size(),
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3304
            "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.
3305
            "this chunk plus 4 (the length of the end-of-body marker: "
3306
            "'END\\n')")
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
3307
        self.assertEqual(None, decoder.read_next_chunk())
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3308
3309
    def test_incomplete_length(self):
3310
        """A chunk length hasn't been read until a newline byte has been read.
3311
        """
3312
        decoder = protocol.ChunkedBodyDecoder()
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
3313
        decoder.accept_bytes('chunked\n')
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3314
        decoder.accept_bytes('9')
3315
        self.assertEqual(
3316
            1, decoder.next_read_size(),
3317
            "The next_read_size hint should be 1, because we don't know the "
3318
            "length yet.")
3319
        decoder.accept_bytes('\n')
3320
        self.assertEqual(
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
3321
            9 + 4, decoder.next_read_size(),
3322
            "The next_read_size hint should be the length of the chunk plus 4 "
3323
            "(the length of the end-of-body marker: 'END\\n')")
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3324
        self.assertFalse(decoder.finished_reading)
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
3325
        self.assertEqual(None, decoder.read_next_chunk())
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3326
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
3327
    def test_two_chunks(self):
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3328
        """Content from multiple chunks is concatenated."""
3329
        decoder = protocol.ChunkedBodyDecoder()
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
3330
        decoder.accept_bytes('chunked\n')
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3331
        chunk_one = '3\naaa'
3332
        chunk_two = '5\nbbbbb'
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
3333
        finish = 'END\n'
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3334
        decoder.accept_bytes(chunk_one + chunk_two + finish)
3335
        self.assertTrue(decoder.finished_reading)
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
3336
        self.assertEqual('aaa', decoder.read_next_chunk())
3337
        self.assertEqual('bbbbb', decoder.read_next_chunk())
3338
        self.assertEqual(None, decoder.read_next_chunk())
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3339
        self.assertEqual('', decoder.unused_data)
3340
3341
    def test_excess_bytes(self):
3342
        """Bytes after the chunked body are reported as unused bytes."""
3343
        decoder = protocol.ChunkedBodyDecoder()
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
3344
        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.
3345
        chunked_body = "5\naaaaaEND\n"
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3346
        excess_bytes = "excess bytes"
3347
        decoder.accept_bytes(chunked_body + excess_bytes)
3348
        self.assertTrue(decoder.finished_reading)
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
3349
        self.assertEqual('aaaaa', decoder.read_next_chunk())
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3350
        self.assertEqual(excess_bytes, decoder.unused_data)
3351
        self.assertEqual(
3352
            1, decoder.next_read_size(),
3353
            "next_read_size hint should be 1 when finished_reading.")
3354
3355
    def test_multidigit_length(self):
3356
        """Lengths in the chunk prefixes can have multiple digits."""
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
        length = 0x123
3360
        chunk_prefix = hex(length) + '\n'
3361
        chunk_bytes = 'z' * length
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
3362
        finish = 'END\n'
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3363
        decoder.accept_bytes(chunk_prefix + chunk_bytes + finish)
3364
        self.assertTrue(decoder.finished_reading)
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
3365
        self.assertEqual(chunk_bytes, decoder.read_next_chunk())
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3366
3367
    def test_byte_at_a_time(self):
3368
        """A complete body fed to the decoder one byte at a time should not
3369
        confuse the decoder.  That is, it should give the same result as if the
3370
        bytes had been received in one batch.
3371
3372
        This test is the same as test_one_chunk apart from the way accept_bytes
3373
        is called.
3374
        """
3375
        decoder = protocol.ChunkedBodyDecoder()
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
3376
        decoder.accept_bytes('chunked\n')
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3377
        chunk_length = 'f\n'
3378
        chunk_content = '123456789abcdef'
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
3379
        finish = 'END\n'
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3380
        for byte in (chunk_length + chunk_content + finish):
3381
            decoder.accept_bytes(byte)
3382
        self.assertTrue(decoder.finished_reading)
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
3383
        self.assertEqual(chunk_content, decoder.read_next_chunk())
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3384
        self.assertEqual('', decoder.unused_data)
3385
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
3386
    def test_read_pending_data_resets(self):
3387
        """read_pending_data does not return the same bytes twice."""
3388
        decoder = protocol.ChunkedBodyDecoder()
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
3389
        decoder.accept_bytes('chunked\n')
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
3390
        chunk_one = '3\naaa'
3391
        chunk_two = '3\nbbb'
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
3392
        finish = 'END\n'
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
3393
        decoder.accept_bytes(chunk_one)
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
3394
        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.
3395
        decoder.accept_bytes(chunk_two)
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
3396
        self.assertEqual('bbb', decoder.read_next_chunk())
3397
        self.assertEqual(None, decoder.read_next_chunk())
3398
3399
    def test_decode_error(self):
3400
        decoder = protocol.ChunkedBodyDecoder()
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
3401
        decoder.accept_bytes('chunked\n')
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
3402
        chunk_one = 'b\nfirst chunk'
2748.4.6 by Andrew Bennetts
Use chunks for stream errors, rather than the response tuple format.
3403
        error_signal = 'ERR\n'
3404
        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.
3405
        finish = 'END\n'
2748.4.6 by Andrew Bennetts
Use chunks for stream errors, rather than the response tuple format.
3406
        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.
3407
        self.assertTrue(decoder.finished_reading)
3408
        self.assertEqual('first chunk', decoder.read_next_chunk())
2692.1.2 by Andrew Bennetts
Merge from bzr.dev.
3409
        expected_failure = _mod_request.FailedSmartServerResponse(
2748.4.6 by Andrew Bennetts
Use chunks for stream errors, rather than the response tuple format.
3410
            ('part1', 'part2'))
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
3411
        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.
3412
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
3413
    def test_bad_header(self):
3414
        """accept_bytes raises a SmartProtocolError if a chunked body does not
3415
        start with the right header.
3416
        """
3417
        decoder = protocol.ChunkedBodyDecoder()
3418
        self.assertRaises(
3419
            errors.SmartProtocolError, decoder.accept_bytes, 'bad header\n')
3420
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
3421
2432.4.1 by Robert Collins
Add SuccessfulSmartServerResponse.
3422
class TestSuccessfulSmartServerResponse(tests.TestCase):
3423
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
3424
    def test_construct_no_body(self):
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
3425
        response = _mod_request.SuccessfulSmartServerResponse(('foo', 'bar'))
2432.4.1 by Robert Collins
Add SuccessfulSmartServerResponse.
3426
        self.assertEqual(('foo', 'bar'), response.args)
3427
        self.assertEqual(None, response.body)
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
3428
3429
    def test_construct_with_body(self):
2692.1.2 by Andrew Bennetts
Merge from bzr.dev.
3430
        response = _mod_request.SuccessfulSmartServerResponse(('foo', 'bar'),
3431
                                                              'bytes')
2432.4.1 by Robert Collins
Add SuccessfulSmartServerResponse.
3432
        self.assertEqual(('foo', 'bar'), response.args)
3433
        self.assertEqual('bytes', response.body)
2781.2.1 by Andrew Bennetts
Fix SmartServerResponse.__repr__.
3434
        # repr(response) doesn't trigger exceptions.
3435
        repr(response)
2432.4.1 by Robert Collins
Add SuccessfulSmartServerResponse.
3436
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
3437
    def test_construct_with_body_stream(self):
3438
        bytes_iterable = ['abc']
2692.1.2 by Andrew Bennetts
Merge from bzr.dev.
3439
        response = _mod_request.SuccessfulSmartServerResponse(
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
3440
            ('foo', 'bar'), body_stream=bytes_iterable)
3441
        self.assertEqual(('foo', 'bar'), response.args)
3442
        self.assertEqual(bytes_iterable, response.body_stream)
3443
3444
    def test_construct_rejects_body_and_body_stream(self):
3445
        """'body' and 'body_stream' are mutually exclusive."""
3446
        self.assertRaises(
3447
            errors.BzrError,
2692.1.2 by Andrew Bennetts
Merge from bzr.dev.
3448
            _mod_request.SuccessfulSmartServerResponse, (), 'body', ['stream'])
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
3449
2432.4.1 by Robert Collins
Add SuccessfulSmartServerResponse.
3450
    def test_is_successful(self):
3451
        """is_successful should return True for SuccessfulSmartServerResponse."""
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
3452
        response = _mod_request.SuccessfulSmartServerResponse(('error',))
2432.4.1 by Robert Collins
Add SuccessfulSmartServerResponse.
3453
        self.assertEqual(True, response.is_successful())
3454
3455
2432.4.2 by Robert Collins
Add FailedSmartServerResponse.
3456
class TestFailedSmartServerResponse(tests.TestCase):
3457
3458
    def test_construct(self):
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
3459
        response = _mod_request.FailedSmartServerResponse(('foo', 'bar'))
2432.4.2 by Robert Collins
Add FailedSmartServerResponse.
3460
        self.assertEqual(('foo', 'bar'), response.args)
3461
        self.assertEqual(None, response.body)
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
3462
        response = _mod_request.FailedSmartServerResponse(('foo', 'bar'), 'bytes')
2432.4.2 by Robert Collins
Add FailedSmartServerResponse.
3463
        self.assertEqual(('foo', 'bar'), response.args)
3464
        self.assertEqual('bytes', response.body)
2781.2.1 by Andrew Bennetts
Fix SmartServerResponse.__repr__.
3465
        # repr(response) doesn't trigger exceptions.
3466
        repr(response)
2432.4.2 by Robert Collins
Add FailedSmartServerResponse.
3467
3468
    def test_is_successful(self):
3469
        """is_successful should return False for FailedSmartServerResponse."""
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
3470
        response = _mod_request.FailedSmartServerResponse(('error',))
2432.4.2 by Robert Collins
Add FailedSmartServerResponse.
3471
        self.assertEqual(False, response.is_successful())
3472
2432.4.1 by Robert Collins
Add SuccessfulSmartServerResponse.
3473
2018.2.6 by Andrew Bennetts
HTTP client starting to work (pycurl for the moment).
3474
class FakeHTTPMedium(object):
3475
    def __init__(self):
3476
        self.written_request = None
3477
        self._current_request = None
2018.2.8 by Andrew Bennetts
Make HttpTransportBase.get_smart_client return self again.
3478
    def send_http_smart_request(self, bytes):
2018.2.6 by Andrew Bennetts
HTTP client starting to work (pycurl for the moment).
3479
        self.written_request = bytes
3480
        return None
3481
3482
3111.1.25 by Vincent Ladeuil
Fix the smart server failing test and use it against protocol combinations.
3483
class HTTPTunnellingSmokeTest(tests.TestCase):
3484
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)
3485
    def setUp(self):
3486
        super(HTTPTunnellingSmokeTest, self).setUp()
3487
        # We use the VFS layer as part of HTTP tunnelling tests.
2402.1.2 by Andrew Bennetts
Deal with review comments.
3488
        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)
3489
2018.2.6 by Andrew Bennetts
HTTP client starting to work (pycurl for the moment).
3490
    def test_smart_http_medium_request_accept_bytes(self):
3491
        medium = FakeHTTPMedium()
2018.2.8 by Andrew Bennetts
Make HttpTransportBase.get_smart_client return self again.
3492
        request = SmartClientHTTPMediumRequest(medium)
2018.2.6 by Andrew Bennetts
HTTP client starting to work (pycurl for the moment).
3493
        request.accept_bytes('abc')
3494
        request.accept_bytes('def')
3495
        self.assertEqual(None, medium.written_request)
3496
        request.finished_writing()
3497
        self.assertEqual('abcdef', medium.written_request)
3498
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.
3499
2208.4.4 by Andrew Bennetts
Merge bzr.dev.
3500
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.
3501
2208.4.3 by Andrew Bennetts
Let SmartHTTPTransport.clone('..') continue to POST to the cloned URL (unlike clone('child')).
3502
    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.
3503
        # 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')).
3504
        # requests for child URLs of that to the original URL.  i.e., we want to
3505
        # POST to "bzr+http://host/foo/.bzr/smart" and never something like
3506
        # "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.
3507
        # RemoteHTTPTransport remembers the initial URL, and adjusts the
3508
        # relpaths it sends in smart requests accordingly.
2208.4.4 by Andrew Bennetts
Merge bzr.dev.
3509
        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.
3510
        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')).
3511
        self.assertEqual(base_transport._http_transport,
3512
                         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.
3513
        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.
3514
        self.assertEqual(
3515
            'child_dir/',
3516
            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')).
3517
2466.3.1 by Andrew Bennetts
Normalise URLs in RemoteHTTPTransport before doing URL calculations to fix bad results.
3518
    def test_remote_path_unnormal_base(self):
3519
        # If the transport's base isn't normalised, the _remote_path should
3520
        # still be calculated correctly.
3521
        base_transport = remote.RemoteHTTPTransport('bzr+http://host/%7Ea/b')
3522
        self.assertEqual('c', base_transport._remote_path('c'))
3523
3524
    def test_clone_unnormal_base(self):
3525
        # If the transport's base isn't normalised, cloned transports should
3526
        # still work correctly.
3527
        base_transport = remote.RemoteHTTPTransport('bzr+http://host/%7Ea/b')
3528
        new_transport = base_transport.clone('c')
3529
        self.assertEqual('bzr+http://host/%7Ea/b/c/', new_transport.base)
3431.3.8 by Andrew Bennetts
Add two tests that fail without the fixes in this branch.
3530
        self.assertEqual(
3531
            'c/',
3532
            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.
3533
3878.4.6 by Vincent Ladeuil
Fix bug #270863 by preserving 'bzr+http[s]' decorator.
3534
    def test__redirect_to(self):
3535
        t = remote.RemoteHTTPTransport('bzr+http://www.example.com/foo')
3536
        r = t._redirected_to('http://www.example.com/foo',
3537
                             'http://www.example.com/bar')
3538
        self.assertEquals(type(r), type(t))
3539
3540
    def test__redirect_sibling_protocol(self):
3541
        t = remote.RemoteHTTPTransport('bzr+http://www.example.com/foo')
3542
        r = t._redirected_to('http://www.example.com/foo',
3543
                             'https://www.example.com/bar')
3544
        self.assertEquals(type(r), type(t))
3545
        self.assertStartsWith(r.base, 'bzr+https')
3546
3547
    def test__redirect_to_with_user(self):
3548
        t = remote.RemoteHTTPTransport('bzr+http://joe@www.example.com/foo')
3549
        r = t._redirected_to('http://www.example.com/foo',
3550
                             'http://www.example.com/bar')
3551
        self.assertEquals(type(r), type(t))
3552
        self.assertEquals('joe', t._user)
3553
        self.assertEquals(t._user, r._user)
3554
3555
    def test_redirected_to_same_host_different_protocol(self):
3556
        t = remote.RemoteHTTPTransport('bzr+http://joe@www.example.com/foo')
3557
        r = t._redirected_to('http://www.example.com/foo',
3558
                             'ftp://www.example.com/foo')
3559
        self.assertNotEquals(type(r), type(t))
3560
3561