/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
3408.3.1 by Martin Pool
Remove erroneous handling of branch.conf for RemoteBranch
1
# Copyright (C) 2006, 2007, 2008 Canonical Ltd
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
"""Tests for remote bzrdir/branch/repo/etc
18
19
These are proxy objects which act on remote objects by sending messages
20
through a smart client.  The proxies are to be created when attempting to open
21
the object given a transport that supports smartserver rpc operations. 
2018.18.7 by Martin Pool
(broken) Start addng client proxy test for Repository.tarball
22
23
These tests correspond to tests.test_smart, which exercises the server side.
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
24
"""
25
3211.5.2 by Robert Collins
Change RemoteRepository.get_parent_map to use bz2 not gzip for compression.
26
import bz2
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
27
from cStringIO import StringIO
28
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
29
from bzrlib import (
30
    errors,
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
31
    graph,
2535.3.39 by Andrew Bennetts
Tidy some XXXs.
32
    pack,
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
33
    remote,
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
34
    repository,
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
35
    tests,
36
    )
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
37
from bzrlib.branch import Branch
38
from bzrlib.bzrdir import BzrDir, BzrDirFormat
39
from bzrlib.remote import (
40
    RemoteBranch,
41
    RemoteBzrDir,
42
    RemoteBzrDirFormat,
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
43
    RemoteRepository,
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
44
    )
45
from bzrlib.revision import NULL_REVISION
2432.3.2 by Andrew Bennetts
Add test, and tidy implementation.
46
from bzrlib.smart import server, medium
2018.5.159 by Andrew Bennetts
Rename SmartClient to _SmartClient.
47
from bzrlib.smart.client import _SmartClient
3287.6.4 by Robert Collins
Fix up deprecation warnings for get_revision_graph.
48
from bzrlib.symbol_versioning import one_four
3313.3.3 by Andrew Bennetts
Add tests for _SmartClient.remote_path_for_transport.
49
from bzrlib.transport import get_transport
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
50
from bzrlib.transport.memory import MemoryTransport
2466.2.2 by Andrew Bennetts
Add tests for RemoteTransport.is_readonly in the style of the other remote object tests.
51
from bzrlib.transport.remote import RemoteTransport
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
52
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)
53
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
54
class BasicRemoteObjectTests(tests.TestCaseWithTransport):
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
55
56
    def setUp(self):
2018.5.95 by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.
57
        self.transport_server = server.SmartTCPServer_for_testing
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
58
        super(BasicRemoteObjectTests, self).setUp()
59
        self.transport = self.get_transport()
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
60
        # make a branch that can be opened over the smart transport
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
61
        self.local_wt = BzrDir.create_standalone_workingtree('.')
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
62
2018.5.171 by Andrew Bennetts
Disconnect RemoteTransports in some tests to avoid tripping up test_strace with leftover threads from previous tests.
63
    def tearDown(self):
64
        self.transport.disconnect()
65
        tests.TestCaseWithTransport.tearDown(self)
66
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
67
    def test_create_remote_bzrdir(self):
68
        b = remote.RemoteBzrDir(self.transport)
69
        self.assertIsInstance(b, BzrDir)
70
71
    def test_open_remote_branch(self):
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
72
        # open a standalone branch in the working directory
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
73
        b = remote.RemoteBzrDir(self.transport)
74
        branch = b.open_branch()
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
75
        self.assertIsInstance(branch, Branch)
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
76
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
77
    def test_remote_repository(self):
78
        b = BzrDir.open_from_transport(self.transport)
79
        repo = b.open_repository()
2018.5.106 by Andrew Bennetts
Update tests in test_remote to use utf-8 byte strings for revision IDs, rather than unicode strings.
80
        revid = u'\xc823123123'.encode('utf8')
2018.5.40 by Robert Collins
Implement a remote Repository.has_revision method.
81
        self.assertFalse(repo.has_revision(revid))
82
        self.local_wt.commit(message='test commit', rev_id=revid)
83
        self.assertTrue(repo.has_revision(revid))
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
84
85
    def test_remote_branch_revision_history(self):
86
        b = BzrDir.open_from_transport(self.transport).open_branch()
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
87
        self.assertEqual([], b.revision_history())
88
        r1 = self.local_wt.commit('1st commit')
2018.5.106 by Andrew Bennetts
Update tests in test_remote to use utf-8 byte strings for revision IDs, rather than unicode strings.
89
        r2 = self.local_wt.commit('1st commit', rev_id=u'\xc8'.encode('utf8'))
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
90
        self.assertEqual([r1, r2], b.revision_history())
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
91
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
92
    def test_find_correct_format(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)
93
        """Should open a RemoteBzrDir over a RemoteTransport"""
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
94
        fmt = BzrDirFormat.find_format(self.transport)
2018.5.169 by Andrew Bennetts
Add a _server_formats flag to BzrDir.open_from_transport and BzrDirFormat.find_format, make RemoteBranch.control_files into a property.
95
        self.assertTrue(RemoteBzrDirFormat
96
                        in BzrDirFormat._control_server_formats)
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
97
        self.assertIsInstance(fmt, remote.RemoteBzrDirFormat)
98
99
    def test_open_detected_smart_format(self):
100
        fmt = BzrDirFormat.find_format(self.transport)
101
        d = fmt.open(self.transport)
102
        self.assertIsInstance(d, BzrDir)
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
103
2477.1.1 by Martin Pool
Add RemoteBranch repr
104
    def test_remote_branch_repr(self):
105
        b = BzrDir.open_from_transport(self.transport).open_branch()
106
        self.assertStartsWith(str(b), 'RemoteBranch(')
107
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
108
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
109
class FakeProtocol(object):
110
    """Lookalike SmartClientRequestProtocolOne allowing body reading tests."""
111
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
112
    def __init__(self, body, fake_client):
2535.4.2 by Andrew Bennetts
Nasty hackery to make stream_knit_data_for_revisions response use streaming.
113
        self.body = body
114
        self._body_buffer = None
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
115
        self._fake_client = fake_client
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
116
117
    def read_body_bytes(self, count=-1):
2535.4.2 by Andrew Bennetts
Nasty hackery to make stream_knit_data_for_revisions response use streaming.
118
        if self._body_buffer is None:
119
            self._body_buffer = StringIO(self.body)
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
120
        bytes = self._body_buffer.read(count)
121
        if self._body_buffer.tell() == len(self._body_buffer.getvalue()):
122
            self._fake_client.expecting_body = False
123
        return bytes
124
125
    def cancel_read_body(self):
126
        self._fake_client.expecting_body = False
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
127
2535.4.2 by Andrew Bennetts
Nasty hackery to make stream_knit_data_for_revisions response use streaming.
128
    def read_streamed_body(self):
129
        return self.body
130
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
131
2018.5.159 by Andrew Bennetts
Rename SmartClient to _SmartClient.
132
class FakeClient(_SmartClient):
133
    """Lookalike for _SmartClient allowing testing."""
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
134
    
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
135
    def __init__(self, fake_medium_base='fake base'):
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
136
        """Create a FakeClient.
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
137
3104.4.2 by Andrew Bennetts
All tests passing.
138
        :param responses: A list of response-tuple, body-data pairs to be sent
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.
139
            back to callers.  A special case is if the response-tuple is
140
            'unknown verb', then a UnknownSmartMethod will be raised for that
141
            call, using the second element of the tuple as the verb in the
142
            exception.
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
143
        """
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
144
        self.responses = []
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
145
        self._calls = []
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
146
        self.expecting_body = False
3313.2.1 by Andrew Bennetts
Change _SmartClient's API to accept a medium and a base, rather than a _SharedConnection.
147
        _SmartClient.__init__(self, FakeMedium(self._calls), fake_medium_base)
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
148
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
149
    def add_success_response(self, *args):
150
        self.responses.append(('success', args, None))
151
152
    def add_success_response_with_body(self, body, *args):
153
        self.responses.append(('success', args, body))
154
155
    def add_error_response(self, *args):
156
        self.responses.append(('error', args))
157
158
    def add_unknown_method_response(self, verb):
159
        self.responses.append(('unknown', verb))
160
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.
161
    def _get_next_response(self):
162
        response_tuple = self.responses.pop(0)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
163
        if response_tuple[0] == 'unknown':
164
            raise errors.UnknownSmartMethod(response_tuple[1])
165
        elif response_tuple[0] == 'error':
166
            raise errors.ErrorFromSmartServer(response_tuple[1])
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.
167
        return response_tuple
