/brz/remove-bazaar

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