/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
3407.2.2 by Martin Pool
Remove special case in RemoteBranchLockableFiles for branch.conf
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
3431.3.11 by Andrew Bennetts
Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.
49
from bzrlib.transport import get_transport, http
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
50
from bzrlib.transport.memory import MemoryTransport
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
51
from bzrlib.transport.remote import RemoteTransport, RemoteTCPTransport
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
3431.3.2 by Andrew Bennetts
Remove 'base' from _SmartClient entirely, now that the medium has it.
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
3431.3.11 by Andrew Bennetts
Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.
187
class FakeMedium(medium.SmartClientMedium):
3104.4.2 by Andrew Bennetts
All tests passing.
188
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
189
    def __init__(self, client_calls, base):
3453.4.1 by Andrew Bennetts
Better infrastructure on SmartClientMedium for tracking the remote version.
190
        medium.SmartClientMedium.__init__(self, base)
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
3431.3.11 by Andrew Bennetts
Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.
211
class Test_ClientMedium_remote_path_from_transport(tests.TestCase):
212
    """Tests for the behaviour of client_medium.remote_path_from_transport."""
3313.3.3 by Andrew Bennetts
Add tests for _SmartClient.remote_path_for_transport.
213
214
    def assertRemotePath(self, expected, client_base, transport_base):
3431.3.11 by Andrew Bennetts
Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.
215
        """Assert that the result of
216
        SmartClientMedium.remote_path_from_transport is the expected value for
217
        a given client_base and transport_base.
3313.3.3 by Andrew Bennetts
Add tests for _SmartClient.remote_path_for_transport.
218
        """
3431.3.11 by Andrew Bennetts
Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.
219
        client_medium = medium.SmartClientMedium(client_base)
3313.3.3 by Andrew Bennetts
Add tests for _SmartClient.remote_path_for_transport.
220
        transport = get_transport(transport_base)
3431.3.11 by Andrew Bennetts
Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.
221
        result = client_medium.remote_path_from_transport(transport)
3313.3.3 by Andrew Bennetts
Add tests for _SmartClient.remote_path_for_transport.
222
        self.assertEqual(expected, result)
3431.3.11 by Andrew Bennetts
Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.
223
3313.3.3 by Andrew Bennetts
Add tests for _SmartClient.remote_path_for_transport.
224
    def test_remote_path_from_transport(self):
3431.3.11 by Andrew Bennetts
Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.
225
        """SmartClientMedium.remote_path_from_transport calculates a URL for
226
        the given transport relative to the root of the client base URL.
3313.3.3 by Andrew Bennetts
Add tests for _SmartClient.remote_path_for_transport.
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
3431.3.11 by Andrew Bennetts
Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.
232
    def assertRemotePathHTTP(self, expected, transport_base, relpath):
233
        """Assert that the result of
234
        HttpTransportBase.remote_path_from_transport is the expected value for
235
        a given transport_base and relpath of that transport.  (Note that
236
        HttpTransportBase is a subclass of SmartClientMedium)
237
        """
238
        base_transport = get_transport(transport_base)
239
        client_medium = base_transport.get_smart_medium()
240
        cloned_transport = base_transport.clone(relpath)
241
        result = client_medium.remote_path_from_transport(cloned_transport)
242
        self.assertEqual(expected, result)
243
        
3313.3.3 by Andrew Bennetts
Add tests for _SmartClient.remote_path_for_transport.
244
    def test_remote_path_from_transport_http(self):
245
        """Remote paths for HTTP transports are calculated differently to other
246
        transports.  They are just relative to the client base, not the root
247
        directory of the host.
248
        """
249
        for scheme in ['http:', 'https:', 'bzr+http:', 'bzr+https:']:
3431.3.11 by Andrew Bennetts
Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.
250
            self.assertRemotePathHTTP(
251
                '../xyz/', scheme + '//host/path', '../xyz/')
252
            self.assertRemotePathHTTP(
253
                'xyz/', scheme + '//host/path', 'xyz/')
3313.3.3 by Andrew Bennetts
Add tests for _SmartClient.remote_path_for_transport.
254
255
3453.4.1 by Andrew Bennetts
Better infrastructure on SmartClientMedium for tracking the remote version.
256
class Test_ClientMedium_remote_is_at_least(tests.TestCase):
257
    """Tests for the behaviour of client_medium.remote_is_at_least."""
258
259
    def test_initially_unlimited(self):
260
        """A fresh medium assumes that the remote side supports all
261
        versions.