168
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
169
    def call(self, method, *args):
170
        self._calls.append(('call', method, args))
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
171
        return self._get_next_response()[1]
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
172
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
173
    def call_expecting_body(self, method, *args):
174
        self._calls.append(('call_expecting_body', method, args))
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.
175
        result = self._get_next_response()
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
176
        self.expecting_body = True
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
177
        return result[1], FakeProtocol(result[2], self)
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
178
3184.1.10 by Robert Collins
Change the smart server verb for Repository.stream_revisions_chunked to use SearchResults as the request mechanism for downloads.
179
    def call_with_body_bytes_expecting_body(self, method, args, body):
180
        self._calls.append(('call_with_body_bytes_expecting_body', method,
181
            args, body))
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.
182
        result = self._get_next_response()
3184.1.10 by Robert Collins
Change the smart server verb for Repository.stream_revisions_chunked to use SearchResults as the request mechanism for downloads.
183
        self.expecting_body = True
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
184
        return result[1], FakeProtocol(result[2], self)
3184.1.10 by Robert Collins
Change the smart server verb for Repository.stream_revisions_chunked to use SearchResults as the request mechanism for downloads.
185
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
186
3104.4.2 by Andrew Bennetts
All tests passing.
187
class FakeMedium(object):
188
3213.1.2 by Andrew Bennetts
Add test for reconnection if get_parent_map is unknown by the server.
189
    def __init__(self, client_calls):
3213.1.1 by Andrew Bennetts
Recover (by reconnecting) if the server turns out not to understand the new requests in 1.2 that send bodies.
190
        self._remote_is_at_least_1_2 = True
3213.1.2 by Andrew Bennetts
Add test for reconnection if get_parent_map is unknown by the server.
191
        self._client_calls = client_calls
3213.1.1 by Andrew Bennetts
Recover (by reconnecting) if the server turns out not to understand the new requests in 1.2 that send bodies.
192
193
    def disconnect(self):
3213.1.2 by Andrew Bennetts
Add test for reconnection if get_parent_map is unknown by the server.
194
        self._client_calls.append(('disconnect medium',))
3104.4.2 by Andrew Bennetts
All tests passing.
195
196
3192.2.1 by Andrew Bennetts
Don't transmit URL-escaped relpaths in the smart protocol, which is back to how things worked in bzr 1.1 and earlier.
197
class TestVfsHas(tests.TestCase):
198
199
    def test_unicode_path(self):
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
200
        client = FakeClient('/')
201
        client.add_success_response('yes',)
3192.2.1 by Andrew Bennetts
Don't transmit URL-escaped relpaths in the smart protocol, which is back to how things worked in bzr 1.1 and earlier.
202
        transport = RemoteTransport('bzr://localhost/', _client=client)
203
        filename = u'/hell\u00d8'.encode('utf8')
204
        result = transport.has(filename)
205
        self.assertEqual(
206
            [('call', 'has', (filename,))],
207
            client._calls)
208
        self.assertTrue(result)
209
210
3313.3.3 by Andrew Bennetts
Add tests for _SmartClient.remote_path_for_transport.
211
class Test_SmartClient_remote_path_from_transport(tests.TestCase):
212
    """Tests for the behaviour of _SmartClient.remote_path_from_transport."""
213
214
    def assertRemotePath(self, expected, client_base, transport_base):
215
        """Assert that the result of _SmartClient.remote_path_from_transport
216
        is the expected value for a given client_base and transport_base.
217
        """
218
        dummy_medium = 'dummy medium'
219
        client = _SmartClient(dummy_medium, client_base)
220
        transport = get_transport(transport_base)
221
        result = client.remote_path_from_transport(transport)
222
        self.assertEqual(expected, result)
223
        
224
    def test_remote_path_from_transport(self):
225
        """_SmartClient.remote_path_from_transport calculates a URL for the
226
        given transport relative to the root of the client base URL.
227
        """
228
        self.assertRemotePath('xyz/', 'bzr://host/path', 'bzr://host/xyz')
229
        self.assertRemotePath(
230
            'path/xyz/', 'bzr://host/path', 'bzr://host/path/xyz')
231
232
    def test_remote_path_from_transport_http(self):
233
        """Remote paths for HTTP transports are calculated differently to other
234
        transports.  They are just relative to the client base, not the root
235
        directory of the host.
236
        """
237
        for scheme in ['http:', 'https:', 'bzr+http:', 'bzr+https:']:
238
            self.assertRemotePath(
239
                '../xyz/', scheme + '//host/path', scheme + '//host/xyz')
240
            self.assertRemotePath(
241
                'xyz/', scheme + '//host/path', scheme + '//host/path/xyz')
242
243
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
244
class TestBzrDirOpenBranch(tests.TestCase):
245
246
    def test_branch_present(self):
247
        transport = MemoryTransport()
248
        transport.mkdir('quack')
249
        transport = transport.clone('quack')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
250
        client = FakeClient(transport.base)
251
        client.add_success_response('ok', '')
252
        client.add_success_response('ok', '', 'no', 'no', 'no')
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
253
        bzrdir = RemoteBzrDir(transport, _client=client)
254
        result = bzrdir.open_branch()
255
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
256
            [('call', 'BzrDir.open_branch', ('quack/',)),
3221.3.3 by Robert Collins
* Hook up the new remote method ``RemoteBzrDir.find_repositoryV2`` so
257
             ('call', 'BzrDir.find_repositoryV2', ('quack/',))],
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
258
            client._calls)
259
        self.assertIsInstance(result, RemoteBranch)
260
        self.assertEqual(bzrdir, result.bzrdir)
261
262
    def test_branch_missing(self):
263
        transport = MemoryTransport()
264
        transport.mkdir('quack')
265
        transport = transport.clone('quack')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
266
        client = FakeClient(transport.base)
267
        client.add_error_response('nobranch')
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
268
        bzrdir = RemoteBzrDir(transport, _client=client)
269
        self.assertRaises(errors.NotBranchError, bzrdir.open_branch)
270
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
271
            [('call', 'BzrDir.open_branch', ('quack/',))],
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
272
            client._calls)
273
3211.4.1 by Robert Collins
* ``RemoteBzrDir._get_tree_branch`` no longer triggers ``_ensure_real``,
274
    def test__get_tree_branch(self):
275
        # _get_tree_branch is a form of open_branch, but it should only ask for
276
        # branch opening, not any other network requests.
277
        calls = []
278
        def open_branch():
279
            calls.append("Called")
280
            return "a-branch"
281
        transport = MemoryTransport()
282
        # no requests on the network - catches other api calls being made.
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
283
        client = FakeClient(transport.base)
3211.4.1 by Robert Collins
* ``RemoteBzrDir._get_tree_branch`` no longer triggers ``_ensure_real``,
284
        bzrdir = RemoteBzrDir(transport, _client=client)
285
        # patch the open_branch call to record that it was called.
286
        bzrdir.open_branch = open_branch
287
        self.assertEqual((None, "a-branch"), bzrdir._get_tree_branch())
288
        self.assertEqual(["Called"], calls)
289
        self.assertEqual([], client._calls)
290
3192.2.1 by Andrew Bennetts
Don't transmit URL-escaped relpaths in the smart protocol, which is back to how things worked in bzr 1.1 and earlier.
291
    def test_url_quoting_of_path(self):
292
        # Relpaths on the wire should not be URL-escaped.  So "~" should be
293
        # transmitted as "~", not "%7E".
294
        transport = RemoteTransport('bzr://localhost/~hello/')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
295
        client = FakeClient(transport.base)
296
        client.add_success_response('ok', '')
297
        client.add_success_response('ok', '', 'no', 'no', 'no')
3192.2.1 by Andrew Bennetts
Don't transmit URL-escaped relpaths in the smart protocol, which is back to how things worked in bzr 1.1 and earlier.
298
        bzrdir = RemoteBzrDir(transport, _client=client)
299
        result = bzrdir.open_branch()
300
        self.assertEqual(
301
            [('call', 'BzrDir.open_branch', ('~hello/',)),
3221.3.3 by Robert Collins
* Hook up the new remote method ``RemoteBzrDir.find_repositoryV2`` so
302
             ('call', 'BzrDir.find_repositoryV2', ('~hello/',))],
3192.2.1 by Andrew Bennetts
Don't transmit URL-escaped relpaths in the smart protocol, which is back to how things worked in bzr 1.1 and earlier.
303
            client._calls)
