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