262
        """
263
        client_medium = medium.SmartClientMedium('dummy base')
264
        self.assertTrue(client_medium._is_remote_at_least((99, 99)))
265
    
266
    def test__remote_is_not(self):
267
        """Calling _remote_is_not ratchets down the known remote version."""
268
        client_medium = medium.SmartClientMedium('dummy base')
269
        # Mark the remote side as being less than 1.6.  The remote side may
270
        # still be 1.5.
271
        client_medium._remote_is_not((1, 6))
272
        self.assertFalse(client_medium._is_remote_at_least((1, 6)))
273
        self.assertTrue(client_medium._is_remote_at_least((1, 5)))
274
        # Calling _remote_is_not again with a lower value works.
275
        client_medium._remote_is_not((1, 5))
276
        self.assertFalse(client_medium._is_remote_at_least((1, 5)))
277
        # You cannot call _remote_is_not with a larger value.
278
        self.assertRaises(
279
            AssertionError, client_medium._remote_is_not, (1, 9))
280
281
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
282
class TestBzrDirOpenBranch(tests.TestCase):
283
284
    def test_branch_present(self):
285
        transport = MemoryTransport()
286
        transport.mkdir('quack')
287
        transport = transport.clone('quack')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
288
        client = FakeClient(transport.base)
289
        client.add_success_response('ok', '')
290
        client.add_success_response('ok', '', 'no', 'no', 'no')
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
291
        bzrdir = RemoteBzrDir(transport, _client=client)
292
        result = bzrdir.open_branch()
293
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
294
            [('call', 'BzrDir.open_branch', ('quack/',)),
3221.3.3 by Robert Collins
* Hook up the new remote method ``RemoteBzrDir.find_repositoryV2`` so
295
             ('call', 'BzrDir.find_repositoryV2', ('quack/',))],
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
296
            client._calls)
297
        self.assertIsInstance(result, RemoteBranch)
298
        self.assertEqual(bzrdir, result.bzrdir)
299
300
    def test_branch_missing(self):
301
        transport = MemoryTransport()
302
        transport.mkdir('quack')
303
        transport = transport.clone('quack')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
304
        client = FakeClient(transport.base)
305
        client.add_error_response('nobranch')
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
306
        bzrdir = RemoteBzrDir(transport, _client=client)
307
        self.assertRaises(errors.NotBranchError, bzrdir.open_branch)
308
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
309
            [('call', 'BzrDir.open_branch', ('quack/',))],
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
310
            client._calls)
311
3211.4.1 by Robert Collins
* ``RemoteBzrDir._get_tree_branch`` no longer triggers ``_ensure_real``,
312
    def test__get_tree_branch(self):
313
        # _get_tree_branch is a form of open_branch, but it should only ask for
314
        # branch opening, not any other network requests.
315
        calls = []
316
        def open_branch():
317
            calls.append("Called")
318
            return "a-branch"
319
        transport = MemoryTransport()
320
        # 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.
321
        client = FakeClient(transport.base)
3211.4.1 by Robert Collins
* ``RemoteBzrDir._get_tree_branch`` no longer triggers ``_ensure_real``,
322
        bzrdir = RemoteBzrDir(transport, _client=client)
323
        # patch the open_branch call to record that it was called.
324
        bzrdir.open_branch = open_branch
325
        self.assertEqual((None, "a-branch"), bzrdir._get_tree_branch())
326
        self.assertEqual(["Called"], calls)
327
        self.assertEqual([], client._calls)
328
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.
329
    def test_url_quoting_of_path(self):
330
        # Relpaths on the wire should not be URL-escaped.  So "~" should be
331
        # transmitted as "~", not "%7E".
3431.3.1 by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.
332
        transport = RemoteTCPTransport('bzr://localhost/~hello/')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
333
        client = FakeClient(transport.base)
334
        client.add_success_response('ok', '')
335
        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.
336
        bzrdir = RemoteBzrDir(transport, _client=client)
337
        result = bzrdir.open_branch()
338
        self.assertEqual(
339
            [('call', 'BzrDir.open_branch', ('~hello/',)),
3221.3.3 by Robert Collins
* Hook up the new remote method ``RemoteBzrDir.find_repositoryV2`` so
340
             ('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.
341
            client._calls)
342
3221.3.3 by Robert Collins
* Hook up the new remote method ``RemoteBzrDir.find_repositoryV2`` so
343
    def check_open_repository(self, rich_root, subtrees, external_lookup='no'):
3104.4.2 by Andrew Bennetts
All tests passing.
344
        transport = MemoryTransport()
345
        transport.mkdir('quack')
346
        transport = transport.clone('quack')
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
347
        if rich_root:
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
348
            rich_response = 'yes'
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
349
        else:
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
350
            rich_response = 'no'
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
351
        if subtrees:
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
352
            subtree_response = 'yes'
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
353
        else:
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
354
            subtree_response = 'no'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
355
        client = FakeClient(transport.base)
356
        client.add_success_response(
357
            '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.
358
        bzrdir = RemoteBzrDir(transport, _client=client)
359
        result = bzrdir.open_repository()
360
        self.assertEqual(
3221.3.3 by Robert Collins
* Hook up the new remote method ``RemoteBzrDir.find_repositoryV2`` so
361
            [('call', 'BzrDir.find_repositoryV2', ('quack/',))],
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
362
            client._calls)
363
        self.assertIsInstance(result, RemoteRepository)
364
        self.assertEqual(bzrdir, result.bzrdir)
365
        self.assertEqual(rich_root, result._format.rich_root_data)
2018.5.138 by Robert Collins
Merge bzr.dev.
366
        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.
367
368
    def test_open_repository_sets_format_attributes(self):
369
        self.check_open_repository(True, True)
370
        self.check_open_repository(False, True)
371
        self.check_open_repository(True, False)
372
        self.check_open_repository(False, False)
3221.3.3 by Robert Collins
* Hook up the new remote method ``RemoteBzrDir.find_repositoryV2`` so
373
        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.
374
2432.3.2 by Andrew Bennetts
Add test, and tidy implementation.
375
    def test_old_server(self):
376
        """RemoteBzrDirFormat should fail to probe if the server version is too
377
        old.
378
        """
379
        self.assertRaises(errors.NotBranchError,
380
            RemoteBzrDirFormat.probe_transport, OldServerTransport())
381
382
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.
383
class TestBzrDirOpenRepository(tests.TestCase):
384
385
    def test_backwards_compat_1_2(self):
386
        transport = MemoryTransport()
387
        transport.mkdir('quack')
388
        transport = transport.clone('quack')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
389
        client = FakeClient(transport.base)
390
        client.add_unknown_method_response('RemoteRepository.find_repositoryV2')
391
        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.
392
        bzrdir = RemoteBzrDir(transport, _client=client)
393
        repo = bzrdir.open_repository()
394
        self.assertEqual(
395
            [('call', 'BzrDir.find_repositoryV2', ('quack/',)),
396
             ('call', 'BzrDir.find_repository', ('quack/',))],
397
            client._calls)
398
399
2432.3.2 by Andrew Bennetts
Add test, and tidy implementation.
400
class OldSmartClient(object):
401
    """A fake smart client for test_old_version that just returns a version one
402
    response to the 'hello' (query version) command.
403
    """
404
405
    def get_request(self):
406
        input_file = StringIO('ok\x011\n')
407
        output_file = StringIO()
408
        client_medium = medium.SmartSimplePipesClientMedium(
409
            input_file, output_file)
410
        return medium.SmartClientStreamMediumRequest(client_medium)
411
3241.1.1 by Andrew Bennetts
Shift protocol version querying from RemoteBzrDirFormat into SmartClientMedium.
412
    def protocol_version(self):
413
        return 1
414
2432.3.2 by Andrew Bennetts
Add test, and tidy implementation.
415
416
class OldServerTransport(object):
417
    """A fake transport for test_old_server that reports it's smart server
418
    protocol version as version one.