304
3221.3.3 by Robert Collins
* Hook up the new remote method ``RemoteBzrDir.find_repositoryV2`` so
305
    def check_open_repository(self, rich_root, subtrees, external_lookup='no'):
3104.4.2 by Andrew Bennetts
All tests passing.
306
        transport = MemoryTransport()
307
        transport.mkdir('quack')
308
        transport = transport.clone('quack')
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
309
        if rich_root:
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
310
            rich_response = 'yes'
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
311
        else:
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
312
            rich_response = 'no'
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
313
        if subtrees:
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
314
            subtree_response = 'yes'
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
315
        else:
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
316
            subtree_response = 'no'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
317
        client = FakeClient(transport.base)
318
        client.add_success_response(
319
            'ok', '', rich_response, subtree_response, external_lookup)
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
320
        bzrdir = RemoteBzrDir(transport, _client=client)
321
        result = bzrdir.open_repository()
322
        self.assertEqual(
3221.3.3 by Robert Collins
* Hook up the new remote method ``RemoteBzrDir.find_repositoryV2`` so
323
            [('call', 'BzrDir.find_repositoryV2', ('quack/',))],
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
324
            client._calls)
325
        self.assertIsInstance(result, RemoteRepository)
326
        self.assertEqual(bzrdir, result.bzrdir)
327
        self.assertEqual(rich_root, result._format.rich_root_data)
2018.5.138 by Robert Collins
Merge bzr.dev.
328
        self.assertEqual(subtrees, result._format.supports_tree_reference)
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
329
330
    def test_open_repository_sets_format_attributes(self):
331
        self.check_open_repository(True, True)
332
        self.check_open_repository(False, True)
333
        self.check_open_repository(True, False)
334
        self.check_open_repository(False, False)
3221.3.3 by Robert Collins
* Hook up the new remote method ``RemoteBzrDir.find_repositoryV2`` so
335
        self.check_open_repository(False, False, 'yes')
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
336
2432.3.2 by Andrew Bennetts
Add test, and tidy implementation.
337
    def test_old_server(self):
338
        """RemoteBzrDirFormat should fail to probe if the server version is too
339
        old.
340
        """
341
        self.assertRaises(errors.NotBranchError,
342
            RemoteBzrDirFormat.probe_transport, OldServerTransport())
343
344
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.
345
class TestBzrDirOpenRepository(tests.TestCase):
346
347
    def test_backwards_compat_1_2(self):
348
        transport = MemoryTransport()
349
        transport.mkdir('quack')
350
        transport = transport.clone('quack')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
351
        client = FakeClient(transport.base)
352
        client.add_unknown_method_response('RemoteRepository.find_repositoryV2')
353
        client.add_success_response('ok', '', 'no', 'no')
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.
354
        bzrdir = RemoteBzrDir(transport, _client=client)
355
        repo = bzrdir.open_repository()
356
        self.assertEqual(
357
            [('call', 'BzrDir.find_repositoryV2', ('quack/',)),
358
             ('call', 'BzrDir.find_repository', ('quack/',))],
359
            client._calls)
360
361
2432.3.2 by Andrew Bennetts
Add test, and tidy implementation.
362
class OldSmartClient(object):
363
    """A fake smart client for test_old_version that just returns a version one
364
    response to the 'hello' (query version) command.
365
    """
366
367
    def get_request(self):
368
        input_file = StringIO('ok\x011\n')
369
        output_file = StringIO()
370
        client_medium = medium.SmartSimplePipesClientMedium(
371
            input_file, output_file)
372
        return medium.SmartClientStreamMediumRequest(client_medium)
373
3241.1.1 by Andrew Bennetts
Shift protocol version querying from RemoteBzrDirFormat into SmartClientMedium.
374
    def protocol_version(self):
375
        return 1
376
2432.3.2 by Andrew Bennetts
Add test, and tidy implementation.
377
378
class OldServerTransport(object):
379
    """A fake transport for test_old_server that reports it's smart server
380
    protocol version as version one.
381
    """
382
383
    def __init__(self):
384
        self.base = 'fake:'
385
386
    def get_smart_client(self):
387
        return OldSmartClient()
388
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
389
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
390
class TestBranchLastRevisionInfo(tests.TestCase):
391
392
    def test_empty_branch(self):
393
        # in an empty branch we decode the response properly
394
        transport = MemoryTransport()
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
395
        client = FakeClient(transport.base)
396
        client.add_success_response('ok', '0', 'null:')
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
397
        transport.mkdir('quack')
398
        transport = transport.clone('quack')
399
        # we do not want bzrdir to make any remote calls
400
        bzrdir = RemoteBzrDir(transport, _client=False)
401
        branch = RemoteBranch(bzrdir, None, _client=client)
402
        result = branch.last_revision_info()
403
404
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
405
            [('call', 'Branch.last_revision_info', ('quack/',))],
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
406
            client._calls)
407
        self.assertEqual((0, NULL_REVISION), result)
408
409
    def test_non_empty_branch(self):
410
        # in a non-empty branch we also decode the response properly
2018.5.106 by Andrew Bennetts
Update tests in test_remote to use utf-8 byte strings for revision IDs, rather than unicode strings.
411
        revid = u'\xc8'.encode('utf8')
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
412
        transport = MemoryTransport()
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
413
        client = FakeClient(transport.base)
414
        client.add_success_response('ok', '2', revid)
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
415
        transport.mkdir('kwaak')
416
        transport = transport.clone('kwaak')
417
        # we do not want bzrdir to make any remote calls
418
        bzrdir = RemoteBzrDir(transport, _client=False)
419
        branch = RemoteBranch(bzrdir, None, _client=client)
420
        result = branch.last_revision_info()
421
422
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
423
            [('call', 'Branch.last_revision_info', ('kwaak/',))],
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
424
            client._calls)
2018.5.106 by Andrew Bennetts
Update tests in test_remote to use utf-8 byte strings for revision IDs, rather than unicode strings.
425
        self.assertEqual((2, revid), result)
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
426
427
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
428
class TestBranchSetLastRevision(tests.TestCase):
429
430
    def test_set_empty(self):
431
        # set_revision_history([]) is translated to calling
432
        # Branch.set_last_revision(path, '') on the wire.
3104.4.2 by Andrew Bennetts
All tests passing.
433
        transport = MemoryTransport()
434
        transport.mkdir('branch')
435
        transport = transport.clone('branch')
436
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
437
        client = FakeClient(transport.base)
438
        # lock_write
439
        client.add_success_response('ok', 'branch token', 'repo token')
440
        # set_last_revision
441
        client.add_success_response('ok')
442
        # unlock
443
        client.add_success_response('ok')
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
444
        bzrdir = RemoteBzrDir(transport, _client=False)
445
        branch = RemoteBranch(bzrdir, None, _client=client)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
446
        # This is a hack to work around the problem that RemoteBranch currently
447
        # unnecessarily invokes _ensure_real upon a call to lock_write.
448
        branch._ensure_real = lambda: None
449
        branch.lock_write()
450
        client._calls = []
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
451
        result = branch.set_revision_history([])
452
        self.assertEqual(
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
453
            [('call', 'Branch.set_last_revision',
3104.4.2 by Andrew Bennetts
All tests passing.
454
                ('branch/', 'branch token', 'repo token', 'null:'))],
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
455
            client._calls)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
456
        branch.unlock()
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
457
        self.assertEqual(None, result)
458
459
    def test_set_nonempty(self):
460
        # set_revision_history([rev-id1, ..., rev-idN]) is translated to calling
461
        # Branch.set_last_revision(path, rev-idN) on the wire.
3104.4.2 by Andrew Bennetts
All tests passing.
462
        transport = MemoryTransport()
463
        transport.mkdir('branch')
464
        transport = transport.clone('branch')
465
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
466
        client = FakeClient(transport.base)
467
        # lock_write
468
        client.add_success_response('ok', 'branch token', 'repo token')
469
        # set_last_revision
470
        client.add_success_response('ok')
471
        # unlock
472
        client.add_success_response('ok')
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
473
        bzrdir = RemoteBzrDir(transport, _client=False)
474
        branch = RemoteBranch(bzrdir, None, _client=client)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
475
        # This is a hack to work around the problem that RemoteBranch currently
476
        # unnecessarily invokes _ensure_real upon a call to lock_write.
477
        branch._ensure_real = lambda: None
478
        # Lock the branch, reset the record of remote calls.
479
        branch.lock_write()
