/brz/remove-bazaar

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