419
    """
420
421
    def __init__(self):
422
        self.base = 'fake:'
423
424
    def get_smart_client(self):
425
        return OldSmartClient()
426
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
427
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
428
class TestBranchLastRevisionInfo(tests.TestCase):
429
430
    def test_empty_branch(self):
431
        # in an empty branch we decode the response properly
432
        transport = MemoryTransport()
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
433
        client = FakeClient(transport.base)
434
        client.add_success_response('ok', '0', 'null:')
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
435
        transport.mkdir('quack')
436
        transport = transport.clone('quack')
437
        # we do not want bzrdir to make any remote calls
438
        bzrdir = RemoteBzrDir(transport, _client=False)
439
        branch = RemoteBranch(bzrdir, None, _client=client)
440
        result = branch.last_revision_info()
441
442
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
443
            [('call', 'Branch.last_revision_info', ('quack/',))],
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
444
            client._calls)
445
        self.assertEqual((0, NULL_REVISION), result)
446
447
    def test_non_empty_branch(self):
448
        # 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.
449
        revid = u'\xc8'.encode('utf8')
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
450
        transport = MemoryTransport()
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
451
        client = FakeClient(transport.base)
452
        client.add_success_response('ok', '2', revid)
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
453
        transport.mkdir('kwaak')
454
        transport = transport.clone('kwaak')
455
        # we do not want bzrdir to make any remote calls
456
        bzrdir = RemoteBzrDir(transport, _client=False)
457
        branch = RemoteBranch(bzrdir, None, _client=client)
458
        result = branch.last_revision_info()
459
460
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
461
            [('call', 'Branch.last_revision_info', ('kwaak/',))],
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
462
            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.
463
        self.assertEqual((2, revid), result)
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
464
465
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
466
class TestBranchSetLastRevision(tests.TestCase):
467
468
    def test_set_empty(self):
469
        # set_revision_history([]) is translated to calling
470
        # Branch.set_last_revision(path, '') on the wire.
3104.4.2 by Andrew Bennetts
All tests passing.
471
        transport = MemoryTransport()
472
        transport.mkdir('branch')
473
        transport = transport.clone('branch')
474
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
475
        client = FakeClient(transport.base)
476
        # lock_write
477
        client.add_success_response('ok', 'branch token', 'repo token')
478
        # set_last_revision
479
        client.add_success_response('ok')
480
        # unlock
481
        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.
482
        bzrdir = RemoteBzrDir(transport, _client=False)
483
        branch = RemoteBranch(bzrdir, None, _client=client)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
484
        # This is a hack to work around the problem that RemoteBranch currently
485
        # unnecessarily invokes _ensure_real upon a call to lock_write.
486
        branch._ensure_real = lambda: None
487
        branch.lock_write()
488
        client._calls = []
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
489
        result = branch.set_revision_history([])
490
        self.assertEqual(
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
491
            [('call', 'Branch.set_last_revision',
3104.4.2 by Andrew Bennetts
All tests passing.
492
                ('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.
493
            client._calls)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
494
        branch.unlock()
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
495
        self.assertEqual(None, result)
496
497
    def test_set_nonempty(self):
498
        # set_revision_history([rev-id1, ..., rev-idN]) is translated to calling
499
        # Branch.set_last_revision(path, rev-idN) on the wire.
3104.4.2 by Andrew Bennetts
All tests passing.
500
        transport = MemoryTransport()
501
        transport.mkdir('branch')
502
        transport = transport.clone('branch')
503
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
504
        client = FakeClient(transport.base)
505
        # lock_write
506
        client.add_success_response('ok', 'branch token', 'repo token')
507
        # set_last_revision
508
        client.add_success_response('ok')
509
        # unlock
510
        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.
511
        bzrdir = RemoteBzrDir(transport, _client=False)
512
        branch = RemoteBranch(bzrdir, None, _client=client)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
513
        # This is a hack to work around the problem that RemoteBranch currently
514
        # unnecessarily invokes _ensure_real upon a call to lock_write.
515
        branch._ensure_real = lambda: None
516
        # Lock the branch, reset the record of remote calls.
517
        branch.lock_write()
518
        client._calls = []
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
519
520
        result = branch.set_revision_history(['rev-id1', 'rev-id2'])
521
        self.assertEqual(
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
522
            [('call', 'Branch.set_last_revision',
3104.4.2 by Andrew Bennetts
All tests passing.
523
                ('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.
524
            client._calls)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
525
        branch.unlock()
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
526
        self.assertEqual(None, result)
527
528
    def test_no_such_revision(self):
529
        transport = MemoryTransport()
530
        transport.mkdir('branch')
531
        transport = transport.clone('branch')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
532
        # A response of 'NoSuchRevision' is translated into an exception.
533
        client = FakeClient(transport.base)
534
        # lock_write
535
        client.add_success_response('ok', 'branch token', 'repo token')
536
        # set_last_revision
537
        client.add_error_response('NoSuchRevision', 'rev-id')
538
        # unlock
539
        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.
540
541
        bzrdir = RemoteBzrDir(transport, _client=False)
542
        branch = RemoteBranch(bzrdir, None, _client=client)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
543
        branch._ensure_real = lambda: None
544
        branch.lock_write()
545
        client._calls = []
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
546
547
        self.assertRaises(
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
548
            errors.NoSuchRevision, branch.set_revision_history, ['rev-id'])
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
549
        branch.unlock()
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
550
551
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
552
class TestBranchSetLastRevisionInfo(tests.TestCase):
553
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
554
    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.
555
        # set_last_revision_info(num, 'rev-id') is translated to calling
556
        # 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'.
557
        transport = MemoryTransport()
558
        transport.mkdir('branch')
559
        transport = transport.clone('branch')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
560
        client = FakeClient(transport.base)
561
        # lock_write
562
        client.add_success_response('ok', 'branch token', 'repo token')
563
        # set_last_revision
564
        client.add_success_response('ok')
565
        # unlock
566
        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.
567
568
        bzrdir = RemoteBzrDir(transport, _client=False)
569
        branch = RemoteBranch(bzrdir, None, _client=client)
570
        # This is a hack to work around the problem that RemoteBranch currently
571
        # unnecessarily invokes _ensure_real upon a call to lock_write.
572
        branch._ensure_real = lambda: None
573
        # Lock the branch, reset the record of remote calls.
574
        branch.lock_write()
575
        client._calls = []
576
        result = branch.set_last_revision_info(1234, 'a-revision-id')
577
        self.assertEqual(
578
            [('call', 'Branch.set_last_revision_info',
3297.4.1 by Andrew Bennetts
Merge 'Add Branch.set_last_revision_info smart method'.
579
                ('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.
580
                 '1234', 'a-revision-id'))],
581
            client._calls)
582
        self.assertEqual(None, result)
583
584
    def test_no_such_revision(self):
585
        # A response of 'NoSuchRevision' is translated into an exception.
586
        transport = MemoryTransport()
587
        transport.mkdir('branch')
588
        transport = transport.clone('branch')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
589
        client = FakeClient(transport.base)
590
        # lock_write
591
        client.add_success_response('ok', 'branch token', 'repo token')
592
        # set_last_revision
593
        client.add_error_response('NoSuchRevision', 'revid')
594
        # unlock
595
        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.
596
597
        bzrdir = RemoteBzrDir(transport, _client=False)
598
        branch = RemoteBranch(bzrdir, None, _client=client)
599
        # This is a hack to work around the problem that RemoteBranch currently
600
        # unnecessarily invokes _ensure_real upon a call to lock_write.
601
        branch._ensure_real = lambda: None
602
        # Lock the branch, reset the record of remote calls.
603
        branch.lock_write()
604
        client._calls = []
605
606
        self.assertRaises(
607
            errors.NoSuchRevision, branch.set_last_revision_info, 123, 'revid')
608
        branch.unlock()
609
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
610
    def lock_remote_branch(self, branch):
611
        """Trick a RemoteBranch into thinking it is locked."""
612
        branch._lock_mode = 'w'
613
        branch._lock_count = 2
614
        branch._lock_token = 'branch token'
615
        branch._repo_lock_token = 'repo token'
616
617
    def test_backwards_compatibility(self):
618
        """If the server does not support the Branch.set_last_revision_info