480
        client._calls = []
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
481
482
        result = branch.set_revision_history(['rev-id1', 'rev-id2'])
483
        self.assertEqual(
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
484
            [('call', 'Branch.set_last_revision',
3104.4.2 by Andrew Bennetts
All tests passing.
485
                ('branch/', 'branch token', 'repo token', 'rev-id2'))],
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
486
            client._calls)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
487
        branch.unlock()
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
488
        self.assertEqual(None, result)
489
490
    def test_no_such_revision(self):
491
        transport = MemoryTransport()
492
        transport.mkdir('branch')
493
        transport = transport.clone('branch')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
494
        # A response of 'NoSuchRevision' is translated into an exception.
495
        client = FakeClient(transport.base)
496
        # lock_write
497
        client.add_success_response('ok', 'branch token', 'repo token')
498
        # set_last_revision
499
        client.add_error_response('NoSuchRevision', 'rev-id')
500
        # unlock
501
        client.add_success_response('ok')
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
502
503
        bzrdir = RemoteBzrDir(transport, _client=False)
504
        branch = RemoteBranch(bzrdir, None, _client=client)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
505
        branch._ensure_real = lambda: None
506
        branch.lock_write()
507
        client._calls = []
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
508
509
        self.assertRaises(
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
510
            errors.NoSuchRevision, branch.set_revision_history, ['rev-id'])
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
511
        branch.unlock()
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
512
513
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
514
class TestBranchSetLastRevisionInfo(tests.TestCase):
515
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
516
    def test_set_last_revision_info(self):
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
517
        # set_last_revision_info(num, 'rev-id') is translated to calling
518
        # Branch.set_last_revision_info(num, 'rev-id') on the wire.
3297.4.1 by Andrew Bennetts
Merge 'Add Branch.set_last_revision_info smart method'.
519
        transport = MemoryTransport()
520
        transport.mkdir('branch')
521
        transport = transport.clone('branch')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
522
        client = FakeClient(transport.base)
523
        # lock_write
524
        client.add_success_response('ok', 'branch token', 'repo token')
525
        # set_last_revision
526
        client.add_success_response('ok')
527
        # unlock
528
        client.add_success_response('ok')
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
529
530
        bzrdir = RemoteBzrDir(transport, _client=False)
531
        branch = RemoteBranch(bzrdir, None, _client=client)
532
        # This is a hack to work around the problem that RemoteBranch currently
533
        # unnecessarily invokes _ensure_real upon a call to lock_write.
534
        branch._ensure_real = lambda: None
535
        # Lock the branch, reset the record of remote calls.
536
        branch.lock_write()
537
        client._calls = []
538
        result = branch.set_last_revision_info(1234, 'a-revision-id')
539
        self.assertEqual(
540
            [('call', 'Branch.set_last_revision_info',
3297.4.1 by Andrew Bennetts
Merge 'Add Branch.set_last_revision_info smart method'.
541
                ('branch/', 'branch token', 'repo token',
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
542
                 '1234', 'a-revision-id'))],
543
            client._calls)
544
        self.assertEqual(None, result)
545
546
    def test_no_such_revision(self):
547
        # A response of 'NoSuchRevision' is translated into an exception.
548
        transport = MemoryTransport()
549
        transport.mkdir('branch')
550
        transport = transport.clone('branch')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
551
        client = FakeClient(transport.base)
552
        # lock_write
553
        client.add_success_response('ok', 'branch token', 'repo token')
554
        # set_last_revision
555
        client.add_error_response('NoSuchRevision', 'revid')
556
        # unlock
557
        client.add_success_response('ok')
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
558
559
        bzrdir = RemoteBzrDir(transport, _client=False)
560
        branch = RemoteBranch(bzrdir, None, _client=client)
561
        # This is a hack to work around the problem that RemoteBranch currently
562
        # unnecessarily invokes _ensure_real upon a call to lock_write.
563
        branch._ensure_real = lambda: None
564
        # Lock the branch, reset the record of remote calls.
565
        branch.lock_write()
566
        client._calls = []
567
568
        self.assertRaises(
569
            errors.NoSuchRevision, branch.set_last_revision_info, 123, 'revid')
570
        branch.unlock()
571
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
572
    def lock_remote_branch(self, branch):
573
        """Trick a RemoteBranch into thinking it is locked."""
574
        branch._lock_mode = 'w'
575
        branch._lock_count = 2
576
        branch._lock_token = 'branch token'
577
        branch._repo_lock_token = 'repo token'
578
579
    def test_backwards_compatibility(self):
580
        """If the server does not support the Branch.set_last_revision_info
581
        verb (which is new in 1.4), then the client falls back to VFS methods.
582
        """
583
        # This test is a little messy.  Unlike most tests in this file, it
584
        # doesn't purely test what a Remote* object sends over the wire, and
585
        # how it reacts to responses from the wire.  It instead relies partly
586
        # on asserting that the RemoteBranch will call
587
        # self._real_branch.set_last_revision_info(...).
588
589
        # First, set up our RemoteBranch with a FakeClient that raises
590
        # UnknownSmartMethod, and a StubRealBranch that logs how it is called.
591
        transport = MemoryTransport()
592
        transport.mkdir('branch')
593
        transport = transport.clone('branch')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
594
        client = FakeClient(transport.base)
595
        client.add_unknown_method_response('Branch.set_last_revision_info')
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
596
        bzrdir = RemoteBzrDir(transport, _client=False)
597
        branch = RemoteBranch(bzrdir, None, _client=client)
598
        class StubRealBranch(object):
599
            def __init__(self):
600
                self.calls = []
601
            def set_last_revision_info(self, revno, revision_id):
602
                self.calls.append(
603
                    ('set_last_revision_info', revno, revision_id))
604
        real_branch = StubRealBranch()
605
        branch._real_branch = real_branch
606
        self.lock_remote_branch(branch)
607
608
        # Call set_last_revision_info, and verify it behaved as expected.
609
        result = branch.set_last_revision_info(1234, 'a-revision-id')
610
        self.assertEqual(
611
            [('call', 'Branch.set_last_revision_info',
612
                ('branch/', 'branch token', 'repo token',
613
                 '1234', 'a-revision-id')),],
614
            client._calls)
615
        self.assertEqual(
616
            [('set_last_revision_info', 1234, 'a-revision-id')],
617
            real_branch.calls)
618
3245.4.53 by Andrew Bennetts
Add some missing 'raise' statements to test_remote.
619
    def test_unexpected_error(self):
620
        # A response of 'NoSuchRevision' is translated into an exception.
621
        transport = MemoryTransport()
622
        transport.mkdir('branch')
623
        transport = transport.clone('branch')
624
        client = FakeClient(transport.base)
625
        # lock_write
626
        client.add_success_response('ok', 'branch token', 'repo token')
627
        # set_last_revision
628
        client.add_error_response('UnexpectedError')
629
        # unlock
630
        client.add_success_response('ok')
631
632
        bzrdir = RemoteBzrDir(transport, _client=False)
633
        branch = RemoteBranch(bzrdir, None, _client=client)
634
        # This is a hack to work around the problem that RemoteBranch currently
635
        # unnecessarily invokes _ensure_real upon a call to lock_write.
636
        branch._ensure_real = lambda: None
637
        # Lock the branch, reset the record of remote calls.
638
        branch.lock_write()
639
        client._calls = []
640
641
        err = self.assertRaises(
642
            errors.ErrorFromSmartServer,
643
            branch.set_last_revision_info, 123, 'revid')
644
        self.assertEqual(('UnexpectedError',), err.error_tuple)
645
        branch.unlock()
646
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
647
2018.5.169 by Andrew Bennetts
Add a _server_formats flag to BzrDir.open_from_transport and BzrDirFormat.find_format, make RemoteBranch.control_files into a property.
648
class TestBranchControlGetBranchConf(tests.TestCaseWithMemoryTransport):
3408.3.1 by Martin Pool
Remove erroneous handling of branch.conf for RemoteBranch
649
    """Getting the branch configuration should use an abstract method not vfs.
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
650
    """
651
652
    def test_get_branch_conf(self):
3408.3.1 by Martin Pool
Remove erroneous handling of branch.conf for RemoteBranch
653
        raise tests.KnownFailure('branch.conf is not retrieved by get_config_file')
654
        # We should see that branch.get_config() does a single rpc to get the
655
        # remote configuration file, abstracting away where that is stored on
656
        # the server.  However at the moment it always falls back to using the
657
        # vfs, and this would need some changes in config.py.
658
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
659
        # in an empty branch we decode the response properly
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
660
        client = FakeClient(self.get_url())
3245.6.1 by Andrew Bennetts
Merge from bzr.dev.
661
        client.add_success_response_with_body('# config file body', 'ok')
2018.5.169 by Andrew Bennetts
Add a _server_formats flag to BzrDir.open_from_transport and BzrDirFormat.find_format, make RemoteBranch.control_files into a property.
662
        # we need to make a real branch because the remote_branch.control_files
663
        # will trigger _ensure_real.
664
        branch = self.make_branch('quack')
665
        transport = branch.bzrdir.root_transport
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
666
        # we do not want bzrdir to make any remote calls
667
        bzrdir = RemoteBzrDir(transport, _client=False)
668
        branch = RemoteBranch(bzrdir, None, _client=client)
3408.3.1 by Martin Pool
Remove erroneous handling of branch.conf for RemoteBranch
669
        config = branch.get_config()
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
670
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
671
            [('call_expecting_body', 'Branch.get_config_file', ('quack/',))],
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
672
            client._calls)
673
674
2018.5.95 by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.
675
class TestBranchLockWrite(tests.TestCase):
676
677
    def test_lock_write_unlockable(self):
678
        transport = MemoryTransport()
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
679
        client = FakeClient(transport.base)
680
        client.add_error_response('UnlockableTransport')
2018.5.95 by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.
681
        transport.mkdir('quack')
682
        transport = transport.clone('quack')
683
        # we do not want bzrdir to make any remote calls
684
        bzrdir = RemoteBzrDir(transport, _client=False)
685
        branch = RemoteBranch(bzrdir, None, _client=client)
686
        self.assertRaises(errors.UnlockableTransport, branch.lock_write)
687
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
688
            [('call', 'Branch.lock_write', ('quack/', '', ''))],
2018.5.95 by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.
689
            client._calls)
690
691
2466.2.2 by Andrew Bennetts
Add tests for RemoteTransport.is_readonly in the style of the other remote object tests.
692
class TestTransportIsReadonly(tests.TestCase):
693
694
    def test_true(self):
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
695
        client = FakeClient()
696
        client.add_success_response('yes')
2466.2.2 by Andrew Bennetts
Add tests for RemoteTransport.is_readonly in the style of the other remote object tests.
697
        transport = RemoteTransport('bzr://example.com/', medium=False,
698
                                    _client=client)
699
        self.assertEqual(True, transport.is_readonly())
700
        self.assertEqual(
701
            [('call', 'Transport.is_readonly', ())],
702
            client._calls)
703
704
    def test_false(self):
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
705
        client = FakeClient()
706
        client.add_success_response('no')
2466.2.2 by Andrew Bennetts
Add tests for RemoteTransport.is_readonly in the style of the other remote object tests.
707
        transport = RemoteTransport('bzr://example.com/', medium=False,
708
                                    _client=client)
709
        self.assertEqual(False, transport.is_readonly())
710
        self.assertEqual(
711
            [('call', 'Transport.is_readonly', ())],
712
            client._calls)
713
714
    def test_error_from_old_server(self):
715
        """bzr 0.15 and earlier servers don't recognise the is_readonly verb.
716
        
717
        Clients should treat it as a "no" response, because is_readonly is only
718
        advisory anyway (a transport could be read-write, but then the
719
        underlying filesystem could be readonly anyway).
720
        """
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
721
        client = FakeClient()
722
        client.add_unknown_method_response('Transport.is_readonly')
2471.2.1 by Andrew Bennetts
Fix trivial incompatibility with bzr 0.11 servers, which give a slightly different error to bzr 0.15 servers.
723
        transport = RemoteTransport('bzr://example.com/', medium=False,
724
                                    _client=client)
725
        self.assertEqual(False, transport.is_readonly())
726
        self.assertEqual(
727
            [('call', 'Transport.is_readonly', ())],
728
            client._calls)
729
2466.2.2 by Andrew Bennetts
Add tests for RemoteTransport.is_readonly in the style of the other remote object tests.
730
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
731
class TestRemoteRepository(tests.TestCase):
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
732
    """Base for testing RemoteRepository protocol usage.
733
    
734
    These tests contain frozen requests and responses.  We want any changes to 
735
    what is sent or expected to be require a thoughtful update to these tests
736
    because they might break compatibility with different-versioned servers.
737
    """
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
738
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
739
    def setup_fake_client_and_repository(self, transport_path):
2018.18.7 by Martin Pool
(broken) Start addng client proxy test for Repository.tarball
740
        """Create the fake client and repository for testing with.
741
        
742
        There's no real server here; we just have canned responses sent
743
        back one by one.
744
        
745
        :param transport_path: Path below the root of the MemoryTransport
746
            where the repository will be created.
747
        """
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
748
        transport = MemoryTransport()
749
        transport.mkdir(transport_path)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
750
        client = FakeClient(transport.base)
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
751
        transport = transport.clone(transport_path)
752
        # we do not want bzrdir to make any remote calls
753
        bzrdir = RemoteBzrDir(transport, _client=False)
754
        repo = RemoteRepository(bzrdir, None, _client=client)
755
        return repo, client
756
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
757
2018.12.2 by Andrew Bennetts
Remove some duplicate code in test_remote
758
class TestRepositoryGatherStats(TestRemoteRepository):
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
759
760
    def test_revid_none(self):
761
        # ('ok',), body with revisions and size
762
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
763
        repo, client = self.setup_fake_client_and_repository(transport_path)
764
        client.add_success_response_with_body(
765
            'revisions: 2\nsize: 18\n', 'ok')
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
766
        result = repo.gather_stats(None)
767
        self.assertEqual(
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
768
            [('call_expecting_body', 'Repository.gather_stats',
3104.4.2 by Andrew Bennetts
All tests passing.
769
             ('quack/','','no'))],
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
770
            client._calls)
771
        self.assertEqual({'revisions': 2, 'size': 18}, result)
772
773
    def test_revid_no_committers(self):
774
        # ('ok',), body without committers
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
775
        body = ('firstrev: 123456.300 3600\n'
776
                'latestrev: 654231.400 0\n'
777
                'revisions: 2\n'
778
                'size: 18\n')
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
779
        transport_path = 'quick'
2018.5.106 by Andrew Bennetts
Update tests in test_remote to use utf-8 byte strings for revision IDs, rather than unicode strings.
780
        revid = u'\xc8'.encode('utf8')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
781
        repo, client = self.setup_fake_client_and_repository(transport_path)
782
        client.add_success_response_with_body(body, 'ok')
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
783
        result = repo.gather_stats(revid)
784
        self.assertEqual(
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
785
            [('call_expecting_body', 'Repository.gather_stats',
3104.4.2 by Andrew Bennetts
All tests passing.
786
              ('quick/', revid, 'no'))],
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
787
            client._calls)
788
        self.assertEqual({'revisions': 2, 'size': 18,
789
                          'firstrev': (123456.300, 3600),
790
                          'latestrev': (654231.400, 0),},
791
                         result)
792
793
    def test_revid_with_committers(self):
794
        # ('ok',), body with committers
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
795
        body = ('committers: 128\n'
796
                'firstrev: 123456.300 3600\n'
797
                'latestrev: 654231.400 0\n'
798
                'revisions: 2\n'
799
                'size: 18\n')
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
800
        transport_path = 'buick'
2018.5.106 by Andrew Bennetts
Update tests in test_remote to use utf-8 byte strings for revision IDs, rather than unicode strings.
801
        revid = u'\xc8'.encode('utf8')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
802
        repo, client = self.setup_fake_client_and_repository(transport_path)
803
        client.add_success_response_with_body(body, 'ok')
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
804
        result = repo.gather_stats(revid, True)
805
        self.assertEqual(
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
806
            [('call_expecting_body', 'Repository.gather_stats',
3104.4.2 by Andrew Bennetts
All tests passing.
807
              ('buick/', revid, 'yes'))],
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
808
            client._calls)
809
        self.assertEqual({'revisions': 2, 'size': 18,
810
                          'committers': 128,
811
                          'firstrev': (123456.300, 3600),
812
                          'latestrev': (654231.400, 0),},
813
                         result)
814
815
3172.5.4 by Robert Collins
Implement get_parent_map for RemoteRepository with caching, based on get_revision_graph.
816
class TestRepositoryGetGraph(TestRemoteRepository):
817
818
    def test_get_graph(self):