619
        verb (which is new in 1.4), then the client falls back to VFS methods.
620
        """
621
        # This test is a little messy.  Unlike most tests in this file, it
622
        # doesn't purely test what a Remote* object sends over the wire, and
623
        # how it reacts to responses from the wire.  It instead relies partly
624
        # on asserting that the RemoteBranch will call
625
        # self._real_branch.set_last_revision_info(...).
626
627
        # First, set up our RemoteBranch with a FakeClient that raises
628
        # UnknownSmartMethod, and a StubRealBranch that logs how it is called.
629
        transport = MemoryTransport()
630
        transport.mkdir('branch')
631
        transport = transport.clone('branch')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
632
        client = FakeClient(transport.base)
633
        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.
634
        bzrdir = RemoteBzrDir(transport, _client=False)
635
        branch = RemoteBranch(bzrdir, None, _client=client)
636
        class StubRealBranch(object):
637
            def __init__(self):
638
                self.calls = []
639
            def set_last_revision_info(self, revno, revision_id):
640
                self.calls.append(
641
                    ('set_last_revision_info', revno, revision_id))
642
        real_branch = StubRealBranch()
643
        branch._real_branch = real_branch
644
        self.lock_remote_branch(branch)
645
646
        # Call set_last_revision_info, and verify it behaved as expected.
647
        result = branch.set_last_revision_info(1234, 'a-revision-id')
648
        self.assertEqual(
649
            [('call', 'Branch.set_last_revision_info',
650
                ('branch/', 'branch token', 'repo token',
651
                 '1234', 'a-revision-id')),],
652
            client._calls)
653
        self.assertEqual(
654
            [('set_last_revision_info', 1234, 'a-revision-id')],
655
            real_branch.calls)
656
3245.4.53 by Andrew Bennetts
Add some missing 'raise' statements to test_remote.
657
    def test_unexpected_error(self):
658
        # A response of 'NoSuchRevision' is translated into an exception.
659
        transport = MemoryTransport()
660
        transport.mkdir('branch')
661
        transport = transport.clone('branch')
662
        client = FakeClient(transport.base)
663
        # lock_write
664
        client.add_success_response('ok', 'branch token', 'repo token')
665
        # set_last_revision
666
        client.add_error_response('UnexpectedError')
667
        # unlock
668
        client.add_success_response('ok')
669
670
        bzrdir = RemoteBzrDir(transport, _client=False)
671
        branch = RemoteBranch(bzrdir, None, _client=client)
672
        # This is a hack to work around the problem that RemoteBranch currently
673
        # unnecessarily invokes _ensure_real upon a call to lock_write.
674
        branch._ensure_real = lambda: None
675
        # Lock the branch, reset the record of remote calls.
676
        branch.lock_write()
677
        client._calls = []
678
679
        err = self.assertRaises(
680
            errors.ErrorFromSmartServer,
681
            branch.set_last_revision_info, 123, 'revid')
682
        self.assertEqual(('UnexpectedError',), err.error_tuple)
683
        branch.unlock()
684
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
685
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.
686
class TestBranchControlGetBranchConf(tests.TestCaseWithMemoryTransport):
3408.3.1 by Martin Pool
Remove erroneous handling of branch.conf for RemoteBranch
687
    """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).
688
    """
689
690
    def test_get_branch_conf(self):
3408.3.1 by Martin Pool
Remove erroneous handling of branch.conf for RemoteBranch
691
        raise tests.KnownFailure('branch.conf is not retrieved by get_config_file')
3407.2.10 by Martin Pool
Merge trunk
692
        ## # We should see that branch.get_config() does a single rpc to get the
693
        ## # remote configuration file, abstracting away where that is stored on
694
        ## # the server.  However at the moment it always falls back to using the
695
        ## # vfs, and this would need some changes in config.py.
3408.3.1 by Martin Pool
Remove erroneous handling of branch.conf for RemoteBranch
696
3407.2.10 by Martin Pool
Merge trunk
697
        ## # in an empty branch we decode the response properly
698
        ## client = FakeClient([(('ok', ), '# config file body')], self.get_url())
699
        ## # we need to make a real branch because the remote_branch.control_files
700
        ## # will trigger _ensure_real.
701
        ## branch = self.make_branch('quack')
702
        ## transport = branch.bzrdir.root_transport
703
        ## # we do not want bzrdir to make any remote calls
704
        ## bzrdir = RemoteBzrDir(transport, _client=False)
705
        ## branch = RemoteBranch(bzrdir, None, _client=client)
706
        ## config = branch.get_config()
707
        ## self.assertEqual(
708
        ##     [('call_expecting_body', 'Branch.get_config_file', ('quack/',))],
709
        ##     client._calls)
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
710
711
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.
712
class TestBranchLockWrite(tests.TestCase):
713
714
    def test_lock_write_unlockable(self):
715
        transport = MemoryTransport()
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
716
        client = FakeClient(transport.base)
717
        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.
718
        transport.mkdir('quack')
719
        transport = transport.clone('quack')
720
        # we do not want bzrdir to make any remote calls
721
        bzrdir = RemoteBzrDir(transport, _client=False)
722
        branch = RemoteBranch(bzrdir, None, _client=client)
723
        self.assertRaises(errors.UnlockableTransport, branch.lock_write)
724
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
725
            [('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.
726
            client._calls)
727
728
2466.2.2 by Andrew Bennetts
Add tests for RemoteTransport.is_readonly in the style of the other remote object tests.
729
class TestTransportIsReadonly(tests.TestCase):
730
731
    def test_true(self):
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
732
        client = FakeClient()
733
        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.
734
        transport = RemoteTransport('bzr://example.com/', medium=False,
735
                                    _client=client)
736
        self.assertEqual(True, transport.is_readonly())
737
        self.assertEqual(
738
            [('call', 'Transport.is_readonly', ())],
739
            client._calls)
740
741
    def test_false(self):
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
742
        client = FakeClient()
743
        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.
744
        transport = RemoteTransport('bzr://example.com/', medium=False,
745
                                    _client=client)
746
        self.assertEqual(False, transport.is_readonly())
747
        self.assertEqual(
748
            [('call', 'Transport.is_readonly', ())],
749
            client._calls)
750
751
    def test_error_from_old_server(self):
752
        """bzr 0.15 and earlier servers don't recognise the is_readonly verb.