3172.5.8 by Robert Collins
Review feedback.
819
        # get_graph returns a graph with the repository as the
820
        # parents_provider.
3172.5.4 by Robert Collins
Implement get_parent_map for RemoteRepository with caching, based on get_revision_graph.
821
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
822
        repo, client = self.setup_fake_client_and_repository(transport_path)
3172.5.4 by Robert Collins
Implement get_parent_map for RemoteRepository with caching, based on get_revision_graph.
823
        graph = repo.get_graph()
824
        self.assertEqual(graph._parents_provider, repo)
825
826
827
class TestRepositoryGetParentMap(TestRemoteRepository):
828
829
    def test_get_parent_map_caching(self):
830
        # get_parent_map returns from cache until unlock()
831
        # setup a reponse with two revisions
832
        r1 = u'\u0e33'.encode('utf8')
833
        r2 = u'\u0dab'.encode('utf8')
834
        lines = [' '.join([r2, r1]), r1]
3211.5.2 by Robert Collins
Change RemoteRepository.get_parent_map to use bz2 not gzip for compression.
835
        encoded_body = bz2.compress('\n'.join(lines))
3172.5.4 by Robert Collins
Implement get_parent_map for RemoteRepository with caching, based on get_revision_graph.
836
837
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
838
        repo, client = self.setup_fake_client_and_repository(transport_path)
839
        client.add_success_response_with_body(encoded_body, 'ok')
840
        client.add_success_response_with_body(encoded_body, 'ok')
3172.5.4 by Robert Collins
Implement get_parent_map for RemoteRepository with caching, based on get_revision_graph.
841
        repo.lock_read()
842
        graph = repo.get_graph()
843
        parents = graph.get_parent_map([r2])
844
        self.assertEqual({r2: (r1,)}, parents)
845
        # locking and unlocking deeper should not reset
846
        repo.lock_read()
847
        repo.unlock()
848
        parents = graph.get_parent_map([r1])
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
849
        self.assertEqual({r1: (NULL_REVISION,)}, parents)
3172.5.4 by Robert Collins
Implement get_parent_map for RemoteRepository with caching, based on get_revision_graph.
850
        self.assertEqual(
3211.5.1 by Robert Collins
Change the smart server get_parents method to take a graph search to exclude already recieved parents from. This prevents history shortcuts causing huge numbers of duplicates.
851
            [('call_with_body_bytes_expecting_body',
852
              'Repository.get_parent_map', ('quack/', r2), '\n\n0')],
3172.5.4 by Robert Collins
Implement get_parent_map for RemoteRepository with caching, based on get_revision_graph.
853
            client._calls)
854
        repo.unlock()
855
        # now we call again, and it should use the second response.
856
        repo.lock_read()
857
        graph = repo.get_graph()
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
858
        parents = graph.get_parent_map([r1])
859
        self.assertEqual({r1: (NULL_REVISION,)}, parents)
3172.5.4 by Robert Collins
Implement get_parent_map for RemoteRepository with caching, based on get_revision_graph.
860
        self.assertEqual(
3211.5.1 by Robert Collins
Change the smart server get_parents method to take a graph search to exclude already recieved parents from. This prevents history shortcuts causing huge numbers of duplicates.
861
            [('call_with_body_bytes_expecting_body',
862
              'Repository.get_parent_map', ('quack/', r2), '\n\n0'),
863
             ('call_with_body_bytes_expecting_body',
864
              'Repository.get_parent_map', ('quack/', r1), '\n\n0'),
3172.5.4 by Robert Collins
Implement get_parent_map for RemoteRepository with caching, based on get_revision_graph.
865
            ],
866
            client._calls)
867
        repo.unlock()
868
3213.1.2 by Andrew Bennetts
Add test for reconnection if get_parent_map is unknown by the server.
869
    def test_get_parent_map_reconnects_if_unknown_method(self):
870
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
871
        repo, client = self.setup_fake_client_and_repository(transport_path)
872
        client.add_unknown_method_response('Repository,get_parent_map')
873
        client.add_success_response_with_body('', 'ok')
3389.1.2 by Andrew Bennetts
Add test for the bug John found.
874
        self.assertTrue(client._medium._remote_is_at_least_1_2)
3213.1.2 by Andrew Bennetts
Add test for reconnection if get_parent_map is unknown by the server.
875
        rev_id = 'revision-id'
3297.3.5 by Andrew Bennetts
Suppress a deprecation warning.
876
        expected_deprecations = [
877
            'bzrlib.remote.RemoteRepository.get_revision_graph was deprecated '
878
            'in version 1.4.']
879
        parents = self.callDeprecated(
880
            expected_deprecations, repo.get_parent_map, [rev_id])
3213.1.2 by Andrew Bennetts
Add test for reconnection if get_parent_map is unknown by the server.
881
        self.assertEqual(
3213.1.8 by Andrew Bennetts
Merge from bzr.dev.
882
            [('call_with_body_bytes_expecting_body',
883
              'Repository.get_parent_map', ('quack/', rev_id), '\n\n0'),
3213.1.2 by Andrew Bennetts
Add test for reconnection if get_parent_map is unknown by the server.
884
             ('disconnect medium',),
885
             ('call_expecting_body', 'Repository.get_revision_graph',
886
              ('quack/', ''))],
887
            client._calls)
3389.1.2 by Andrew Bennetts
Add test for the bug John found.
888
        # The medium is now marked as being connected to an older server
889
        self.assertFalse(client._medium._remote_is_at_least_1_2)
890
891
    def test_get_parent_map_fallback_parentless_node(self):
892
        """get_parent_map falls back to get_revision_graph on old servers.  The
893
        results from get_revision_graph are tweaked to match the get_parent_map
894
        API.
895
3389.1.3 by Andrew Bennetts
Remove XXX from test description.
896
        Specifically, a {key: ()} result from get_revision_graph means "no
3389.1.2 by Andrew Bennetts
Add test for the bug John found.
897
        parents" for that key, which in get_parent_map results should be
3389.1.3 by Andrew Bennetts
Remove XXX from test description.
898
        represented as {key: ('null:',)}.
3389.1.2 by Andrew Bennetts
Add test for the bug John found.
899
900
        This is the test for https://bugs.launchpad.net/bzr/+bug/214894
901
        """
902
        rev_id = 'revision-id'
903
        transport_path = 'quack'
3245.4.40 by Andrew Bennetts
Merge from bzr.dev.
904
        repo, client = self.setup_fake_client_and_repository(transport_path)
905
        client.add_success_response_with_body(rev_id, 'ok')
3389.1.2 by Andrew Bennetts
Add test for the bug John found.
906
        client._medium._remote_is_at_least_1_2 = False
907
        expected_deprecations = [
908
            'bzrlib.remote.RemoteRepository.get_revision_graph was deprecated '
909
            'in version 1.4.']
910
        parents = self.callDeprecated(
911
            expected_deprecations, repo.get_parent_map, [rev_id])
912
        self.assertEqual(
913
            [('call_expecting_body', 'Repository.get_revision_graph',
914
             ('quack/', ''))],
915
            client._calls)
916
        self.assertEqual({rev_id: ('null:',)}, parents)
3213.1.2 by Andrew Bennetts
Add test for reconnection if get_parent_map is unknown by the server.
917
3297.2.3 by Andrew Bennetts
Test the code path that the typo is on.
918
    def test_get_parent_map_unexpected_response(self):
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
919
        repo, client = self.setup_fake_client_and_repository('path')
920
        client.add_success_response('something unexpected!')
3297.2.3 by Andrew Bennetts
Test the code path that the typo is on.
921
        self.assertRaises(
922
            errors.UnexpectedSmartServerResponse,
923
            repo.get_parent_map, ['a-revision-id'])
3213.1.2 by Andrew Bennetts
Add test for reconnection if get_parent_map is unknown by the server.
924
3172.5.4 by Robert Collins
Implement get_parent_map for RemoteRepository with caching, based on get_revision_graph.
925
2018.5.68 by Wouter van Heyst
Merge RemoteRepository.gather_stats.
926
class TestRepositoryGetRevisionGraph(TestRemoteRepository):
927
    
928
    def test_null_revision(self):
929
        # a null revision has the predictable result {}, we should have no wire
930
        # traffic when calling it with this argument
931
        transport_path = 'empty'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
932
        repo, client = self.setup_fake_client_and_repository(transport_path)
933
        client.add_success_response('notused')
3287.6.4 by Robert Collins
Fix up deprecation warnings for get_revision_graph.
934
        result = self.applyDeprecated(one_four, repo.get_revision_graph,
935
            NULL_REVISION)
2018.5.68 by Wouter van Heyst
Merge RemoteRepository.gather_stats.
936
        self.assertEqual([], client._calls)
937
        self.assertEqual({}, result)
938
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
939
    def test_none_revision(self):
940
        # with none we want the entire graph
2018.5.106 by Andrew Bennetts
Update tests in test_remote to use utf-8 byte strings for revision IDs, rather than unicode strings.
941
        r1 = u'\u0e33'.encode('utf8')
942
        r2 = u'\u0dab'.encode('utf8')
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
943
        lines = [' '.join([r2, r1]), r1]
2018.5.106 by Andrew Bennetts
Update tests in test_remote to use utf-8 byte strings for revision IDs, rather than unicode strings.
944
        encoded_body = '\n'.join(lines)
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
945
946
        transport_path = 'sinhala'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
947
        repo, client = self.setup_fake_client_and_repository(transport_path)
948
        client.add_success_response_with_body(encoded_body, 'ok')
3287.6.4 by Robert Collins
Fix up deprecation warnings for get_revision_graph.
949
        result = self.applyDeprecated(one_four, repo.get_revision_graph)
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
950
        self.assertEqual(
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
951
            [('call_expecting_body', 'Repository.get_revision_graph',
3104.4.2 by Andrew Bennetts
All tests passing.
952
             ('sinhala/', ''))],
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
953
            client._calls)
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
954
        self.assertEqual({r1: (), r2: (r1, )}, result)
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
955
956
    def test_specific_revision(self):
957
        # with a specific revision we want the graph for that
958
        # with none we want the entire graph
2018.5.106 by Andrew Bennetts
Update tests in test_remote to use utf-8 byte strings for revision IDs, rather than unicode strings.
959
        r11 = u'\u0e33'.encode('utf8')
960
        r12 = u'\xc9'.encode('utf8')
961
        r2 = u'\u0dab'.encode('utf8')
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
962
        lines = [' '.join([r2, r11, r12]), r11, r12]
2018.5.106 by Andrew Bennetts
Update tests in test_remote to use utf-8 byte strings for revision IDs, rather than unicode strings.
963
        encoded_body = '\n'.join(lines)
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
964
965
        transport_path = 'sinhala'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
966
        repo, client = self.setup_fake_client_and_repository(transport_path)
967
        client.add_success_response_with_body(encoded_body, 'ok')
3287.6.4 by Robert Collins
Fix up deprecation warnings for get_revision_graph.
968
        result = self.applyDeprecated(one_four, repo.get_revision_graph, r2)
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
969
        self.assertEqual(
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
970
            [('call_expecting_body', 'Repository.get_revision_graph',
3104.4.2 by Andrew Bennetts
All tests passing.
971
             ('sinhala/', r2))],
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
972
            client._calls)
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
973
        self.assertEqual({r11: (), r12: (), r2: (r11, r12), }, result)
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
974
975
    def test_no_such_revision(self):
976
        revid = '123'
977
        transport_path = 'sinhala'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
978
        repo, client = self.setup_fake_client_and_repository(transport_path)
979
        client.add_error_response('nosuchrevision', revid)
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
980
        # also check that the right revision is reported in the error
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
981
        self.assertRaises(errors.NoSuchRevision,
3287.6.4 by Robert Collins
Fix up deprecation warnings for get_revision_graph.
982
            self.applyDeprecated, one_four, repo.get_revision_graph, revid)
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
983
        self.assertEqual(
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
984
            [('call_expecting_body', 'Repository.get_revision_graph',
3104.4.2 by Andrew Bennetts
All tests passing.
985
             ('sinhala/', revid))],
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
986
            client._calls)
987
3245.4.53 by Andrew Bennetts
Add some missing 'raise' statements to test_remote.
988
    def test_unexpected_error(self):
989
        revid = '123'
990
        transport_path = 'sinhala'
991
        repo, client = self.setup_fake_client_and_repository(transport_path)
992
        client.add_error_response('AnUnexpectedError')
993
        e = self.assertRaises(errors.ErrorFromSmartServer,
994
            self.applyDeprecated, one_four, repo.get_revision_graph, revid)
995
        self.assertEqual(('AnUnexpectedError',), e.error_tuple)
996
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
997
        
998
class TestRepositoryIsShared(TestRemoteRepository):
999
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1000
    def test_is_shared(self):
1001
        # ('yes', ) for Repository.is_shared -> 'True'.
1002
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1003
        repo, client = self.setup_fake_client_and_repository(transport_path)
1004
        client.add_success_response('yes')
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1005
        result = repo.is_shared()
1006
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
1007
            [('call', 'Repository.is_shared', ('quack/',))],
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1008
            client._calls)
1009
        self.assertEqual(True, result)
1010
1011
    def test_is_not_shared(self):
1012
        # ('no', ) for Repository.is_shared -> 'False'.
1013
        transport_path = 'qwack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1014
        repo, client = self.setup_fake_client_and_repository(transport_path)
1015
        client.add_success_response('no')
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1016
        result = repo.is_shared()
1017
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
1018
            [('call', 'Repository.is_shared', ('qwack/',))],
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1019
            client._calls)
1020
        self.assertEqual(False, result)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1021
1022
1023
class TestRepositoryLockWrite(TestRemoteRepository):
1024
1025
    def test_lock_write(self):
1026
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1027
        repo, client = self.setup_fake_client_and_repository(transport_path)
1028
        client.add_success_response('ok', 'a token')
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1029
        result = repo.lock_write()
1030
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
1031
            [('call', 'Repository.lock_write', ('quack/', ''))],
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1032
            client._calls)
1033
        self.assertEqual('a token', result)
1034
1035
    def test_lock_write_already_locked(self):
1036
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1037
        repo, client = self.setup_fake_client_and_repository(transport_path)
1038
        client.add_error_response('LockContention')
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1039
        self.assertRaises(errors.LockContention, repo.lock_write)
1040
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
1041
            [('call', 'Repository.lock_write', ('quack/', ''))],
2018.5.95 by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.
1042
            client._calls)
1043
1044
    def test_lock_write_unlockable(self):
1045
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1046
        repo, client = self.setup_fake_client_and_repository(transport_path)
1047
        client.add_error_response('UnlockableTransport')
2018.5.95 by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.
1048
        self.assertRaises(errors.UnlockableTransport, repo.lock_write)
1049
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
1050
            [('call', 'Repository.lock_write', ('quack/', ''))],
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1051
            client._calls)
1052
1053
1054
class TestRepositoryUnlock(TestRemoteRepository):
1055
1056
    def test_unlock(self):
1057
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1058
        repo, client = self.setup_fake_client_and_repository(transport_path)
1059
        client.add_success_response('ok', 'a token')
1060
        client.add_success_response('ok')
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1061
        repo.lock_write()
1062
        repo.unlock()
1063
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
1064
            [('call', 'Repository.lock_write', ('quack/', '')),
1065
             ('call', 'Repository.unlock', ('quack/', 'a token'))],
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1066
            client._calls)
1067
1068
    def test_unlock_wrong_token(self):
1069
        # If somehow the token is wrong, unlock will raise TokenMismatch.
1070
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1071
        repo, client = self.setup_fake_client_and_repository(transport_path)
1072
        client.add_success_response('ok', 'a token')
1073
        client.add_error_response('TokenMismatch')
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1074
        repo.lock_write()
1075
        self.assertRaises(errors.TokenMismatch, repo.unlock)
1076
1077
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1078
class TestRepositoryHasRevision(TestRemoteRepository):
1079
1080
    def test_none(self):
1081
        # repo.has_revision(None) should not cause any traffic.
1082
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1083
        repo, client = self.setup_fake_client_and_repository(transport_path)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1084
1085
        # The null revision is always there, so has_revision(None) == True.
3172.3.3 by Robert Collins
Missed one occurence of None -> NULL_REVISION.
1086
        self.assertEqual(True, repo.has_revision(NULL_REVISION))
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1087
1088
        # The remote repo shouldn't be accessed.
1089
        self.assertEqual([], client._calls)
2018.18.7 by Martin Pool
(broken) Start addng client proxy test for Repository.tarball
1090
1091
1092
class TestRepositoryTarball(TestRemoteRepository):
1093
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
1094
    # This is a canned tarball reponse we can validate against