753
        
754
        Clients should treat it as a "no" response, because is_readonly is only
755
        advisory anyway (a transport could be read-write, but then the
756
        underlying filesystem could be readonly anyway).
757
        """
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
758
        client = FakeClient()
759
        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.
760
        transport = RemoteTransport('bzr://example.com/', medium=False,
761
                                    _client=client)
762
        self.assertEqual(False, transport.is_readonly())
763
        self.assertEqual(
764
            [('call', 'Transport.is_readonly', ())],
765
            client._calls)
766
2466.2.2 by Andrew Bennetts
Add tests for RemoteTransport.is_readonly in the style of the other remote object tests.
767
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
768
class TestRemoteRepository(tests.TestCase):
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
769
    """Base for testing RemoteRepository protocol usage.
770
    
771
    These tests contain frozen requests and responses.  We want any changes to 
772
    what is sent or expected to be require a thoughtful update to these tests
773
    because they might break compatibility with different-versioned servers.
774
    """
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
775
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
776
    def setup_fake_client_and_repository(self, transport_path):
2018.18.7 by Martin Pool
(broken) Start addng client proxy test for Repository.tarball
777
        """Create the fake client and repository for testing with.
778
        
779
        There's no real server here; we just have canned responses sent
780
        back one by one.
781
        
782
        :param transport_path: Path below the root of the MemoryTransport
783
            where the repository will be created.
784
        """
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
785
        transport = MemoryTransport()
786
        transport.mkdir(transport_path)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
787
        client = FakeClient(transport.base)
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
788
        transport = transport.clone(transport_path)
789
        # we do not want bzrdir to make any remote calls
790
        bzrdir = RemoteBzrDir(transport, _client=False)
791
        repo = RemoteRepository(bzrdir, None, _client=client)
792
        return repo, client
793
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
794
2018.12.2 by Andrew Bennetts
Remove some duplicate code in test_remote
795
class TestRepositoryGatherStats(TestRemoteRepository):
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
796
797
    def test_revid_none(self):
798
        # ('ok',), body with revisions and size
799
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
800
        repo, client = self.setup_fake_client_and_repository(transport_path)
801
        client.add_success_response_with_body(
802
            'revisions: 2\nsize: 18\n', 'ok')
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
803
        result = repo.gather_stats(None)
804
        self.assertEqual(
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
805
            [('call_expecting_body', 'Repository.gather_stats',
3104.4.2 by Andrew Bennetts
All tests passing.
806
             ('quack/','','no'))],
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
807
            client._calls)
808
        self.assertEqual({'revisions': 2, 'size': 18}, result)
809
810
    def test_revid_no_committers(self):
811
        # ('ok',), body without committers
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
812
        body = ('firstrev: 123456.300 3600\n'
813
                'latestrev: 654231.400 0\n'
814
                'revisions: 2\n'
815
                'size: 18\n')
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
816
        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.
817
        revid = u'\xc8'.encode('utf8')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
818
        repo, client = self.setup_fake_client_and_repository(transport_path)
819
        client.add_success_response_with_body(body, 'ok')
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
820
        result = repo.gather_stats(revid)
821
        self.assertEqual(
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
822
            [('call_expecting_body', 'Repository.gather_stats',
3104.4.2 by Andrew Bennetts
All tests passing.
823
              ('quick/', revid, 'no'))],
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
824
            client._calls)
825
        self.assertEqual({'revisions': 2, 'size': 18,
826
                          'firstrev': (123456.300, 3600),
827
                          'latestrev': (654231.400, 0),},
828
                         result)
829
830
    def test_revid_with_committers(self):
831
        # ('ok',), body with committers
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
832
        body = ('committers: 128\n'
833
                'firstrev: 123456.300 3600\n'
834
                'latestrev: 654231.400 0\n'
835
                'revisions: 2\n'
836
                'size: 18\n')
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
837
        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.
838
        revid = u'\xc8'.encode('utf8')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
839
        repo, client = self.setup_fake_client_and_repository(transport_path)
840
        client.add_success_response_with_body(body, 'ok')
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
841
        result = repo.gather_stats(revid, True)
842
        self.assertEqual(
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
843
            [('call_expecting_body', 'Repository.gather_stats',
3104.4.2 by Andrew Bennetts
All tests passing.
844
              ('buick/', revid, 'yes'))],
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
845
            client._calls)
846
        self.assertEqual({'revisions': 2, 'size': 18,
847
                          'committers': 128,
848
                          'firstrev': (123456.300, 3600),
849
                          'latestrev': (654231.400, 0),},
850
                         result)
851
852
3172.5.4 by Robert Collins
Implement get_parent_map for RemoteRepository with caching, based on get_revision_graph.
853
class TestRepositoryGetGraph(TestRemoteRepository):
854
855
    def test_get_graph(self):
3172.5.8 by Robert Collins
Review feedback.
856
        # get_graph returns a graph with the repository as the
857
        # parents_provider.
3172.5.4 by Robert Collins
Implement get_parent_map for RemoteRepository with caching, based on get_revision_graph.
858
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
859
        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.
860
        graph = repo.get_graph()
861
        self.assertEqual(graph._parents_provider, repo)
862
863
864
class TestRepositoryGetParentMap(TestRemoteRepository):
865
866
    def test_get_parent_map_caching(self):
867
        # get_parent_map returns from cache until unlock()
868
        # setup a reponse with two revisions
869
        r1 = u'\u0e33'.encode('utf8')
870
        r2 = u'\u0dab'.encode('utf8')
871
        lines = [' '.join([r2, r1]), r1]
3211.5.2 by Robert Collins
Change RemoteRepository.get_parent_map to use bz2 not gzip for compression.
872
        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.
873
874
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
875
        repo, client = self.setup_fake_client_and_repository(transport_path)
876
        client.add_success_response_with_body(encoded_body, 'ok')
877
        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.
878
        repo.lock_read()
879
        graph = repo.get_graph()
880
        parents = graph.get_parent_map([r2])
881
        self.assertEqual({r2: (r1,)}, parents)
882
        # locking and unlocking deeper should not reset
883
        repo.lock_read()
884
        repo.unlock()
885
        parents = graph.get_parent_map([r1])
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
886
        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.
887
        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.
888
            [('call_with_body_bytes_expecting_body',
889
              '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.
890
            client._calls)
891
        repo.unlock()
892
        # now we call again, and it should use the second response.
893
        repo.lock_read()
894
        graph = repo.get_graph()
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
895
        parents = graph.get_parent_map([r1])
896
        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.
897
        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.
898
            [('call_with_body_bytes_expecting_body',
899
              'Repository.get_parent_map', ('quack/', r2), '\n\n0'),
900
             ('call_with_body_bytes_expecting_body',
901
              '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.
902
            ],
903
            client._calls)
904
        repo.unlock()
905
3213.1.2 by Andrew Bennetts
Add test for reconnection if get_parent_map is unknown by the server.
906
    def test_get_parent_map_reconnects_if_unknown_method(self):
907
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
908
        repo, client = self.setup_fake_client_and_repository(transport_path)
909
        client.add_unknown_method_response('Repository,get_parent_map')
910
        client.add_success_response_with_body('', 'ok')
3453.4.1 by Andrew Bennetts
Better infrastructure on SmartClientMedium for tracking the remote version.
911
        self.assertTrue(client._medium._is_remote_at_least((1, 2)))
3213.1.2 by Andrew Bennetts
Add test for reconnection if get_parent_map is unknown by the server.
912
        rev_id = 'revision-id'
3297.3.5 by Andrew Bennetts
Suppress a deprecation warning.
913
        expected_deprecations = [
914
            'bzrlib.remote.RemoteRepository.get_revision_graph was deprecated '
915
            'in version 1.4.']
916
        parents = self.callDeprecated(
917
            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.
918
        self.assertEqual(
3213.1.8 by Andrew Bennetts
Merge from bzr.dev.
919
            [('call_with_body_bytes_expecting_body',
920
              '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.
921
             ('disconnect medium',),
922
             ('call_expecting_body', 'Repository.get_revision_graph',
923
              ('quack/', ''))],
924
            client._calls)
3389.1.2 by Andrew Bennetts
Add test for the bug John found.
925
        # The medium is now marked as being connected to an older server
3453.4.1 by Andrew Bennetts
Better infrastructure on SmartClientMedium for tracking the remote version.
926
        self.assertFalse(client._medium._is_remote_at_least((1, 2)))
3389.1.2 by Andrew Bennetts
Add test for the bug John found.
927
928
    def test_get_parent_map_fallback_parentless_node(self):
929
        """get_parent_map falls back to get_revision_graph on old servers.  The