2018.18.18 by Martin Pool
reformat
1095
    tarball_content = (
2018.18.23 by Martin Pool
review cleanups
1096
        'QlpoOTFBWSZTWdGkj3wAAWF/k8aQACBIB//A9+8cIX/v33AACEAYABAECEACNz'
1097
        'JqsgJJFPTSnk1A3qh6mTQAAAANPUHkagkSTEkaA09QaNAAAGgAAAcwCYCZGAEY'
1098
        'mJhMJghpiaYBUkKammSHqNMZQ0NABkNAeo0AGneAevnlwQoGzEzNVzaYxp/1Uk'
1099
        'xXzA1CQX0BJMZZLcPBrluJir5SQyijWHYZ6ZUtVqqlYDdB2QoCwa9GyWwGYDMA'
1100
        'OQYhkpLt/OKFnnlT8E0PmO8+ZNSo2WWqeCzGB5fBXZ3IvV7uNJVE7DYnWj6qwB'
1101
        'k5DJDIrQ5OQHHIjkS9KqwG3mc3t+F1+iujb89ufyBNIKCgeZBWrl5cXxbMGoMs'
1102
        'c9JuUkg5YsiVcaZJurc6KLi6yKOkgCUOlIlOpOoXyrTJjK8ZgbklReDdwGmFgt'
1103
        'dkVsAIslSVCd4AtACSLbyhLHryfb14PKegrVDba+U8OL6KQtzdM5HLjAc8/p6n'
1104
        '0lgaWU8skgO7xupPTkyuwheSckejFLK5T4ZOo0Gda9viaIhpD1Qn7JqqlKAJqC'
1105
        'QplPKp2nqBWAfwBGaOwVrz3y1T+UZZNismXHsb2Jq18T+VaD9k4P8DqE3g70qV'
1106
        'JLurpnDI6VS5oqDDPVbtVjMxMxMg4rzQVipn2Bv1fVNK0iq3Gl0hhnnHKm/egy'
1107
        'nWQ7QH/F3JFOFCQ0aSPfA='
1108
        ).decode('base64')
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
1109
2018.18.7 by Martin Pool
(broken) Start addng client proxy test for Repository.tarball
1110
    def test_repository_tarball(self):
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
1111
        # Test that Repository.tarball generates the right operations
2018.18.7 by Martin Pool
(broken) Start addng client proxy test for Repository.tarball
1112
        transport_path = 'repo'
2018.18.14 by Martin Pool
merge hpss again; restore incorrectly removed RemoteRepository.break_lock
1113
        expected_calls = [('call_expecting_body', 'Repository.tarball',
3104.4.2 by Andrew Bennetts
All tests passing.
1114
                           ('repo/', 'bz2',),),
2018.18.7 by Martin Pool
(broken) Start addng client proxy test for Repository.tarball
1115
            ]
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1116
        repo, client = self.setup_fake_client_and_repository(transport_path)
1117
        client.add_success_response_with_body(self.tarball_content, 'ok')
2018.18.7 by Martin Pool
(broken) Start addng client proxy test for Repository.tarball
1118
        # Now actually ask for the tarball
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1119
        tarball_file = repo._get_tarball('bz2')
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1120
        try:
1121
            self.assertEqual(expected_calls, client._calls)
1122
            self.assertEqual(self.tarball_content, tarball_file.read())
1123
        finally:
1124
            tarball_file.close()
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
1125
1126
1127
class TestRemoteRepositoryCopyContent(tests.TestCaseWithTransport):
1128
    """RemoteRepository.copy_content_into optimizations"""
1129
2018.18.10 by Martin Pool
copy_content_into from Remote repositories by using temporary directories on both ends.
1130
    def test_copy_content_remote_to_local(self):
1131
        self.transport_server = server.SmartTCPServer_for_testing
1132
        src_repo = self.make_repository('repo1')
1133
        src_repo = repository.Repository.open(self.get_url('repo1'))
1134
        # At the moment the tarball-based copy_content_into can't write back
1135
        # into a smart server.  It would be good if it could upload the
1136
        # tarball; once that works we'd have to create repositories of
1137
        # different formats. -- mbp 20070410
1138
        dest_url = self.get_vfs_only_url('repo2')
1139
        dest_bzrdir = BzrDir.create(dest_url)
1140
        dest_repo = dest_bzrdir.create_repository()
1141
        self.assertFalse(isinstance(dest_repo, RemoteRepository))
1142
        self.assertTrue(isinstance(src_repo, RemoteRepository))
1143
        src_repo.copy_content_into(dest_repo)
2535.3.39 by Andrew Bennetts
Tidy some XXXs.
1144
1145
2535.3.49 by Andrew Bennetts
Rename 'Repository.fetch_revisions' smart request to 'Repository.stream_knit_data_for_revisions'.
1146
class TestRepositoryStreamKnitData(TestRemoteRepository):
2535.3.39 by Andrew Bennetts
Tidy some XXXs.
1147
1148
    def make_pack_file(self, records):
1149
        pack_file = StringIO()
1150
        pack_writer = pack.ContainerWriter(pack_file.write)
1151
        pack_writer.begin()
1152
        for bytes, names in records:
1153
            pack_writer.add_bytes_record(bytes, names)
1154
        pack_writer.end()
1155
        pack_file.seek(0)
1156
        return pack_file
1157
2535.4.2 by Andrew Bennetts
Nasty hackery to make stream_knit_data_for_revisions response use streaming.
1158
    def make_pack_stream(self, records):
2535.4.18 by Andrew Bennetts
Use pack.ContainerSerialiser to remove some nasty cruft.
1159
        pack_serialiser = pack.ContainerSerialiser()
1160
        yield pack_serialiser.begin()
2535.4.2 by Andrew Bennetts
Nasty hackery to make stream_knit_data_for_revisions response use streaming.
1161
        for bytes, names in records:
2535.4.18 by Andrew Bennetts
Use pack.ContainerSerialiser to remove some nasty cruft.
1162
            yield pack_serialiser.bytes_record(bytes, names)
1163
        yield pack_serialiser.end()
2535.4.2 by Andrew Bennetts
Nasty hackery to make stream_knit_data_for_revisions response use streaming.
1164
2535.3.39 by Andrew Bennetts
Tidy some XXXs.
1165
    def test_bad_pack_from_server(self):
2535.3.50 by Andrew Bennetts
Use tuple names in data streams rather than concatenated strings.
1166
        """A response with invalid data (e.g. it has a record with multiple
1167
        names) triggers an exception.
1168
        
1169
        Not all possible errors will be caught at this stage, but obviously
1170
        malformed data should be.
1171
        """
1172
        record = ('bytes', [('name1',), ('name2',)])
2535.4.2 by Andrew Bennetts
Nasty hackery to make stream_knit_data_for_revisions response use streaming.
1173
        pack_stream = self.make_pack_stream([record])
2535.3.39 by Andrew Bennetts
Tidy some XXXs.
1174
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1175
        repo, client = self.setup_fake_client_and_repository(transport_path)
1176
        client.add_success_response_with_body(pack_stream, 'ok')
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
1177
        search = graph.SearchResult(set(['revid']), set(), 1, set(['revid']))
1178
        stream = repo.get_data_stream_for_search(search)
2535.3.39 by Andrew Bennetts
Tidy some XXXs.
1179
        self.assertRaises(errors.SmartProtocolError, list, stream)
1180
    
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
1181
    def test_backwards_compatibility(self):
1182
        """If the server doesn't recognise this request, fallback to VFS."""
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1183
        repo, client = self.setup_fake_client_and_repository('path')
1184
        client.add_unknown_method_response(
1185
            'Repository.stream_revisions_chunked')
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
1186
        self.mock_called = False
1187
        repo._real_repository = MockRealRepository(self)
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
1188
        search = graph.SearchResult(set(['revid']), set(), 1, set(['revid']))
1189
        repo.get_data_stream_for_search(search)
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
1190
        self.assertTrue(self.mock_called)
1191
        self.failIf(client.expecting_body,
1192
            "The protocol has been left in an unclean state that will cause "
1193
            "TooManyConcurrentRequests errors.")
1194
1195
1196
class MockRealRepository(object):
1197
    """Helper class for TestRepositoryStreamKnitData.test_unknown_method."""
1198
1199
    def __init__(self, test):
1200
        self.test = test
1201
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
1202
    def get_data_stream_for_search(self, search):
1203
        self.test.assertEqual(set(['revid']), search.get_keys())
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
1204
        self.test.mock_called = True
1205
1206