930
        results from get_revision_graph are tweaked to match the get_parent_map
931
        API.
932
3389.1.3 by Andrew Bennetts
Remove XXX from test description.
933
        Specifically, a {key: ()} result from get_revision_graph means "no
3389.1.2 by Andrew Bennetts
Add test for the bug John found.
934
        parents" for that key, which in get_parent_map results should be
3389.1.3 by Andrew Bennetts
Remove XXX from test description.
935
        represented as {key: ('null:',)}.
3389.1.2 by Andrew Bennetts
Add test for the bug John found.
936
937
        This is the test for https://bugs.launchpad.net/bzr/+bug/214894
938
        """
939
        rev_id = 'revision-id'
940
        transport_path = 'quack'
3245.4.40 by Andrew Bennetts
Merge from bzr.dev.
941
        repo, client = self.setup_fake_client_and_repository(transport_path)
942
        client.add_success_response_with_body(rev_id, 'ok')
3453.4.1 by Andrew Bennetts
Better infrastructure on SmartClientMedium for tracking the remote version.
943
        client._medium._remote_is_not((1, 2))
3389.1.2 by Andrew Bennetts
Add test for the bug John found.
944
        expected_deprecations = [
945
            'bzrlib.remote.RemoteRepository.get_revision_graph was deprecated '
946
            'in version 1.4.']
947
        parents = self.callDeprecated(
948
            expected_deprecations, repo.get_parent_map, [rev_id])
949
        self.assertEqual(
950
            [('call_expecting_body', 'Repository.get_revision_graph',
951
             ('quack/', ''))],
952
            client._calls)
953
        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.
954
3297.2.3 by Andrew Bennetts
Test the code path that the typo is on.
955
    def test_get_parent_map_unexpected_response(self):
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
956
        repo, client = self.setup_fake_client_and_repository('path')
957
        client.add_success_response('something unexpected!')
3297.2.3 by Andrew Bennetts
Test the code path that the typo is on.
958
        self.assertRaises(
959
            errors.UnexpectedSmartServerResponse,
960
            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.
961
3172.5.4 by Robert Collins
Implement get_parent_map for RemoteRepository with caching, based on get_revision_graph.
962
2018.5.68 by Wouter van Heyst
Merge RemoteRepository.gather_stats.
963
class TestRepositoryGetRevisionGraph(TestRemoteRepository):
964
    
965
    def test_null_revision(self):
966
        # a null revision has the predictable result {}, we should have no wire
967
        # traffic when calling it with this argument
968
        transport_path = 'empty'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
969
        repo, client = self.setup_fake_client_and_repository(transport_path)
970
        client.add_success_response('notused')
3287.6.4 by Robert Collins
Fix up deprecation warnings for get_revision_graph.
971
        result = self.applyDeprecated(one_four, repo.get_revision_graph,
972
            NULL_REVISION)
2018.5.68 by Wouter van Heyst
Merge RemoteRepository.gather_stats.
973
        self.assertEqual([], client._calls)
974
        self.assertEqual({}, result)
975
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
976
    def test_none_revision(self):
977
        # 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.
978
        r1 = u'\u0e33'.encode('utf8')
979
        r2 = u'\u0dab'.encode('utf8')
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
980
        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.
981
        encoded_body = '\n'.join(lines)
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
982
983
        transport_path = 'sinhala'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
984
        repo, client = self.setup_fake_client_and_repository(transport_path)
985
        client.add_success_response_with_body(encoded_body, 'ok')
3287.6.4 by Robert Collins
Fix up deprecation warnings for get_revision_graph.
986
        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)
987
        self.assertEqual(
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
988
            [('call_expecting_body', 'Repository.get_revision_graph',
3104.4.2 by Andrew Bennetts
All tests passing.
989
             ('sinhala/', ''))],
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
990
            client._calls)
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
991
        self.assertEqual({r1: (), r2: (r1, )}, result)
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
992
993
    def test_specific_revision(self):
994
        # with a specific revision we want the graph for that
995
        # 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.
996
        r11 = u'\u0e33'.encode('utf8')
997
        r12 = u'\xc9'.encode('utf8')
998
        r2 = u'\u0dab'.encode('utf8')
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
999
        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.
1000
        encoded_body = '\n'.join(lines)
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1001
1002
        transport_path = 'sinhala'
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_with_body(encoded_body, 'ok')
3287.6.4 by Robert Collins
Fix up deprecation warnings for get_revision_graph.
1005
        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)
1006
        self.assertEqual(
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
1007
            [('call_expecting_body', 'Repository.get_revision_graph',
3104.4.2 by Andrew Bennetts
All tests passing.
1008
             ('sinhala/', r2))],
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1009
            client._calls)
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
1010
        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)
1011
1012
    def test_no_such_revision(self):
1013
        revid = '123'
1014
        transport_path = 'sinhala'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1015
        repo, client = self.setup_fake_client_and_repository(transport_path)
1016
        client.add_error_response('nosuchrevision', revid)
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1017
        # 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
1018
        self.assertRaises(errors.NoSuchRevision,
3287.6.4 by Robert Collins
Fix up deprecation warnings for get_revision_graph.
1019
            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)
1020
        self.assertEqual(
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
1021
            [('call_expecting_body', 'Repository.get_revision_graph',
3104.4.2 by Andrew Bennetts
All tests passing.
1022
             ('sinhala/', revid))],
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1023
            client._calls)
1024
3245.4.53 by Andrew Bennetts
Add some missing 'raise' statements to test_remote.
1025
    def test_unexpected_error(self):
1026
        revid = '123'
1027
        transport_path = 'sinhala'
1028
        repo, client = self.setup_fake_client_and_repository(transport_path)
1029
        client.add_error_response('AnUnexpectedError')
1030
        e = self.assertRaises(errors.ErrorFromSmartServer,
1031
            self.applyDeprecated, one_four, repo.get_revision_graph, revid)
1032
        self.assertEqual(('AnUnexpectedError',), e.error_tuple)
1033
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1034
        
1035
class TestRepositoryIsShared(TestRemoteRepository):
1036
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1037
    def test_is_shared(self):
1038
        # ('yes', ) for Repository.is_shared -> 'True'.
1039
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1040
        repo, client = self.setup_fake_client_and_repository(transport_path)
1041
        client.add_success_response('yes')
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1042
        result = repo.is_shared()
1043
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
1044
            [('call', 'Repository.is_shared', ('quack/',))],
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1045
            client._calls)
1046
        self.assertEqual(True, result)
1047
1048
    def test_is_not_shared(self):
1049
        # ('no', ) for Repository.is_shared -> 'False'.
1050
        transport_path = 'qwack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1051
        repo, client = self.setup_fake_client_and_repository(transport_path)
1052
        client.add_success_response('no')
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1053
        result = repo.is_shared()
1054
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
1055
            [('call', 'Repository.is_shared', ('qwack/',))],
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1056
            client._calls)
1057
        self.assertEqual(False, result)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1058
1059
1060
class TestRepositoryLockWrite(TestRemoteRepository):
1061
1062
    def test_lock_write(self):
1063
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1064
        repo, client = self.setup_fake_client_and_repository(transport_path)
1065
        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
1066
        result = repo.lock_write()
1067
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
1068
            [('call', 'Repository.lock_write', ('quack/', ''))],
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1069
            client._calls)
1070
        self.assertEqual('a token', result)
1071
1072
    def test_lock_write_already_locked(self):
1073
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1074
        repo, client = self.setup_fake_client_and_repository(transport_path)
1075
        client.add_error_response('LockContention')
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1076
        self.assertRaises(errors.LockContention, repo.lock_write)
1077
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
1078
            [('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.
1079
            client._calls)
1080
1081
    def test_lock_write_unlockable(self):
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)
1084
        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.
1085
        self.assertRaises(errors.UnlockableTransport, repo.lock_write)
1086
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
1087
            [('call', 'Repository.lock_write', ('quack/', ''))],
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1088
            client._calls)
1089
1090
1091
class TestRepositoryUnlock(TestRemoteRepository):
1092
1093
    def test_unlock(self):
1094
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1095
        repo, client = self.setup_fake_client_and_repository(transport_path)
1096
        client.add_success_response('ok', 'a token')
1097
        client.add_success_response('ok')
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1098
        repo.lock_write()
1099
        repo.unlock()
1100
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
1101
            [('call', 'Repository.lock_write', ('quack/', '')),
1102
             ('call', 'Repository.unlock', ('quack/', 'a token'))],
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1103
            client._calls)
1104
1105
    def test_unlock_wrong_token(self):
1106
        # If somehow the token is wrong, unlock will raise TokenMismatch.
1107
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1108
        repo, client = self.setup_fake_client_and_repository(transport_path)
1109
        client.add_success_response('ok', 'a token')
1110
        client.add_error_response('TokenMismatch')
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1111
        repo.lock_write()
1112
        self.assertRaises(errors.TokenMismatch, repo.unlock)
1113
1114
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1115
class TestRepositoryHasRevision(TestRemoteRepository):
1116
1117
    def test_none(self):
1118
        # repo.has_revision(None) should not cause any traffic.
1119
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1120
        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.
1121
1122
        # The null revision is always there, so has_revision(None) == True.
3172.3.3 by Robert Collins
Missed one occurence of None -> NULL_REVISION.
1123
        self.assertEqual(True, repo.has_revision(NULL_REVISION))
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1124
1125
        # The remote repo shouldn't be accessed.
1126
        self.assertEqual([], client._calls)
2018.18.7 by Martin Pool
(broken) Start addng client proxy test for Repository.tarball
1127
1128
1129
class TestRepositoryTarball(TestRemoteRepository):
1130
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
1131
    # This is a canned tarball reponse we can validate against
2018.18.18 by Martin Pool
reformat
1132
    tarball_content = (
2018.18.23 by Martin Pool
review cleanups
1133
        'QlpoOTFBWSZTWdGkj3wAAWF/k8aQACBIB//A9+8cIX/v33AACEAYABAECEACNz'
1134
        'JqsgJJFPTSnk1A3qh6mTQAAAANPUHkagkSTEkaA09QaNAAAGgAAAcwCYCZGAEY'
1135
        'mJhMJghpiaYBUkKammSHqNMZQ0NABkNAeo0AGneAevnlwQoGzEzNVzaYxp/1Uk'
1136
        'xXzA1CQX0BJMZZLcPBrluJir5SQyijWHYZ6ZUtVqqlYDdB2QoCwa9GyWwGYDMA'
1137
        'OQYhkpLt/OKFnnlT8E0PmO8+ZNSo2WWqeCzGB5fBXZ3IvV7uNJVE7DYnWj6qwB'
1138
        'k5DJDIrQ5OQHHIjkS9KqwG3mc3t+F1+iujb89ufyBNIKCgeZBWrl5cXxbMGoMs'
1139
        'c9JuUkg5YsiVcaZJurc6KLi6yKOkgCUOlIlOpOoXyrTJjK8ZgbklReDdwGmFgt'
1140
        'dkVsAIslSVCd4AtACSLbyhLHryfb14PKegrVDba+U8OL6KQtzdM5HLjAc8/p6n'
1141
        '0lgaWU8skgO7xupPTkyuwheSckejFLK5T4ZOo0Gda9viaIhpD1Qn7JqqlKAJqC'
1142
        'QplPKp2nqBWAfwBGaOwVrz3y1T+UZZNismXHsb2Jq18T+VaD9k4P8DqE3g70qV'
1143
        'JLurpnDI6VS5oqDDPVbtVjMxMxMg4rzQVipn2Bv1fVNK0iq3Gl0hhnnHKm/egy'
1144
        'nWQ7QH/F3JFOFCQ0aSPfA='
1145
        ).decode('base64')
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
1146
2018.18.7 by Martin Pool
(broken) Start addng client proxy test for Repository.tarball
1147
    def test_repository_tarball(self):
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
1148
        # Test that Repository.tarball generates the right operations
2018.18.7 by Martin Pool
(broken) Start addng client proxy test for Repository.tarball
1149
        transport_path = 'repo'
2018.18.14 by Martin Pool
merge hpss again; restore incorrectly removed RemoteRepository.break_lock
1150
        expected_calls = [('call_expecting_body', 'Repository.tarball',
3104.4.2 by Andrew Bennetts
All tests passing.
1151
                           ('repo/', 'bz2',),),
2018.18.7 by Martin Pool
(broken) Start addng client proxy test for Repository.tarball
1152
            ]
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1153
        repo, client = self.setup_fake_client_and_repository(transport_path)
1154
        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
1155
        # Now actually ask for the tarball
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1156
        tarball_file = repo._get_tarball('bz2')
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1157
        try:
1158
            self.assertEqual(expected_calls, client._calls)
1159
            self.assertEqual(self.tarball_content, tarball_file.read())
1160
        finally:
1161
            tarball_file.close()
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
1162
1163
1164
class TestRemoteRepositoryCopyContent(tests.TestCaseWithTransport):
1165
    """RemoteRepository.copy_content_into optimizations"""
1166
2018.18.10 by Martin Pool
copy_content_into from Remote repositories by using temporary directories on both ends.
1167
    def test_copy_content_remote_to_local(self):
1168
        self.transport_server = server.SmartTCPServer_for_testing
1169
        src_repo = self.make_repository('repo1')
1170
        src_repo = repository.Repository.open(self.get_url('repo1'))
1171
        # At the moment the tarball-based copy_content_into can't write back
1172
        # into a smart server.  It would be good if it could upload the
1173
        # tarball; once that works we'd have to create repositories of
1174
        # different formats. -- mbp 20070410
1175
        dest_url = self.get_vfs_only_url('repo2')
1176
        dest_bzrdir = BzrDir.create(dest_url)
1177
        dest_repo = dest_bzrdir.create_repository()
1178
        self.assertFalse(isinstance(dest_repo, RemoteRepository))
1179
        self.assertTrue(isinstance(src_repo, RemoteRepository))
1180
        src_repo.copy_content_into(dest_repo)
2535.3.39 by Andrew Bennetts
Tidy some XXXs.
1181
1182
2535.3.49 by Andrew Bennetts
Rename 'Repository.fetch_revisions' smart request to 'Repository.stream_knit_data_for_revisions'.
1183
class TestRepositoryStreamKnitData(TestRemoteRepository):
2535.3.39 by Andrew Bennetts
Tidy some XXXs.
1184
1185
    def make_pack_file(self, records):
1186
        pack_file = StringIO()
1187
        pack_writer = pack.ContainerWriter(pack_file.write)
1188
        pack_writer.begin()
1189
        for bytes, names in records:
1190
            pack_writer.add_bytes_record(bytes, names)
1191
        pack_writer.end()
1192
        pack_file.seek(0)
1193
        return pack_file
1194
2535.4.2 by Andrew Bennetts
Nasty hackery to make stream_knit_data_for_revisions response use streaming.
1195
    def make_pack_stream(self, records):
2535.4.18 by Andrew Bennetts
Use pack.ContainerSerialiser to remove some nasty cruft.
1196
        pack_serialiser = pack.ContainerSerialiser()
1197
        yield pack_serialiser.begin()
2535.4.2 by Andrew Bennetts
Nasty hackery to make stream_knit_data_for_revisions response use streaming.
1198
        for bytes, names in records:
2535.4.18 by Andrew Bennetts
Use pack.ContainerSerialiser to remove some nasty cruft.
1199
            yield pack_serialiser.bytes_record(bytes, names)
1200
        yield pack_serialiser.end()
2535.4.2 by Andrew Bennetts
Nasty hackery to make stream_knit_data_for_revisions response use streaming.
1201
2535.3.39 by Andrew Bennetts
Tidy some XXXs.
1202
    def test_bad_pack_from_server(self):
2535.3.50 by Andrew Bennetts
Use tuple names in data streams rather than concatenated strings.
1203
        """A response with invalid data (e.g. it has a record with multiple
1204
        names) triggers an exception.
1205
        
1206
        Not all possible errors will be caught at this stage, but obviously
1207
        malformed data should be.
1208
        """
1209
        record = ('bytes', [('name1',), ('name2',)])
2535.4.2 by Andrew Bennetts
Nasty hackery to make stream_knit_data_for_revisions response use streaming.
1210
        pack_stream = self.make_pack_stream([record])
2535.3.39 by Andrew Bennetts
Tidy some XXXs.
1211
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1212
        repo, client = self.setup_fake_client_and_repository(transport_path)
1213
        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
1214
        search = graph.SearchResult(set(['revid']), set(), 1, set(['revid']))
1215
        stream = repo.get_data_stream_for_search(search)
2535.3.39 by Andrew Bennetts
Tidy some XXXs.
1216
        self.assertRaises(errors.SmartProtocolError, list, stream)
1217
    
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
1218
    def test_backwards_compatibility(self):
1219
        """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.
1220
        repo, client = self.setup_fake_client_and_repository('path')
1221
        client.add_unknown_method_response(
1222
            'Repository.stream_revisions_chunked')
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
1223
        self.mock_called = False
1224
        repo._real_repository = MockRealRepository(self)
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
1225
        search = graph.SearchResult(set(['revid']), set(), 1, set(['revid']))
1226
        repo.get_data_stream_for_search(search)
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
1227
        self.assertTrue(self.mock_called)
1228
        self.failIf(client.expecting_body,
1229
            "The protocol has been left in an unclean state that will cause "
1230
            "TooManyConcurrentRequests errors.")
1231
1232
1233
class MockRealRepository(object):
1234
    """Helper class for TestRepositoryStreamKnitData.test_unknown_method."""
1235
1236
    def __init__(self, test):
1237
        self.test = test
1238
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
1239
    def get_data_stream_for_search(self, search):
1240
        self.test.assertEqual(set(['revid']), search.get_keys())
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
1241
        self.test.mock_called = True
1242
1243