/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
3407.2.2 by Martin Pool
Remove special case in RemoteBranchLockableFiles for branch.conf
1
# Copyright (C) 2006, 2007, 2008 Canonical Ltd
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
"""Tests for remote bzrdir/branch/repo/etc
18
19
These are proxy objects which act on remote objects by sending messages
20
through a smart client.  The proxies are to be created when attempting to open
4032.1.2 by John Arbash Meinel
Track down a few more files that have trailing whitespace.
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 (
3834.3.2 by Andrew Bennetts
Preserve BzrBranch5's _synchronize_history code without affecting Branch or BzrBranch7; add effort test for RemoteBranch.copy_content_into.
30
    bzrdir,
3777.1.3 by Aaron Bentley
Use SSH default username from authentication.conf
31
    config,
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
32
    errors,
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
33
    graph,
2535.3.39 by Andrew Bennetts
Tidy some XXXs.
34
    pack,
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
35
    remote,
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
36
    repository,
4017.3.2 by Robert Collins
Reduce the number of round trips required to create a repository over the network.
37
    smart,
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
38
    tests,
3691.2.4 by Martin Pool
Add FakeRemoteTransport to clarify test_remote
39
    urlutils,
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
40
    )
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
41
from bzrlib.branch import Branch
42
from bzrlib.bzrdir import BzrDir, BzrDirFormat
43
from bzrlib.remote import (
44
    RemoteBranch,
45
    RemoteBzrDir,
46
    RemoteBzrDirFormat,
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
47
    RemoteRepository,
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
48
    )
49
from bzrlib.revision import NULL_REVISION
2432.3.2 by Andrew Bennetts
Add test, and tidy implementation.
50
from bzrlib.smart import server, medium
2018.5.159 by Andrew Bennetts
Rename SmartClient to _SmartClient.
51
from bzrlib.smart.client import _SmartClient
3287.6.4 by Robert Collins
Fix up deprecation warnings for get_revision_graph.
52
from bzrlib.symbol_versioning import one_four
3431.3.11 by Andrew Bennetts
Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.
53
from bzrlib.transport import get_transport, http
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
54
from bzrlib.transport.memory import MemoryTransport
3777.1.3 by Aaron Bentley
Use SSH default username from authentication.conf
55
from bzrlib.transport.remote import (
56
    RemoteTransport,
57
    RemoteSSHTransport,
58
    RemoteTCPTransport,
59
)
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
60
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)
61
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
62
class BasicRemoteObjectTests(tests.TestCaseWithTransport):
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
63
64
    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.
65
        self.transport_server = server.SmartTCPServer_for_testing
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
66
        super(BasicRemoteObjectTests, self).setUp()
67
        self.transport = self.get_transport()
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
68
        # 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
69
        self.local_wt = BzrDir.create_standalone_workingtree('.')
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
70
2018.5.171 by Andrew Bennetts
Disconnect RemoteTransports in some tests to avoid tripping up test_strace with leftover threads from previous tests.
71
    def tearDown(self):
72
        self.transport.disconnect()
73
        tests.TestCaseWithTransport.tearDown(self)
74
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
75
    def test_create_remote_bzrdir(self):
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
76
        b = remote.RemoteBzrDir(self.transport, remote.RemoteBzrDirFormat())
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
77
        self.assertIsInstance(b, BzrDir)
78
79
    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.
80
        # open a standalone branch in the working directory
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
81
        b = remote.RemoteBzrDir(self.transport, remote.RemoteBzrDirFormat())
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
82
        branch = b.open_branch()
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
83
        self.assertIsInstance(branch, Branch)
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
84
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
85
    def test_remote_repository(self):
86
        b = BzrDir.open_from_transport(self.transport)
87
        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.
88
        revid = u'\xc823123123'.encode('utf8')
2018.5.40 by Robert Collins
Implement a remote Repository.has_revision method.
89
        self.assertFalse(repo.has_revision(revid))
90
        self.local_wt.commit(message='test commit', rev_id=revid)
91
        self.assertTrue(repo.has_revision(revid))
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
92
93
    def test_remote_branch_revision_history(self):
94
        b = BzrDir.open_from_transport(self.transport).open_branch()
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
95
        self.assertEqual([], b.revision_history())
96
        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.
97
        r2 = self.local_wt.commit('1st commit', rev_id=u'\xc8'.encode('utf8'))
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
98
        self.assertEqual([r1, r2], b.revision_history())
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
99
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
100
    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)
101
        """Should open a RemoteBzrDir over a RemoteTransport"""
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
102
        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.
103
        self.assertTrue(RemoteBzrDirFormat
104
                        in BzrDirFormat._control_server_formats)
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
105
        self.assertIsInstance(fmt, remote.RemoteBzrDirFormat)
106
107
    def test_open_detected_smart_format(self):
108
        fmt = BzrDirFormat.find_format(self.transport)
109
        d = fmt.open(self.transport)
110
        self.assertIsInstance(d, BzrDir)
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
111
2477.1.1 by Martin Pool
Add RemoteBranch repr
112
    def test_remote_branch_repr(self):
113
        b = BzrDir.open_from_transport(self.transport).open_branch()
114
        self.assertStartsWith(str(b), 'RemoteBranch(')
115
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
116
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
117
class FakeProtocol(object):
118
    """Lookalike SmartClientRequestProtocolOne allowing body reading tests."""
119
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
120
    def __init__(self, body, fake_client):
2535.4.2 by Andrew Bennetts
Nasty hackery to make stream_knit_data_for_revisions response use streaming.
121
        self.body = body
122
        self._body_buffer = None
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
123
        self._fake_client = fake_client
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
124
125
    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.
126
        if self._body_buffer is None:
127
            self._body_buffer = StringIO(self.body)
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
128
        bytes = self._body_buffer.read(count)
129
        if self._body_buffer.tell() == len(self._body_buffer.getvalue()):
130
            self._fake_client.expecting_body = False
131
        return bytes
132
133
    def cancel_read_body(self):
134
        self._fake_client.expecting_body = False
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
135
2535.4.2 by Andrew Bennetts
Nasty hackery to make stream_knit_data_for_revisions response use streaming.
136
    def read_streamed_body(self):
137
        return self.body
138
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
139
2018.5.159 by Andrew Bennetts
Rename SmartClient to _SmartClient.
140
class FakeClient(_SmartClient):
141
    """Lookalike for _SmartClient allowing testing."""
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
142
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
143
    def __init__(self, fake_medium_base='fake base'):
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
144
        """Create a FakeClient."""
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
145
        self.responses = []
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
146
        self._calls = []
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
147
        self.expecting_body = False
3691.2.7 by Martin Pool
FakeClient can know what calls to expect
148
        # if non-None, this is the list of expected calls, with only the
149
        # method name and arguments included.  the body might be hard to
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
150
        # compute so is not included. If a call is None, that call can
151
        # be anything.
3691.2.7 by Martin Pool
FakeClient can know what calls to expect
152
        self._expected_calls = None
3431.3.2 by Andrew Bennetts
Remove 'base' from _SmartClient entirely, now that the medium has it.
153
        _SmartClient.__init__(self, FakeMedium(self._calls, fake_medium_base))
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
154
3691.2.7 by Martin Pool
FakeClient can know what calls to expect
155
    def add_expected_call(self, call_name, call_args, response_type,
156
        response_args, response_body=None):
157
        if self._expected_calls is None:
158
            self._expected_calls = []
159
        self._expected_calls.append((call_name, call_args))
3691.2.8 by Martin Pool
Update some test_remote tests for Branch.get_stacked_on_url and with clearer assertions
160
        self.responses.append((response_type, response_args, response_body))
3691.2.7 by Martin Pool
FakeClient can know what calls to expect
161
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
162
    def add_success_response(self, *args):
163
        self.responses.append(('success', args, None))
164
165
    def add_success_response_with_body(self, body, *args):
166
        self.responses.append(('success', args, body))
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
167
        if self._expected_calls is not None:
168
            self._expected_calls.append(None)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
169
170
    def add_error_response(self, *args):
171
        self.responses.append(('error', args))
172
173
    def add_unknown_method_response(self, verb):
174
        self.responses.append(('unknown', verb))
175
3691.2.8 by Martin Pool
Update some test_remote tests for Branch.get_stacked_on_url and with clearer assertions
176
    def finished_test(self):
177
        if self._expected_calls:
178
            raise AssertionError("%r finished but was still expecting %r"
179
                % (self, self._expected_calls[0]))
180
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.
181
    def _get_next_response(self):
3691.2.7 by Martin Pool
FakeClient can know what calls to expect
182
        try:
183
            response_tuple = self.responses.pop(0)
184
        except IndexError, e:
185
            raise AssertionError("%r didn't expect any more calls"
186
                % (self,))
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
187
        if response_tuple[0] == 'unknown':
188
            raise errors.UnknownSmartMethod(response_tuple[1])
189
        elif response_tuple[0] == 'error':
190
            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.
191
        return response_tuple
192
3691.2.7 by Martin Pool
FakeClient can know what calls to expect
193
    def _check_call(self, method, args):
194
        if self._expected_calls is None:
195
            # the test should be updated to say what it expects
196
            return
197
        try:
198
            next_call = self._expected_calls.pop(0)
199
        except IndexError:
200
            raise AssertionError("%r didn't expect any more calls "
201
                "but got %r%r"
3691.2.11 by Martin Pool
More tests around RemoteBranch stacking.
202
                % (self, method, args,))
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
203
        if next_call is None:
204
            return
3691.2.7 by Martin Pool
FakeClient can know what calls to expect
205
        if method != next_call[0] or args != next_call[1]:
206
            raise AssertionError("%r expected %r%r "
207
                "but got %r%r"
3691.2.8 by Martin Pool
Update some test_remote tests for Branch.get_stacked_on_url and with clearer assertions
208
                % (self, next_call[0], next_call[1], method, args,))
3691.2.7 by Martin Pool
FakeClient can know what calls to expect
209
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
210
    def call(self, method, *args):
3691.2.7 by Martin Pool
FakeClient can know what calls to expect
211
        self._check_call(method, args)
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
212
        self._calls.append(('call', method, args))
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
213
        return self._get_next_response()[1]
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
214
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
215
    def call_expecting_body(self, method, *args):
3691.2.7 by Martin Pool
FakeClient can know what calls to expect
216
        self._check_call(method, args)
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
217
        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.
218
        result = self._get_next_response()
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
219
        self.expecting_body = True
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
220
        return result[1], FakeProtocol(result[2], self)
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
221
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.
222
    def call_with_body_bytes_expecting_body(self, method, args, body):
3691.2.7 by Martin Pool
FakeClient can know what calls to expect
223
        self._check_call(method, args)
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.
224
        self._calls.append(('call_with_body_bytes_expecting_body', method,
225
            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.
226
        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.
227
        self.expecting_body = True
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
228
        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.
229
3842.3.9 by Andrew Bennetts
Backing up the stream so that we can fallback correctly.
230
    def call_with_body_stream(self, args, stream):
231
        # Explicitly consume the stream before checking for an error, because
232
        # that's what happens a real medium.
233
        stream = list(stream)
234
        self._check_call(args[0], args[1:])
235
        self._calls.append(('call_with_body_stream', args[0], args[1:], stream))
236
        return self._get_next_response()[1]
237
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
238
3431.3.11 by Andrew Bennetts
Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.
239
class FakeMedium(medium.SmartClientMedium):
3104.4.2 by Andrew Bennetts
All tests passing.
240
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.
241
    def __init__(self, client_calls, base):
3453.4.1 by Andrew Bennetts
Better infrastructure on SmartClientMedium for tracking the remote version.
242
        medium.SmartClientMedium.__init__(self, base)
3213.1.2 by Andrew Bennetts
Add test for reconnection if get_parent_map is unknown by the server.
243
        self._client_calls = client_calls
3213.1.1 by Andrew Bennetts
Recover (by reconnecting) if the server turns out not to understand the new requests in 1.2 that send bodies.
244
245
    def disconnect(self):
3213.1.2 by Andrew Bennetts
Add test for reconnection if get_parent_map is unknown by the server.
246
        self._client_calls.append(('disconnect medium',))
3104.4.2 by Andrew Bennetts
All tests passing.
247
248
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.
249
class TestVfsHas(tests.TestCase):
250
251
    def test_unicode_path(self):
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
252
        client = FakeClient('/')
253
        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.
254
        transport = RemoteTransport('bzr://localhost/', _client=client)
255
        filename = u'/hell\u00d8'.encode('utf8')
256
        result = transport.has(filename)
257
        self.assertEqual(
258
            [('call', 'has', (filename,))],
259
            client._calls)
260
        self.assertTrue(result)
261
262
4017.3.4 by Robert Collins
Create a verb for Repository.set_make_working_trees.
263
class TestRemote(tests.TestCaseWithMemoryTransport):
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
264
4053.1.2 by Robert Collins
Actually make this branch work.
265
    def get_repo_format(self):
266
        reference_bzrdir_format = bzrdir.format_registry.get('default')()
267
        return reference_bzrdir_format.repository_format
268
4017.3.4 by Robert Collins
Create a verb for Repository.set_make_working_trees.
269
    def disable_verb(self, verb):
270
        """Disable a verb for one test."""
271
        request_handlers = smart.request.request_handlers
272
        orig_method = request_handlers.get(verb)
273
        request_handlers.remove(verb)
274
        def restoreVerb():
275
            request_handlers.register(verb, orig_method)
276
        self.addCleanup(restoreVerb)
277
278
3431.3.11 by Andrew Bennetts
Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.
279
class Test_ClientMedium_remote_path_from_transport(tests.TestCase):
280
    """Tests for the behaviour of client_medium.remote_path_from_transport."""
3313.3.3 by Andrew Bennetts
Add tests for _SmartClient.remote_path_for_transport.
281
282
    def assertRemotePath(self, expected, client_base, transport_base):
3431.3.11 by Andrew Bennetts
Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.
283
        """Assert that the result of
284
        SmartClientMedium.remote_path_from_transport is the expected value for
285
        a given client_base and transport_base.
3313.3.3 by Andrew Bennetts
Add tests for _SmartClient.remote_path_for_transport.
286
        """
3431.3.11 by Andrew Bennetts
Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.
287
        client_medium = medium.SmartClientMedium(client_base)
3313.3.3 by Andrew Bennetts
Add tests for _SmartClient.remote_path_for_transport.
288
        transport = get_transport(transport_base)
3431.3.11 by Andrew Bennetts
Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.
289
        result = client_medium.remote_path_from_transport(transport)
3313.3.3 by Andrew Bennetts
Add tests for _SmartClient.remote_path_for_transport.
290
        self.assertEqual(expected, result)
3431.3.11 by Andrew Bennetts
Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.
291
3313.3.3 by Andrew Bennetts
Add tests for _SmartClient.remote_path_for_transport.
292
    def test_remote_path_from_transport(self):
3431.3.11 by Andrew Bennetts
Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.
293
        """SmartClientMedium.remote_path_from_transport calculates a URL for
294
        the given transport relative to the root of the client base URL.
3313.3.3 by Andrew Bennetts
Add tests for _SmartClient.remote_path_for_transport.
295
        """
296
        self.assertRemotePath('xyz/', 'bzr://host/path', 'bzr://host/xyz')
297
        self.assertRemotePath(
298
            'path/xyz/', 'bzr://host/path', 'bzr://host/path/xyz')
299
3431.3.11 by Andrew Bennetts
Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.
300
    def assertRemotePathHTTP(self, expected, transport_base, relpath):
301
        """Assert that the result of
302
        HttpTransportBase.remote_path_from_transport is the expected value for
303
        a given transport_base and relpath of that transport.  (Note that
304
        HttpTransportBase is a subclass of SmartClientMedium)
305
        """
306
        base_transport = get_transport(transport_base)
307
        client_medium = base_transport.get_smart_medium()
308
        cloned_transport = base_transport.clone(relpath)
309
        result = client_medium.remote_path_from_transport(cloned_transport)
310
        self.assertEqual(expected, result)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
311
3313.3.3 by Andrew Bennetts
Add tests for _SmartClient.remote_path_for_transport.
312
    def test_remote_path_from_transport_http(self):
313
        """Remote paths for HTTP transports are calculated differently to other
314
        transports.  They are just relative to the client base, not the root
315
        directory of the host.
316
        """
317
        for scheme in ['http:', 'https:', 'bzr+http:', 'bzr+https:']:
3431.3.11 by Andrew Bennetts
Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.
318
            self.assertRemotePathHTTP(
319
                '../xyz/', scheme + '//host/path', '../xyz/')
320
            self.assertRemotePathHTTP(
321
                'xyz/', scheme + '//host/path', 'xyz/')
3313.3.3 by Andrew Bennetts
Add tests for _SmartClient.remote_path_for_transport.
322
323
3453.4.1 by Andrew Bennetts
Better infrastructure on SmartClientMedium for tracking the remote version.
324
class Test_ClientMedium_remote_is_at_least(tests.TestCase):
325
    """Tests for the behaviour of client_medium.remote_is_at_least."""
326
327
    def test_initially_unlimited(self):
328
        """A fresh medium assumes that the remote side supports all
329
        versions.
330
        """
331
        client_medium = medium.SmartClientMedium('dummy base')
3453.4.10 by Andrew Bennetts
Change _is_remote_at_least to _is_remote_before.
332
        self.assertFalse(client_medium._is_remote_before((99, 99)))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
333
3453.4.9 by Andrew Bennetts
Rename _remote_is_not to _remember_remote_is_before.
334
    def test__remember_remote_is_before(self):
335
        """Calling _remember_remote_is_before ratchets down the known remote
336
        version.
337
        """
3453.4.1 by Andrew Bennetts
Better infrastructure on SmartClientMedium for tracking the remote version.
338
        client_medium = medium.SmartClientMedium('dummy base')
339
        # Mark the remote side as being less than 1.6.  The remote side may
340
        # still be 1.5.
3453.4.9 by Andrew Bennetts
Rename _remote_is_not to _remember_remote_is_before.
341
        client_medium._remember_remote_is_before((1, 6))
3453.4.10 by Andrew Bennetts
Change _is_remote_at_least to _is_remote_before.
342
        self.assertTrue(client_medium._is_remote_before((1, 6)))
343
        self.assertFalse(client_medium._is_remote_before((1, 5)))
3453.4.9 by Andrew Bennetts
Rename _remote_is_not to _remember_remote_is_before.
344
        # Calling _remember_remote_is_before again with a lower value works.
345
        client_medium._remember_remote_is_before((1, 5))
3453.4.10 by Andrew Bennetts
Change _is_remote_at_least to _is_remote_before.
346
        self.assertTrue(client_medium._is_remote_before((1, 5)))
3453.4.9 by Andrew Bennetts
Rename _remote_is_not to _remember_remote_is_before.
347
        # You cannot call _remember_remote_is_before with a larger value.
3453.4.1 by Andrew Bennetts
Better infrastructure on SmartClientMedium for tracking the remote version.
348
        self.assertRaises(
3453.4.9 by Andrew Bennetts
Rename _remote_is_not to _remember_remote_is_before.
349
            AssertionError, client_medium._remember_remote_is_before, (1, 9))
3453.4.1 by Andrew Bennetts
Better infrastructure on SmartClientMedium for tracking the remote version.
350
351
4070.2.3 by Robert Collins
Get BzrDir.cloning_metadir working.
352
class TestBzrDirCloningMetaDir(TestRemote):
353
354
    def test_backwards_compat(self):
355
        self.setup_smart_server_with_call_log()
356
        a_dir = self.make_bzrdir('.')
357
        self.reset_smart_call_log()
358
        verb = 'BzrDir.cloning_metadir'
359
        self.disable_verb(verb)
360
        format = a_dir.cloning_metadir()
361
        call_count = len([call for call in self.hpss_calls if
4070.3.1 by Robert Collins
Alter branch sprouting with an alternate fix for stacked branches that does not require multiple copy_content_into and set_parent calls, reducing IO and round trips.
362
            call.call.method == verb])
4070.2.3 by Robert Collins
Get BzrDir.cloning_metadir working.
363
        self.assertEqual(1, call_count)
364
365
    def test_current_server(self):
366
        transport = self.get_transport('.')
367
        transport = transport.clone('quack')
368
        self.make_bzrdir('quack')
369
        client = FakeClient(transport.base)
370
        reference_bzrdir_format = bzrdir.format_registry.get('default')()
371
        control_name = reference_bzrdir_format.network_name()
372
        client.add_expected_call(
373
            'BzrDir.cloning_metadir', ('quack/', 'False'),
374
            'success', (control_name, '', '')),
375
        a_bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
376
            _client=client)
377
        result = a_bzrdir.cloning_metadir()
378
        # We should have got a reference control dir with default branch and
379
        # repository formats.
380
        # This pokes a little, just to be sure.
381
        self.assertEqual(bzrdir.BzrDirMetaFormat1, type(result))
4070.2.8 by Robert Collins
Really test the current BzrDir.cloning_metadir contract.
382
        self.assertEqual(None, result._repository_format)
383
        self.assertEqual(None, result._branch_format)
4070.2.3 by Robert Collins
Get BzrDir.cloning_metadir working.
384
        client.finished_test()
385
386
4053.1.2 by Robert Collins
Actually make this branch work.
387
class TestBzrDirOpenBranch(TestRemote):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
388
389
    def test_branch_present(self):
4053.1.2 by Robert Collins
Actually make this branch work.
390
        reference_format = self.get_repo_format()
391
        network_name = reference_format.network_name()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
392
        transport = MemoryTransport()
393
        transport.mkdir('quack')
394
        transport = transport.clone('quack')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
395
        client = FakeClient(transport.base)
3691.2.10 by Martin Pool
Update more test_remote tests
396
        client.add_expected_call(
397
            'BzrDir.open_branch', ('quack/',),
398
            'success', ('ok', ''))
399
        client.add_expected_call(
4053.1.2 by Robert Collins
Actually make this branch work.
400
            'BzrDir.find_repositoryV3', ('quack/',),
401
            'success', ('ok', '', 'no', 'no', 'no', network_name))
3691.2.10 by Martin Pool
Update more test_remote tests
402
        client.add_expected_call(
403
            'Branch.get_stacked_on_url', ('quack/',),
404
            'error', ('NotStacked',))
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
405
        bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
406
            _client=client)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
407
        result = bzrdir.open_branch()
408
        self.assertIsInstance(result, RemoteBranch)
409
        self.assertEqual(bzrdir, result.bzrdir)
3691.2.10 by Martin Pool
Update more test_remote tests
410
        client.finished_test()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
411
412
    def test_branch_missing(self):
413
        transport = MemoryTransport()
414
        transport.mkdir('quack')
415
        transport = transport.clone('quack')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
416
        client = FakeClient(transport.base)
417
        client.add_error_response('nobranch')
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
418
        bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
419
            _client=client)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
420
        self.assertRaises(errors.NotBranchError, bzrdir.open_branch)
421
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
422
            [('call', 'BzrDir.open_branch', ('quack/',))],
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
423
            client._calls)
424
3211.4.1 by Robert Collins
* ``RemoteBzrDir._get_tree_branch`` no longer triggers ``_ensure_real``,
425
    def test__get_tree_branch(self):
426
        # _get_tree_branch is a form of open_branch, but it should only ask for
427
        # branch opening, not any other network requests.
428
        calls = []
429
        def open_branch():
430
            calls.append("Called")
431
            return "a-branch"
432
        transport = MemoryTransport()
433
        # 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.
434
        client = FakeClient(transport.base)
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
435
        bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
436
            _client=client)
3211.4.1 by Robert Collins
* ``RemoteBzrDir._get_tree_branch`` no longer triggers ``_ensure_real``,
437
        # patch the open_branch call to record that it was called.
438
        bzrdir.open_branch = open_branch
439
        self.assertEqual((None, "a-branch"), bzrdir._get_tree_branch())
440
        self.assertEqual(["Called"], calls)
441
        self.assertEqual([], client._calls)
442
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.
443
    def test_url_quoting_of_path(self):
444
        # Relpaths on the wire should not be URL-escaped.  So "~" should be
445
        # 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.
446
        transport = RemoteTCPTransport('bzr://localhost/~hello/')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
447
        client = FakeClient(transport.base)
4053.1.2 by Robert Collins
Actually make this branch work.
448
        reference_format = self.get_repo_format()
449
        network_name = reference_format.network_name()
3691.2.10 by Martin Pool
Update more test_remote tests
450
        client.add_expected_call(
451
            'BzrDir.open_branch', ('~hello/',),
452
            'success', ('ok', ''))
453
        client.add_expected_call(
4053.1.2 by Robert Collins
Actually make this branch work.
454
            'BzrDir.find_repositoryV3', ('~hello/',),
455
            'success', ('ok', '', 'no', 'no', 'no', network_name))
3691.2.10 by Martin Pool
Update more test_remote tests
456
        client.add_expected_call(
457
            'Branch.get_stacked_on_url', ('~hello/',),
458
            'error', ('NotStacked',))
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
459
        bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
460
            _client=client)
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.
461
        result = bzrdir.open_branch()
3691.2.10 by Martin Pool
Update more test_remote tests
462
        client.finished_test()
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.
463
3221.3.3 by Robert Collins
* Hook up the new remote method ``RemoteBzrDir.find_repositoryV2`` so
464
    def check_open_repository(self, rich_root, subtrees, external_lookup='no'):
4053.1.2 by Robert Collins
Actually make this branch work.
465
        reference_format = self.get_repo_format()
466
        network_name = reference_format.network_name()
3104.4.2 by Andrew Bennetts
All tests passing.
467
        transport = MemoryTransport()
468
        transport.mkdir('quack')
469
        transport = transport.clone('quack')
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
470
        if rich_root:
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
471
            rich_response = 'yes'
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
472
        else:
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
473
            rich_response = 'no'
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
474
        if subtrees:
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
475
            subtree_response = 'yes'
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
476
        else:
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
477
            subtree_response = 'no'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
478
        client = FakeClient(transport.base)
479
        client.add_success_response(
4053.1.2 by Robert Collins
Actually make this branch work.
480
            'ok', '', rich_response, subtree_response, external_lookup,
481
            network_name)
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
482
        bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
483
            _client=client)
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
484
        result = bzrdir.open_repository()
485
        self.assertEqual(
4053.1.2 by Robert Collins
Actually make this branch work.
486
            [('call', 'BzrDir.find_repositoryV3', ('quack/',))],
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
487
            client._calls)
488
        self.assertIsInstance(result, RemoteRepository)
489
        self.assertEqual(bzrdir, result.bzrdir)
490
        self.assertEqual(rich_root, result._format.rich_root_data)
2018.5.138 by Robert Collins
Merge bzr.dev.
491
        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.
492
493
    def test_open_repository_sets_format_attributes(self):
494
        self.check_open_repository(True, True)
495
        self.check_open_repository(False, True)
496
        self.check_open_repository(True, False)
497
        self.check_open_repository(False, False)
3221.3.3 by Robert Collins
* Hook up the new remote method ``RemoteBzrDir.find_repositoryV2`` so
498
        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.
499
2432.3.2 by Andrew Bennetts
Add test, and tidy implementation.
500
    def test_old_server(self):
501
        """RemoteBzrDirFormat should fail to probe if the server version is too
502
        old.
503
        """
504
        self.assertRaises(errors.NotBranchError,
505
            RemoteBzrDirFormat.probe_transport, OldServerTransport())
506
507
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
508
class TestBzrDirCreateBranch(TestRemote):
509
510
    def test_backwards_compat(self):
511
        self.setup_smart_server_with_call_log()
512
        repo = self.make_repository('.')
513
        self.reset_smart_call_log()
514
        self.disable_verb('BzrDir.create_branch')
515
        branch = repo.bzrdir.create_branch()
516
        create_branch_call_count = len([call for call in self.hpss_calls if
4070.3.1 by Robert Collins
Alter branch sprouting with an alternate fix for stacked branches that does not require multiple copy_content_into and set_parent calls, reducing IO and round trips.
517
            call.call.method == 'BzrDir.create_branch'])
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
518
        self.assertEqual(1, create_branch_call_count)
519
520
    def test_current_server(self):
521
        transport = self.get_transport('.')
522
        transport = transport.clone('quack')
523
        self.make_repository('quack')
524
        client = FakeClient(transport.base)
525
        reference_bzrdir_format = bzrdir.format_registry.get('default')()
526
        reference_format = reference_bzrdir_format.get_branch_format()
527
        network_name = reference_format.network_name()
528
        reference_repo_fmt = reference_bzrdir_format.repository_format
529
        reference_repo_name = reference_repo_fmt.network_name()
530
        client.add_expected_call(
531
            'BzrDir.create_branch', ('quack/', network_name),
532
            'success', ('ok', network_name, '', 'no', 'no', 'yes',
533
            reference_repo_name))
534
        a_bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
535
            _client=client)
536
        branch = a_bzrdir.create_branch()
537
        # We should have got a remote branch
538
        self.assertIsInstance(branch, remote.RemoteBranch)
539
        # its format should have the settings from the response
540
        format = branch._format
541
        self.assertEqual(network_name, format.network_name())
542
543
4017.3.4 by Robert Collins
Create a verb for Repository.set_make_working_trees.
544
class TestBzrDirCreateRepository(TestRemote):
4017.3.2 by Robert Collins
Reduce the number of round trips required to create a repository over the network.
545
546
    def test_backwards_compat(self):
547
        self.setup_smart_server_with_call_log()
548
        bzrdir = self.make_bzrdir('.')
549
        self.reset_smart_call_log()
4017.3.4 by Robert Collins
Create a verb for Repository.set_make_working_trees.
550
        self.disable_verb('BzrDir.create_repository')
551
        repo = bzrdir.create_repository()
552
        create_repo_call_count = len([call for call in self.hpss_calls if
4070.3.1 by Robert Collins
Alter branch sprouting with an alternate fix for stacked branches that does not require multiple copy_content_into and set_parent calls, reducing IO and round trips.
553
            call.call.method == 'BzrDir.create_repository'])
4017.3.4 by Robert Collins
Create a verb for Repository.set_make_working_trees.
554
        self.assertEqual(1, create_repo_call_count)
4017.3.2 by Robert Collins
Reduce the number of round trips required to create a repository over the network.
555
556
    def test_current_server(self):
557
        transport = self.get_transport('.')
558
        transport = transport.clone('quack')
559
        self.make_bzrdir('quack')
560
        client = FakeClient(transport.base)
561
        reference_bzrdir_format = bzrdir.format_registry.get('default')()
562
        reference_format = reference_bzrdir_format.repository_format
563
        network_name = reference_format.network_name()
564
        client.add_expected_call(
565
            'BzrDir.create_repository', ('quack/',
566
                'Bazaar pack repository format 1 (needs bzr 0.92)\n', 'False'),
567
            'success', ('ok', 'no', 'no', 'no', network_name))
568
        a_bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
569
            _client=client)
570
        repo = a_bzrdir.create_repository()
571
        # We should have got a remote repository
572
        self.assertIsInstance(repo, remote.RemoteRepository)
573
        # its format should have the settings from the response
574
        format = repo._format
575
        self.assertFalse(format.rich_root_data)
576
        self.assertFalse(format.supports_tree_reference)
577
        self.assertFalse(format.supports_external_lookups)
578
        self.assertEqual(network_name, format.network_name())
579
580
4053.1.1 by Robert Collins
New version of the BzrDir.find_repository verb supporting _network_name to support removing more _ensure_real calls.
581
class TestBzrDirOpenRepository(TestRemote):
582
583
    def test_backwards_compat_1_2_3(self):
584
        # fallback all the way to the first version.
585
        reference_format = self.get_repo_format()
586
        network_name = reference_format.network_name()
587
        client = FakeClient('bzr://example.com/')
588
        client.add_unknown_method_response('BzrDir.find_repositoryV3')
4017.3.2 by Robert Collins
Reduce the number of round trips required to create a repository over the network.
589
        client.add_unknown_method_response('BzrDir.find_repositoryV2')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
590
        client.add_success_response('ok', '', 'no', 'no')
4053.1.1 by Robert Collins
New version of the BzrDir.find_repository verb supporting _network_name to support removing more _ensure_real calls.
591
        # A real repository instance will be created to determine the network
592
        # name.
593
        client.add_success_response_with_body(
594
            "Bazaar-NG meta directory, format 1\n", 'ok')
595
        client.add_success_response_with_body(
596
            reference_format.get_format_string(), 'ok')
597
        # PackRepository wants to do a stat
598
        client.add_success_response('stat', '0', '65535')
599
        remote_transport = RemoteTransport('bzr://example.com/quack/', medium=False,
600
            _client=client)
601
        bzrdir = RemoteBzrDir(remote_transport, remote.RemoteBzrDirFormat(),
602
            _client=client)
603
        repo = bzrdir.open_repository()
604
        self.assertEqual(
605
            [('call', 'BzrDir.find_repositoryV3', ('quack/',)),
606
             ('call', 'BzrDir.find_repositoryV2', ('quack/',)),
607
             ('call', 'BzrDir.find_repository', ('quack/',)),
608
             ('call_expecting_body', 'get', ('/quack/.bzr/branch-format',)),
609
             ('call_expecting_body', 'get', ('/quack/.bzr/repository/format',)),
610
             ('call', 'stat', ('/quack/.bzr/repository',)),
611
             ],
612
            client._calls)
613
        self.assertEqual(network_name, repo._format.network_name())
614
615
    def test_backwards_compat_2(self):
616
        # fallback to find_repositoryV2
617
        reference_format = self.get_repo_format()
618
        network_name = reference_format.network_name()
619
        client = FakeClient('bzr://example.com/')
620
        client.add_unknown_method_response('BzrDir.find_repositoryV3')
621
        client.add_success_response('ok', '', 'no', 'no', 'no')
622
        # A real repository instance will be created to determine the network
623
        # name.
624
        client.add_success_response_with_body(
625
            "Bazaar-NG meta directory, format 1\n", 'ok')
626
        client.add_success_response_with_body(
627
            reference_format.get_format_string(), 'ok')
628
        # PackRepository wants to do a stat
629
        client.add_success_response('stat', '0', '65535')
630
        remote_transport = RemoteTransport('bzr://example.com/quack/', medium=False,
631
            _client=client)
632
        bzrdir = RemoteBzrDir(remote_transport, remote.RemoteBzrDirFormat(),
633
            _client=client)
634
        repo = bzrdir.open_repository()
635
        self.assertEqual(
636
            [('call', 'BzrDir.find_repositoryV3', ('quack/',)),
637
             ('call', 'BzrDir.find_repositoryV2', ('quack/',)),
638
             ('call_expecting_body', 'get', ('/quack/.bzr/branch-format',)),
639
             ('call_expecting_body', 'get', ('/quack/.bzr/repository/format',)),
640
             ('call', 'stat', ('/quack/.bzr/repository',)),
641
             ],
642
            client._calls)
643
        self.assertEqual(network_name, repo._format.network_name())
644
645
    def test_current_server(self):
646
        reference_format = self.get_repo_format()
647
        network_name = reference_format.network_name()
648
        transport = MemoryTransport()
649
        transport.mkdir('quack')
650
        transport = transport.clone('quack')
651
        client = FakeClient(transport.base)
652
        client.add_success_response('ok', '', 'no', 'no', 'no', network_name)
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
653
        bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
654
            _client=client)
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.
655
        repo = bzrdir.open_repository()
656
        self.assertEqual(
4053.1.1 by Robert Collins
New version of the BzrDir.find_repository verb supporting _network_name to support removing more _ensure_real calls.
657
            [('call', 'BzrDir.find_repositoryV3', ('quack/',))],
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.
658
            client._calls)
4053.1.1 by Robert Collins
New version of the BzrDir.find_repository verb supporting _network_name to support removing more _ensure_real calls.
659
        self.assertEqual(network_name, repo._format.network_name())
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.
660
661
2432.3.2 by Andrew Bennetts
Add test, and tidy implementation.
662
class OldSmartClient(object):
663
    """A fake smart client for test_old_version that just returns a version one
664
    response to the 'hello' (query version) command.
665
    """
666
667
    def get_request(self):
668
        input_file = StringIO('ok\x011\n')
669
        output_file = StringIO()
670
        client_medium = medium.SmartSimplePipesClientMedium(
671
            input_file, output_file)
672
        return medium.SmartClientStreamMediumRequest(client_medium)
673
3241.1.1 by Andrew Bennetts
Shift protocol version querying from RemoteBzrDirFormat into SmartClientMedium.
674
    def protocol_version(self):
675
        return 1
676
2432.3.2 by Andrew Bennetts
Add test, and tidy implementation.
677
678
class OldServerTransport(object):
679
    """A fake transport for test_old_server that reports it's smart server
680
    protocol version as version one.
681
    """
682
683
    def __init__(self):
684
        self.base = 'fake:'
685
686
    def get_smart_client(self):
687
        return OldSmartClient()
688
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
689
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
690
class RemoteBranchTestCase(tests.TestCase):
691
692
    def make_remote_branch(self, transport, client):
693
        """Make a RemoteBranch using 'client' as its _SmartClient.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
694
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
695
        A RemoteBzrDir and RemoteRepository will also be created to fill out
696
        the RemoteBranch, albeit with stub values for some of their attributes.
697
        """
698
        # we do not want bzrdir to make any remote calls, so use False as its
699
        # _client.  If it tries to make a remote call, this will fail
700
        # immediately.
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
701
        bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
702
            _client=False)
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
703
        repo = RemoteRepository(bzrdir, None, _client=client)
704
        return RemoteBranch(bzrdir, repo, _client=client)
705
706
707
class TestBranchLastRevisionInfo(RemoteBranchTestCase):
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
708
709
    def test_empty_branch(self):
710
        # in an empty branch we decode the response properly
711
        transport = MemoryTransport()
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
712
        client = FakeClient(transport.base)
3691.2.8 by Martin Pool
Update some test_remote tests for Branch.get_stacked_on_url and with clearer assertions
713
        client.add_expected_call(
714
            'Branch.get_stacked_on_url', ('quack/',),
715
            'error', ('NotStacked',))
716
        client.add_expected_call(
717
            'Branch.last_revision_info', ('quack/',),
718
            'success', ('ok', '0', 'null:'))
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
719
        transport.mkdir('quack')
720
        transport = transport.clone('quack')
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
721
        branch = self.make_remote_branch(transport, client)
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
722
        result = branch.last_revision_info()
3691.2.8 by Martin Pool
Update some test_remote tests for Branch.get_stacked_on_url and with clearer assertions
723
        client.finished_test()
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
724
        self.assertEqual((0, NULL_REVISION), result)
725
726
    def test_non_empty_branch(self):
727
        # 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.
728
        revid = u'\xc8'.encode('utf8')
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
729
        transport = MemoryTransport()
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
730
        client = FakeClient(transport.base)
3691.2.8 by Martin Pool
Update some test_remote tests for Branch.get_stacked_on_url and with clearer assertions
731
        client.add_expected_call(
732
            'Branch.get_stacked_on_url', ('kwaak/',),
733
            'error', ('NotStacked',))
734
        client.add_expected_call(
735
            'Branch.last_revision_info', ('kwaak/',),
736
            'success', ('ok', '2', revid))
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
737
        transport.mkdir('kwaak')
738
        transport = transport.clone('kwaak')
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
739
        branch = self.make_remote_branch(transport, client)
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
740
        result = branch.last_revision_info()
2018.5.106 by Andrew Bennetts
Update tests in test_remote to use utf-8 byte strings for revision IDs, rather than unicode strings.
741
        self.assertEqual((2, revid), result)
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
742
743
4053.1.2 by Robert Collins
Actually make this branch work.
744
class TestBranch_get_stacked_on_url(TestRemote):
3691.2.5 by Martin Pool
Add Branch.get_stacked_on_url rpc and tests for same
745
    """Test Branch._get_stacked_on_url rpc"""
746
3691.2.10 by Martin Pool
Update more test_remote tests
747
    def test_get_stacked_on_invalid_url(self):
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
748
        # test that asking for a stacked on url the server can't access works.
749
        # This isn't perfect, but then as we're in the same process there
750
        # really isn't anything we can do to be 100% sure that the server
751
        # doesn't just open in - this test probably needs to be rewritten using
752
        # a spawn()ed server.
753
        stacked_branch = self.make_branch('stacked', format='1.9')
754
        memory_branch = self.make_branch('base', format='1.9')
755
        vfs_url = self.get_vfs_only_url('base')
756
        stacked_branch.set_stacked_on_url(vfs_url)
757
        transport = stacked_branch.bzrdir.root_transport
3691.2.5 by Martin Pool
Add Branch.get_stacked_on_url rpc and tests for same
758
        client = FakeClient(transport.base)
3691.2.10 by Martin Pool
Update more test_remote tests
759
        client.add_expected_call(
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
760
            'Branch.get_stacked_on_url', ('stacked/',),
761
            'success', ('ok', vfs_url))
762
        # XXX: Multiple calls are bad, this second call documents what is
763
        # today.
764
        client.add_expected_call(
765
            'Branch.get_stacked_on_url', ('stacked/',),
766
            'success', ('ok', vfs_url))
767
        bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
768
            _client=client)
769
        branch = RemoteBranch(bzrdir, RemoteRepository(bzrdir, None),
770
            _client=client)
3691.2.5 by Martin Pool
Add Branch.get_stacked_on_url rpc and tests for same
771
        result = branch.get_stacked_on_url()
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
772
        self.assertEqual(vfs_url, result)
3691.2.5 by Martin Pool
Add Branch.get_stacked_on_url rpc and tests for same
773
3691.2.12 by Martin Pool
Add test for coping without Branch.get_stacked_on_url
774
    def test_backwards_compatible(self):
775
        # like with bzr1.6 with no Branch.get_stacked_on_url rpc
776
        base_branch = self.make_branch('base', format='1.6')
777
        stacked_branch = self.make_branch('stacked', format='1.6')
778
        stacked_branch.set_stacked_on_url('../base')
779
        client = FakeClient(self.get_url())
780
        client.add_expected_call(
781
            'BzrDir.open_branch', ('stacked/',),
782
            'success', ('ok', ''))
783
        client.add_expected_call(
4053.1.2 by Robert Collins
Actually make this branch work.
784
            'BzrDir.find_repositoryV3', ('stacked/',),
785
            'success', ('ok', '', 'no', 'no', 'no',
786
                stacked_branch.repository._format.network_name()))
3691.2.12 by Martin Pool
Add test for coping without Branch.get_stacked_on_url
787
        # called twice, once from constructor and then again by us
788
        client.add_expected_call(
789
            'Branch.get_stacked_on_url', ('stacked/',),
790
            'unknown', ('Branch.get_stacked_on_url',))
791
        client.add_expected_call(
792
            'Branch.get_stacked_on_url', ('stacked/',),
793
            'unknown', ('Branch.get_stacked_on_url',))
794
        # this will also do vfs access, but that goes direct to the transport
795
        # and isn't seen by the FakeClient.
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
796
        bzrdir = RemoteBzrDir(self.get_transport('stacked'),
797
            remote.RemoteBzrDirFormat(), _client=client)
3691.2.12 by Martin Pool
Add test for coping without Branch.get_stacked_on_url
798
        branch = bzrdir.open_branch()
799
        result = branch.get_stacked_on_url()
800
        self.assertEqual('../base', result)
801
        client.finished_test()
802
        # it's in the fallback list both for the RemoteRepository and its vfs
803
        # repository
804
        self.assertEqual(1, len(branch.repository._fallback_repositories))
805
        self.assertEqual(1,
806
            len(branch.repository._real_repository._fallback_repositories))
807
3691.2.11 by Martin Pool
More tests around RemoteBranch stacking.
808
    def test_get_stacked_on_real_branch(self):
809
        base_branch = self.make_branch('base', format='1.6')
810
        stacked_branch = self.make_branch('stacked', format='1.6')
811
        stacked_branch.set_stacked_on_url('../base')
4053.1.2 by Robert Collins
Actually make this branch work.
812
        reference_format = self.get_repo_format()
813
        network_name = reference_format.network_name()
3691.2.11 by Martin Pool
More tests around RemoteBranch stacking.
814
        client = FakeClient(self.get_url())
815
        client.add_expected_call(
816
            'BzrDir.open_branch', ('stacked/',),
817
            'success', ('ok', ''))
818
        client.add_expected_call(
4053.1.2 by Robert Collins
Actually make this branch work.
819
            'BzrDir.find_repositoryV3', ('stacked/',),
820
            'success', ('ok', '', 'no', 'no', 'no', network_name))
3691.2.11 by Martin Pool
More tests around RemoteBranch stacking.
821
        # called twice, once from constructor and then again by us
822
        client.add_expected_call(
823
            'Branch.get_stacked_on_url', ('stacked/',),
824
            'success', ('ok', '../base'))
825
        client.add_expected_call(
826
            'Branch.get_stacked_on_url', ('stacked/',),
827
            'success', ('ok', '../base'))
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
828
        bzrdir = RemoteBzrDir(self.get_transport('stacked'),
829
            remote.RemoteBzrDirFormat(), _client=client)
3691.2.11 by Martin Pool
More tests around RemoteBranch stacking.
830
        branch = bzrdir.open_branch()
831
        result = branch.get_stacked_on_url()
832
        self.assertEqual('../base', result)
833
        client.finished_test()
834
        # it's in the fallback list both for the RemoteRepository and its vfs
835
        # repository
836
        self.assertEqual(1, len(branch.repository._fallback_repositories))
837
        self.assertEqual(1,
838
            len(branch.repository._real_repository._fallback_repositories))
839
3691.2.5 by Martin Pool
Add Branch.get_stacked_on_url rpc and tests for same
840
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
841
class TestBranchSetLastRevision(RemoteBranchTestCase):
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
842
843
    def test_set_empty(self):
844
        # set_revision_history([]) is translated to calling
845
        # Branch.set_last_revision(path, '') on the wire.
3104.4.2 by Andrew Bennetts
All tests passing.
846
        transport = MemoryTransport()
847
        transport.mkdir('branch')
848
        transport = transport.clone('branch')
849
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
850
        client = FakeClient(transport.base)
3691.2.10 by Martin Pool
Update more test_remote tests
851
        client.add_expected_call(
852
            'Branch.get_stacked_on_url', ('branch/',),
853
            'error', ('NotStacked',))
854
        client.add_expected_call(
855
            'Branch.lock_write', ('branch/', '', ''),
856
            'success', ('ok', 'branch token', 'repo token'))
857
        client.add_expected_call(
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
858
            'Branch.last_revision_info',
859
            ('branch/',),
860
            'success', ('ok', '0', 'null:'))
861
        client.add_expected_call(
3691.2.10 by Martin Pool
Update more test_remote tests
862
            'Branch.set_last_revision', ('branch/', 'branch token', 'repo token', 'null:',),
863
            'success', ('ok',))
864
        client.add_expected_call(
865
            'Branch.unlock', ('branch/', 'branch token', 'repo token'),
866
            'success', ('ok',))
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
867
        branch = self.make_remote_branch(transport, client)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
868
        # This is a hack to work around the problem that RemoteBranch currently
869
        # unnecessarily invokes _ensure_real upon a call to lock_write.
870
        branch._ensure_real = lambda: None
871
        branch.lock_write()
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
872
        result = branch.set_revision_history([])
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
873
        branch.unlock()
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
874
        self.assertEqual(None, result)
3691.2.10 by Martin Pool
Update more test_remote tests
875
        client.finished_test()
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
876
877
    def test_set_nonempty(self):
878
        # set_revision_history([rev-id1, ..., rev-idN]) is translated to calling
879
        # Branch.set_last_revision(path, rev-idN) on the wire.
3104.4.2 by Andrew Bennetts
All tests passing.
880
        transport = MemoryTransport()
881
        transport.mkdir('branch')
882
        transport = transport.clone('branch')
883
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
884
        client = FakeClient(transport.base)
3691.2.10 by Martin Pool
Update more test_remote tests
885
        client.add_expected_call(
886
            'Branch.get_stacked_on_url', ('branch/',),
887
            'error', ('NotStacked',))
888
        client.add_expected_call(
889
            'Branch.lock_write', ('branch/', '', ''),
890
            'success', ('ok', 'branch token', 'repo token'))
891
        client.add_expected_call(
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
892
            'Branch.last_revision_info',
893
            ('branch/',),
894
            'success', ('ok', '0', 'null:'))
895
        lines = ['rev-id2']
896
        encoded_body = bz2.compress('\n'.join(lines))
897
        client.add_success_response_with_body(encoded_body, 'ok')
898
        client.add_expected_call(
3691.2.10 by Martin Pool
Update more test_remote tests
899
            'Branch.set_last_revision', ('branch/', 'branch token', 'repo token', 'rev-id2',),
900
            'success', ('ok',))
901
        client.add_expected_call(
902
            'Branch.unlock', ('branch/', 'branch token', 'repo token'),
903
            'success', ('ok',))
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
904
        branch = self.make_remote_branch(transport, client)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
905
        # This is a hack to work around the problem that RemoteBranch currently
906
        # unnecessarily invokes _ensure_real upon a call to lock_write.
907
        branch._ensure_real = lambda: None
908
        # Lock the branch, reset the record of remote calls.
909
        branch.lock_write()
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
910
        result = branch.set_revision_history(['rev-id1', 'rev-id2'])
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
911
        branch.unlock()
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
912
        self.assertEqual(None, result)
3691.2.10 by Martin Pool
Update more test_remote tests
913
        client.finished_test()
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
914
915
    def test_no_such_revision(self):
916
        transport = MemoryTransport()
917
        transport.mkdir('branch')
918
        transport = transport.clone('branch')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
919
        # A response of 'NoSuchRevision' is translated into an exception.
920
        client = FakeClient(transport.base)
3691.2.9 by Martin Pool
Convert and update more test_remote tests
921
        client.add_expected_call(
922
            'Branch.get_stacked_on_url', ('branch/',),
923
            'error', ('NotStacked',))
924
        client.add_expected_call(
925
            'Branch.lock_write', ('branch/', '', ''),
926
            'success', ('ok', 'branch token', 'repo token'))
927
        client.add_expected_call(
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
928
            'Branch.last_revision_info',
929
            ('branch/',),
930
            'success', ('ok', '0', 'null:'))
931
        # get_graph calls to construct the revision history, for the set_rh
932
        # hook
933
        lines = ['rev-id']
934
        encoded_body = bz2.compress('\n'.join(lines))
935
        client.add_success_response_with_body(encoded_body, 'ok')
936
        client.add_expected_call(
3691.2.9 by Martin Pool
Convert and update more test_remote tests
937
            'Branch.set_last_revision', ('branch/', 'branch token', 'repo token', 'rev-id',),
938
            'error', ('NoSuchRevision', 'rev-id'))
939
        client.add_expected_call(
940
            'Branch.unlock', ('branch/', 'branch token', 'repo token'),
941
            'success', ('ok',))
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
942
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
943
        branch = self.make_remote_branch(transport, client)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
944
        branch.lock_write()
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
945
        self.assertRaises(
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
946
            errors.NoSuchRevision, branch.set_revision_history, ['rev-id'])
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
947
        branch.unlock()
3691.2.9 by Martin Pool
Convert and update more test_remote tests
948
        client.finished_test()
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
949
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
950
    def test_tip_change_rejected(self):
951
        """TipChangeRejected responses cause a TipChangeRejected exception to
952
        be raised.
953
        """
954
        transport = MemoryTransport()
955
        transport.mkdir('branch')
956
        transport = transport.clone('branch')
957
        client = FakeClient(transport.base)
958
        rejection_msg_unicode = u'rejection message\N{INTERROBANG}'
959
        rejection_msg_utf8 = rejection_msg_unicode.encode('utf8')
3691.2.10 by Martin Pool
Update more test_remote tests
960
        client.add_expected_call(
961
            'Branch.get_stacked_on_url', ('branch/',),
962
            'error', ('NotStacked',))
963
        client.add_expected_call(
964
            'Branch.lock_write', ('branch/', '', ''),
965
            'success', ('ok', 'branch token', 'repo token'))
966
        client.add_expected_call(
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
967
            'Branch.last_revision_info',
968
            ('branch/',),
969
            'success', ('ok', '0', 'null:'))
970
        lines = ['rev-id']
971
        encoded_body = bz2.compress('\n'.join(lines))
972
        client.add_success_response_with_body(encoded_body, 'ok')
973
        client.add_expected_call(
3691.2.10 by Martin Pool
Update more test_remote tests
974
            'Branch.set_last_revision', ('branch/', 'branch token', 'repo token', 'rev-id',),
975
            'error', ('TipChangeRejected', rejection_msg_utf8))
976
        client.add_expected_call(
977
            'Branch.unlock', ('branch/', 'branch token', 'repo token'),
978
            'success', ('ok',))
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
979
        branch = self.make_remote_branch(transport, client)
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
980
        branch._ensure_real = lambda: None
981
        branch.lock_write()
982
        # The 'TipChangeRejected' error response triggered by calling
983
        # set_revision_history causes a TipChangeRejected exception.
984
        err = self.assertRaises(
985
            errors.TipChangeRejected, branch.set_revision_history, ['rev-id'])
986
        # The UTF-8 message from the response has been decoded into a unicode
987
        # object.
988
        self.assertIsInstance(err.msg, unicode)
989
        self.assertEqual(rejection_msg_unicode, err.msg)
3691.2.10 by Martin Pool
Update more test_remote tests
990
        branch.unlock()
991
        client.finished_test()
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
992
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
993
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
994
class TestBranchSetLastRevisionInfo(RemoteBranchTestCase):
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
995
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
996
    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.
997
        # set_last_revision_info(num, 'rev-id') is translated to calling
998
        # 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'.
999
        transport = MemoryTransport()
1000
        transport.mkdir('branch')
1001
        transport = transport.clone('branch')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1002
        client = FakeClient(transport.base)
3691.2.10 by Martin Pool
Update more test_remote tests
1003
        # get_stacked_on_url
1004
        client.add_error_response('NotStacked')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1005
        # lock_write
1006
        client.add_success_response('ok', 'branch token', 'repo token')
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
1007
        # query the current revision
1008
        client.add_success_response('ok', '0', 'null:')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1009
        # set_last_revision
1010
        client.add_success_response('ok')
1011
        # unlock
1012
        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.
1013
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1014
        branch = self.make_remote_branch(transport, client)
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
1015
        # Lock the branch, reset the record of remote calls.
1016
        branch.lock_write()
1017
        client._calls = []
1018
        result = branch.set_last_revision_info(1234, 'a-revision-id')
1019
        self.assertEqual(
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
1020
            [('call', 'Branch.last_revision_info', ('branch/',)),
1021
             ('call', 'Branch.set_last_revision_info',
3297.4.1 by Andrew Bennetts
Merge 'Add Branch.set_last_revision_info smart method'.
1022
                ('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.
1023
                 '1234', 'a-revision-id'))],
1024
            client._calls)
1025
        self.assertEqual(None, result)
1026
1027
    def test_no_such_revision(self):
1028
        # A response of 'NoSuchRevision' is translated into an exception.
1029
        transport = MemoryTransport()
1030
        transport.mkdir('branch')
1031
        transport = transport.clone('branch')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1032
        client = FakeClient(transport.base)
3691.2.10 by Martin Pool
Update more test_remote tests
1033
        # get_stacked_on_url
1034
        client.add_error_response('NotStacked')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1035
        # lock_write
1036
        client.add_success_response('ok', 'branch token', 'repo token')
1037
        # set_last_revision
1038
        client.add_error_response('NoSuchRevision', 'revid')
1039
        # unlock
1040
        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.
1041
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1042
        branch = self.make_remote_branch(transport, client)
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
1043
        # Lock the branch, reset the record of remote calls.
1044
        branch.lock_write()
1045
        client._calls = []
1046
1047
        self.assertRaises(
1048
            errors.NoSuchRevision, branch.set_last_revision_info, 123, 'revid')
1049
        branch.unlock()
1050
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
1051
    def lock_remote_branch(self, branch):
1052
        """Trick a RemoteBranch into thinking it is locked."""
1053
        branch._lock_mode = 'w'
1054
        branch._lock_count = 2
1055
        branch._lock_token = 'branch token'
1056
        branch._repo_lock_token = 'repo token'
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1057
        branch.repository._lock_mode = 'w'
1058
        branch.repository._lock_count = 2
1059
        branch.repository._lock_token = 'repo token'
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
1060
1061
    def test_backwards_compatibility(self):
1062
        """If the server does not support the Branch.set_last_revision_info
1063
        verb (which is new in 1.4), then the client falls back to VFS methods.
1064
        """
1065
        # This test is a little messy.  Unlike most tests in this file, it
1066
        # doesn't purely test what a Remote* object sends over the wire, and
1067
        # how it reacts to responses from the wire.  It instead relies partly
1068
        # on asserting that the RemoteBranch will call
1069
        # self._real_branch.set_last_revision_info(...).
1070
1071
        # First, set up our RemoteBranch with a FakeClient that raises
1072
        # UnknownSmartMethod, and a StubRealBranch that logs how it is called.
1073
        transport = MemoryTransport()
1074
        transport.mkdir('branch')
1075
        transport = transport.clone('branch')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1076
        client = FakeClient(transport.base)
3691.2.10 by Martin Pool
Update more test_remote tests
1077
        client.add_expected_call(
1078
            'Branch.get_stacked_on_url', ('branch/',),
1079
            'error', ('NotStacked',))
1080
        client.add_expected_call(
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
1081
            'Branch.last_revision_info',
1082
            ('branch/',),
1083
            'success', ('ok', '0', 'null:'))
1084
        client.add_expected_call(
3691.2.10 by Martin Pool
Update more test_remote tests
1085
            'Branch.set_last_revision_info',
1086
            ('branch/', 'branch token', 'repo token', '1234', 'a-revision-id',),
1087
            'unknown', 'Branch.set_last_revision_info')
1088
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1089
        branch = self.make_remote_branch(transport, client)
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
1090
        class StubRealBranch(object):
1091
            def __init__(self):
1092
                self.calls = []
1093
            def set_last_revision_info(self, revno, revision_id):
1094
                self.calls.append(
1095
                    ('set_last_revision_info', revno, revision_id))
3441.5.5 by Andrew Bennetts
Some small tweaks and comments.
1096
            def _clear_cached_state(self):
1097
                pass
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
1098
        real_branch = StubRealBranch()
1099
        branch._real_branch = real_branch
1100
        self.lock_remote_branch(branch)
1101
1102
        # Call set_last_revision_info, and verify it behaved as expected.
1103
        result = branch.set_last_revision_info(1234, 'a-revision-id')
1104
        self.assertEqual(
1105
            [('set_last_revision_info', 1234, 'a-revision-id')],
1106
            real_branch.calls)
3691.2.10 by Martin Pool
Update more test_remote tests
1107
        client.finished_test()
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
1108
3245.4.53 by Andrew Bennetts
Add some missing 'raise' statements to test_remote.
1109
    def test_unexpected_error(self):
3697.2.6 by Martin Pool
Merge 261315 fix into 1.7 branch
1110
        # If the server sends an error the client doesn't understand, it gets
1111
        # turned into an UnknownErrorFromSmartServer, which is presented as a
1112
        # non-internal error to the user.
3245.4.53 by Andrew Bennetts
Add some missing 'raise' statements to test_remote.
1113
        transport = MemoryTransport()
1114
        transport.mkdir('branch')
1115
        transport = transport.clone('branch')
1116
        client = FakeClient(transport.base)
3691.2.10 by Martin Pool
Update more test_remote tests
1117
        # get_stacked_on_url
1118
        client.add_error_response('NotStacked')
3245.4.53 by Andrew Bennetts
Add some missing 'raise' statements to test_remote.
1119
        # lock_write
1120
        client.add_success_response('ok', 'branch token', 'repo token')
1121
        # set_last_revision
1122
        client.add_error_response('UnexpectedError')
1123
        # unlock
1124
        client.add_success_response('ok')
1125
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1126
        branch = self.make_remote_branch(transport, client)
3245.4.53 by Andrew Bennetts
Add some missing 'raise' statements to test_remote.
1127
        # Lock the branch, reset the record of remote calls.
1128
        branch.lock_write()
1129
        client._calls = []
1130
1131
        err = self.assertRaises(
3690.1.2 by Andrew Bennetts
Rename UntranslateableErrorFromSmartServer -> UnknownErrorFromSmartServer.
1132
            errors.UnknownErrorFromSmartServer,
3245.4.53 by Andrew Bennetts
Add some missing 'raise' statements to test_remote.
1133
            branch.set_last_revision_info, 123, 'revid')
1134
        self.assertEqual(('UnexpectedError',), err.error_tuple)
1135
        branch.unlock()
1136
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
1137
    def test_tip_change_rejected(self):
1138
        """TipChangeRejected responses cause a TipChangeRejected exception to
1139
        be raised.
1140
        """
1141
        transport = MemoryTransport()
1142
        transport.mkdir('branch')
1143
        transport = transport.clone('branch')
1144
        client = FakeClient(transport.base)
3691.2.10 by Martin Pool
Update more test_remote tests
1145
        # get_stacked_on_url
1146
        client.add_error_response('NotStacked')
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
1147
        # lock_write
1148
        client.add_success_response('ok', 'branch token', 'repo token')
1149
        # set_last_revision
1150
        client.add_error_response('TipChangeRejected', 'rejection message')
1151
        # unlock
1152
        client.add_success_response('ok')
1153
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1154
        branch = self.make_remote_branch(transport, client)
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
1155
        # Lock the branch, reset the record of remote calls.
1156
        branch.lock_write()
1157
        self.addCleanup(branch.unlock)
1158
        client._calls = []
1159
1160
        # The 'TipChangeRejected' error response triggered by calling
1161
        # set_last_revision_info causes a TipChangeRejected exception.
1162
        err = self.assertRaises(
1163
            errors.TipChangeRejected,
1164
            branch.set_last_revision_info, 123, 'revid')
1165
        self.assertEqual('rejection message', err.msg)
1166
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
1167
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.
1168
class TestBranchControlGetBranchConf(tests.TestCaseWithMemoryTransport):
3408.3.1 by Martin Pool
Remove erroneous handling of branch.conf for RemoteBranch
1169
    """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).
1170
    """
1171
1172
    def test_get_branch_conf(self):
3408.3.1 by Martin Pool
Remove erroneous handling of branch.conf for RemoteBranch
1173
        raise tests.KnownFailure('branch.conf is not retrieved by get_config_file')
3407.2.10 by Martin Pool
Merge trunk
1174
        ## # We should see that branch.get_config() does a single rpc to get the
1175
        ## # remote configuration file, abstracting away where that is stored on
1176
        ## # the server.  However at the moment it always falls back to using the
1177
        ## # vfs, and this would need some changes in config.py.
3408.3.1 by Martin Pool
Remove erroneous handling of branch.conf for RemoteBranch
1178
3407.2.10 by Martin Pool
Merge trunk
1179
        ## # in an empty branch we decode the response properly
1180
        ## client = FakeClient([(('ok', ), '# config file body')], self.get_url())
1181
        ## # we need to make a real branch because the remote_branch.control_files
1182
        ## # will trigger _ensure_real.
1183
        ## branch = self.make_branch('quack')
1184
        ## transport = branch.bzrdir.root_transport
1185
        ## # we do not want bzrdir to make any remote calls
1186
        ## bzrdir = RemoteBzrDir(transport, _client=False)
1187
        ## branch = RemoteBranch(bzrdir, None, _client=client)
1188
        ## config = branch.get_config()
1189
        ## self.assertEqual(
1190
        ##     [('call_expecting_body', 'Branch.get_config_file', ('quack/',))],
1191
        ##     client._calls)
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1192
1193
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1194
class TestBranchLockWrite(RemoteBranchTestCase):
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.
1195
1196
    def test_lock_write_unlockable(self):
1197
        transport = MemoryTransport()
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1198
        client = FakeClient(transport.base)
3691.2.9 by Martin Pool
Convert and update more test_remote tests
1199
        client.add_expected_call(
1200
            'Branch.get_stacked_on_url', ('quack/',),
1201
            'error', ('NotStacked',),)
1202
        client.add_expected_call(
1203
            'Branch.lock_write', ('quack/', '', ''),
1204
            'error', ('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.
1205
        transport.mkdir('quack')
1206
        transport = transport.clone('quack')
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1207
        branch = self.make_remote_branch(transport, client)
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.
1208
        self.assertRaises(errors.UnlockableTransport, branch.lock_write)
3691.2.9 by Martin Pool
Convert and update more test_remote tests
1209
        client.finished_test()
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.
1210
1211
2466.2.2 by Andrew Bennetts
Add tests for RemoteTransport.is_readonly in the style of the other remote object tests.
1212
class TestTransportIsReadonly(tests.TestCase):
1213
1214
    def test_true(self):
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1215
        client = FakeClient()
1216
        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.
1217
        transport = RemoteTransport('bzr://example.com/', medium=False,
1218
                                    _client=client)
1219
        self.assertEqual(True, transport.is_readonly())
1220
        self.assertEqual(
1221
            [('call', 'Transport.is_readonly', ())],
1222
            client._calls)
1223
1224
    def test_false(self):
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1225
        client = FakeClient()
1226
        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.
1227
        transport = RemoteTransport('bzr://example.com/', medium=False,
1228
                                    _client=client)
1229
        self.assertEqual(False, transport.is_readonly())
1230
        self.assertEqual(
1231
            [('call', 'Transport.is_readonly', ())],
1232
            client._calls)
1233
1234
    def test_error_from_old_server(self):
1235
        """bzr 0.15 and earlier servers don't recognise the is_readonly verb.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1236
2466.2.2 by Andrew Bennetts
Add tests for RemoteTransport.is_readonly in the style of the other remote object tests.
1237
        Clients should treat it as a "no" response, because is_readonly is only
1238
        advisory anyway (a transport could be read-write, but then the
1239
        underlying filesystem could be readonly anyway).
1240
        """
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1241
        client = FakeClient()
1242
        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.
1243
        transport = RemoteTransport('bzr://example.com/', medium=False,
1244
                                    _client=client)
1245
        self.assertEqual(False, transport.is_readonly())
1246
        self.assertEqual(
1247
            [('call', 'Transport.is_readonly', ())],
1248
            client._calls)
1249
2466.2.2 by Andrew Bennetts
Add tests for RemoteTransport.is_readonly in the style of the other remote object tests.
1250
3840.1.1 by Andrew Bennetts
Fix RemoteTransport's translation of errors involving paths; it wasn't passing orig_path to _translate_error.
1251
class TestTransportMkdir(tests.TestCase):
1252
1253
    def test_permissiondenied(self):
1254
        client = FakeClient()
1255
        client.add_error_response('PermissionDenied', 'remote path', 'extra')
1256
        transport = RemoteTransport('bzr://example.com/', medium=False,
1257
                                    _client=client)
1258
        exc = self.assertRaises(
1259
            errors.PermissionDenied, transport.mkdir, 'client path')
1260
        expected_error = errors.PermissionDenied('/client path', 'extra')
1261
        self.assertEqual(expected_error, exc)
1262
1263
3777.1.3 by Aaron Bentley
Use SSH default username from authentication.conf
1264
class TestRemoteSSHTransportAuthentication(tests.TestCaseInTempDir):
1265
1266
    def test_defaults_to_none(self):
1267
        t = RemoteSSHTransport('bzr+ssh://example.com')
1268
        self.assertIs(None, t._get_credentials()[0])
1269
1270
    def test_uses_authentication_config(self):
1271
        conf = config.AuthenticationConfig()
1272
        conf._get_config().update(
1273
            {'bzr+sshtest': {'scheme': 'ssh', 'user': 'bar', 'host':
1274
            'example.com'}})
1275
        conf._save()
1276
        t = RemoteSSHTransport('bzr+ssh://example.com')
1277
        self.assertEqual('bar', t._get_credentials()[0])
1278
1279
4017.3.4 by Robert Collins
Create a verb for Repository.set_make_working_trees.
1280
class TestRemoteRepository(TestRemote):
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
1281
    """Base for testing RemoteRepository protocol usage.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1282
1283
    These tests contain frozen requests and responses.  We want any changes to
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
1284
    what is sent or expected to be require a thoughtful update to these tests
1285
    because they might break compatibility with different-versioned servers.
1286
    """
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1287
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1288
    def setup_fake_client_and_repository(self, transport_path):
2018.18.7 by Martin Pool
(broken) Start addng client proxy test for Repository.tarball
1289
        """Create the fake client and repository for testing with.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1290
2018.18.7 by Martin Pool
(broken) Start addng client proxy test for Repository.tarball
1291
        There's no real server here; we just have canned responses sent
1292
        back one by one.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1293
2018.18.7 by Martin Pool
(broken) Start addng client proxy test for Repository.tarball
1294
        :param transport_path: Path below the root of the MemoryTransport
1295
            where the repository will be created.
1296
        """
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1297
        transport = MemoryTransport()
1298
        transport.mkdir(transport_path)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1299
        client = FakeClient(transport.base)
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1300
        transport = transport.clone(transport_path)
1301
        # we do not want bzrdir to make any remote calls
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
1302
        bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
1303
            _client=False)
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1304
        repo = RemoteRepository(bzrdir, None, _client=client)
1305
        return repo, client
1306
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1307
2018.12.2 by Andrew Bennetts
Remove some duplicate code in test_remote
1308
class TestRepositoryGatherStats(TestRemoteRepository):
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
1309
1310
    def test_revid_none(self):
1311
        # ('ok',), body with revisions and size
1312
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1313
        repo, client = self.setup_fake_client_and_repository(transport_path)
1314
        client.add_success_response_with_body(
1315
            'revisions: 2\nsize: 18\n', 'ok')
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
1316
        result = repo.gather_stats(None)
1317
        self.assertEqual(
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
1318
            [('call_expecting_body', 'Repository.gather_stats',
3104.4.2 by Andrew Bennetts
All tests passing.
1319
             ('quack/','','no'))],
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
1320
            client._calls)
1321
        self.assertEqual({'revisions': 2, 'size': 18}, result)
1322
1323
    def test_revid_no_committers(self):
1324
        # ('ok',), body without committers
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1325
        body = ('firstrev: 123456.300 3600\n'
1326
                'latestrev: 654231.400 0\n'
1327
                'revisions: 2\n'
1328
                'size: 18\n')
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
1329
        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.
1330
        revid = u'\xc8'.encode('utf8')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1331
        repo, client = self.setup_fake_client_and_repository(transport_path)
1332
        client.add_success_response_with_body(body, 'ok')
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
1333
        result = repo.gather_stats(revid)
1334
        self.assertEqual(
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
1335
            [('call_expecting_body', 'Repository.gather_stats',
3104.4.2 by Andrew Bennetts
All tests passing.
1336
              ('quick/', revid, 'no'))],
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
1337
            client._calls)
1338
        self.assertEqual({'revisions': 2, 'size': 18,
1339
                          'firstrev': (123456.300, 3600),
1340
                          'latestrev': (654231.400, 0),},
1341
                         result)
1342
1343
    def test_revid_with_committers(self):
1344
        # ('ok',), body with committers
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1345
        body = ('committers: 128\n'
1346
                'firstrev: 123456.300 3600\n'
1347
                'latestrev: 654231.400 0\n'
1348
                'revisions: 2\n'
1349
                'size: 18\n')
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
1350
        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.
1351
        revid = u'\xc8'.encode('utf8')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1352
        repo, client = self.setup_fake_client_and_repository(transport_path)
1353
        client.add_success_response_with_body(body, 'ok')
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
1354
        result = repo.gather_stats(revid, True)
1355
        self.assertEqual(
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
1356
            [('call_expecting_body', 'Repository.gather_stats',
3104.4.2 by Andrew Bennetts
All tests passing.
1357
              ('buick/', revid, 'yes'))],
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
1358
            client._calls)
1359
        self.assertEqual({'revisions': 2, 'size': 18,
1360
                          'committers': 128,
1361
                          'firstrev': (123456.300, 3600),
1362
                          'latestrev': (654231.400, 0),},
1363
                         result)
1364
1365
3172.5.4 by Robert Collins
Implement get_parent_map for RemoteRepository with caching, based on get_revision_graph.
1366
class TestRepositoryGetGraph(TestRemoteRepository):
1367
1368
    def test_get_graph(self):
3835.1.6 by Aaron Bentley
Reduce inefficiency when doing make_parents_provider frequently
1369
        # get_graph returns a graph with a custom parents provider.
3172.5.4 by Robert Collins
Implement get_parent_map for RemoteRepository with caching, based on get_revision_graph.
1370
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1371
        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.
1372
        graph = repo.get_graph()
3835.1.6 by Aaron Bentley
Reduce inefficiency when doing make_parents_provider frequently
1373
        self.assertNotEqual(graph._parents_provider, repo)
3172.5.4 by Robert Collins
Implement get_parent_map for RemoteRepository with caching, based on get_revision_graph.
1374
1375
1376
class TestRepositoryGetParentMap(TestRemoteRepository):
1377
1378
    def test_get_parent_map_caching(self):
1379
        # get_parent_map returns from cache until unlock()
1380
        # setup a reponse with two revisions
1381
        r1 = u'\u0e33'.encode('utf8')
1382
        r2 = u'\u0dab'.encode('utf8')
1383
        lines = [' '.join([r2, r1]), r1]
3211.5.2 by Robert Collins
Change RemoteRepository.get_parent_map to use bz2 not gzip for compression.
1384
        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.
1385
1386
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1387
        repo, client = self.setup_fake_client_and_repository(transport_path)
1388
        client.add_success_response_with_body(encoded_body, 'ok')
1389
        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.
1390
        repo.lock_read()
1391
        graph = repo.get_graph()
1392
        parents = graph.get_parent_map([r2])
1393
        self.assertEqual({r2: (r1,)}, parents)
1394
        # locking and unlocking deeper should not reset
1395
        repo.lock_read()
1396
        repo.unlock()
1397
        parents = graph.get_parent_map([r1])
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
1398
        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.
1399
        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.
1400
            [('call_with_body_bytes_expecting_body',
1401
              '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.
1402
            client._calls)
1403
        repo.unlock()
1404
        # now we call again, and it should use the second response.
1405
        repo.lock_read()
1406
        graph = repo.get_graph()
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
1407
        parents = graph.get_parent_map([r1])
1408
        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.
1409
        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.
1410
            [('call_with_body_bytes_expecting_body',
1411
              'Repository.get_parent_map', ('quack/', r2), '\n\n0'),
1412
             ('call_with_body_bytes_expecting_body',
1413
              '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.
1414
            ],
1415
            client._calls)
1416
        repo.unlock()
1417
3213.1.2 by Andrew Bennetts
Add test for reconnection if get_parent_map is unknown by the server.
1418
    def test_get_parent_map_reconnects_if_unknown_method(self):
1419
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1420
        repo, client = self.setup_fake_client_and_repository(transport_path)
3842.3.20 by Andrew Bennetts
Re-revert changes from another thread that accidentally got reinstated here.
1421
        client.add_unknown_method_response('Repository,get_parent_map')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1422
        client.add_success_response_with_body('', 'ok')
3453.4.10 by Andrew Bennetts
Change _is_remote_at_least to _is_remote_before.
1423
        self.assertFalse(client._medium._is_remote_before((1, 2)))
3213.1.2 by Andrew Bennetts
Add test for reconnection if get_parent_map is unknown by the server.
1424
        rev_id = 'revision-id'
3297.3.5 by Andrew Bennetts
Suppress a deprecation warning.
1425
        expected_deprecations = [
1426
            'bzrlib.remote.RemoteRepository.get_revision_graph was deprecated '
1427
            'in version 1.4.']
1428
        parents = self.callDeprecated(
1429
            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.
1430
        self.assertEqual(
3213.1.8 by Andrew Bennetts
Merge from bzr.dev.
1431
            [('call_with_body_bytes_expecting_body',
1432
              '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.
1433
             ('disconnect medium',),
1434
             ('call_expecting_body', 'Repository.get_revision_graph',
1435
              ('quack/', ''))],
1436
            client._calls)
3389.1.2 by Andrew Bennetts
Add test for the bug John found.
1437
        # The medium is now marked as being connected to an older server
3453.4.10 by Andrew Bennetts
Change _is_remote_at_least to _is_remote_before.
1438
        self.assertTrue(client._medium._is_remote_before((1, 2)))
3389.1.2 by Andrew Bennetts
Add test for the bug John found.
1439
1440
    def test_get_parent_map_fallback_parentless_node(self):
1441
        """get_parent_map falls back to get_revision_graph on old servers.  The
1442
        results from get_revision_graph are tweaked to match the get_parent_map
1443
        API.
1444
3389.1.3 by Andrew Bennetts
Remove XXX from test description.
1445
        Specifically, a {key: ()} result from get_revision_graph means "no
3389.1.2 by Andrew Bennetts
Add test for the bug John found.
1446
        parents" for that key, which in get_parent_map results should be
3389.1.3 by Andrew Bennetts
Remove XXX from test description.
1447
        represented as {key: ('null:',)}.
3389.1.2 by Andrew Bennetts
Add test for the bug John found.
1448
1449
        This is the test for https://bugs.launchpad.net/bzr/+bug/214894
1450
        """
1451
        rev_id = 'revision-id'
1452
        transport_path = 'quack'
3245.4.40 by Andrew Bennetts
Merge from bzr.dev.
1453
        repo, client = self.setup_fake_client_and_repository(transport_path)
1454
        client.add_success_response_with_body(rev_id, 'ok')
3453.4.9 by Andrew Bennetts
Rename _remote_is_not to _remember_remote_is_before.
1455
        client._medium._remember_remote_is_before((1, 2))
3389.1.2 by Andrew Bennetts
Add test for the bug John found.
1456
        expected_deprecations = [
1457
            'bzrlib.remote.RemoteRepository.get_revision_graph was deprecated '
1458
            'in version 1.4.']
1459
        parents = self.callDeprecated(
1460
            expected_deprecations, repo.get_parent_map, [rev_id])
1461
        self.assertEqual(
1462
            [('call_expecting_body', 'Repository.get_revision_graph',
1463
             ('quack/', ''))],
1464
            client._calls)
1465
        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.
1466
3297.2.3 by Andrew Bennetts
Test the code path that the typo is on.
1467
    def test_get_parent_map_unexpected_response(self):
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1468
        repo, client = self.setup_fake_client_and_repository('path')
1469
        client.add_success_response('something unexpected!')
3297.2.3 by Andrew Bennetts
Test the code path that the typo is on.
1470
        self.assertRaises(
1471
            errors.UnexpectedSmartServerResponse,
1472
            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.
1473
3172.5.4 by Robert Collins
Implement get_parent_map for RemoteRepository with caching, based on get_revision_graph.
1474
3835.1.15 by Aaron Bentley
Allow miss caching to be disabled.
1475
class TestGetParentMapAllowsNew(tests.TestCaseWithTransport):
1476
1477
    def test_allows_new_revisions(self):
1478
        """get_parent_map's results can be updated by commit."""
1479
        smart_server = server.SmartTCPServer_for_testing()
1480
        smart_server.setUp()
1481
        self.addCleanup(smart_server.tearDown)
1482
        self.make_branch('branch')
1483
        branch = Branch.open(smart_server.get_url() + '/branch')
1484
        tree = branch.create_checkout('tree', lightweight=True)
1485
        tree.lock_write()
1486
        self.addCleanup(tree.unlock)
1487
        graph = tree.branch.repository.get_graph()
1488
        # This provides an opportunity for the missing rev-id to be cached.
1489
        self.assertEqual({}, graph.get_parent_map(['rev1']))
1490
        tree.commit('message', rev_id='rev1')
1491
        graph = tree.branch.repository.get_graph()
1492
        self.assertEqual({'rev1': ('null:',)}, graph.get_parent_map(['rev1']))
1493
1494
2018.5.68 by Wouter van Heyst
Merge RemoteRepository.gather_stats.
1495
class TestRepositoryGetRevisionGraph(TestRemoteRepository):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1496
2018.5.68 by Wouter van Heyst
Merge RemoteRepository.gather_stats.
1497
    def test_null_revision(self):
1498
        # a null revision has the predictable result {}, we should have no wire
1499
        # traffic when calling it with this argument
1500
        transport_path = 'empty'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1501
        repo, client = self.setup_fake_client_and_repository(transport_path)
1502
        client.add_success_response('notused')
3287.6.4 by Robert Collins
Fix up deprecation warnings for get_revision_graph.
1503
        result = self.applyDeprecated(one_four, repo.get_revision_graph,
1504
            NULL_REVISION)
2018.5.68 by Wouter van Heyst
Merge RemoteRepository.gather_stats.
1505
        self.assertEqual([], client._calls)
1506
        self.assertEqual({}, result)
1507
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1508
    def test_none_revision(self):
1509
        # 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.
1510
        r1 = u'\u0e33'.encode('utf8')
1511
        r2 = u'\u0dab'.encode('utf8')
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1512
        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.
1513
        encoded_body = '\n'.join(lines)
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1514
1515
        transport_path = 'sinhala'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1516
        repo, client = self.setup_fake_client_and_repository(transport_path)
1517
        client.add_success_response_with_body(encoded_body, 'ok')
3287.6.4 by Robert Collins
Fix up deprecation warnings for get_revision_graph.
1518
        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)
1519
        self.assertEqual(
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
1520
            [('call_expecting_body', 'Repository.get_revision_graph',
3104.4.2 by Andrew Bennetts
All tests passing.
1521
             ('sinhala/', ''))],
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1522
            client._calls)
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
1523
        self.assertEqual({r1: (), r2: (r1, )}, result)
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1524
1525
    def test_specific_revision(self):
1526
        # with a specific revision we want the graph for that
1527
        # 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.
1528
        r11 = u'\u0e33'.encode('utf8')
1529
        r12 = u'\xc9'.encode('utf8')
1530
        r2 = u'\u0dab'.encode('utf8')
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1531
        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.
1532
        encoded_body = '\n'.join(lines)
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1533
1534
        transport_path = 'sinhala'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1535
        repo, client = self.setup_fake_client_and_repository(transport_path)
1536
        client.add_success_response_with_body(encoded_body, 'ok')
3287.6.4 by Robert Collins
Fix up deprecation warnings for get_revision_graph.
1537
        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)
1538
        self.assertEqual(
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
1539
            [('call_expecting_body', 'Repository.get_revision_graph',
3104.4.2 by Andrew Bennetts
All tests passing.
1540
             ('sinhala/', r2))],
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1541
            client._calls)
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
1542
        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)
1543
1544
    def test_no_such_revision(self):
1545
        revid = '123'
1546
        transport_path = 'sinhala'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1547
        repo, client = self.setup_fake_client_and_repository(transport_path)
1548
        client.add_error_response('nosuchrevision', revid)
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1549
        # 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
1550
        self.assertRaises(errors.NoSuchRevision,
3287.6.4 by Robert Collins
Fix up deprecation warnings for get_revision_graph.
1551
            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)
1552
        self.assertEqual(
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
1553
            [('call_expecting_body', 'Repository.get_revision_graph',
3104.4.2 by Andrew Bennetts
All tests passing.
1554
             ('sinhala/', revid))],
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1555
            client._calls)
1556
3245.4.53 by Andrew Bennetts
Add some missing 'raise' statements to test_remote.
1557
    def test_unexpected_error(self):
1558
        revid = '123'
1559
        transport_path = 'sinhala'
1560
        repo, client = self.setup_fake_client_and_repository(transport_path)
1561
        client.add_error_response('AnUnexpectedError')
3690.1.2 by Andrew Bennetts
Rename UntranslateableErrorFromSmartServer -> UnknownErrorFromSmartServer.
1562
        e = self.assertRaises(errors.UnknownErrorFromSmartServer,
3245.4.53 by Andrew Bennetts
Add some missing 'raise' statements to test_remote.
1563
            self.applyDeprecated, one_four, repo.get_revision_graph, revid)
1564
        self.assertEqual(('AnUnexpectedError',), e.error_tuple)
1565
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1566
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1567
class TestRepositoryIsShared(TestRemoteRepository):
1568
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1569
    def test_is_shared(self):
1570
        # ('yes', ) for Repository.is_shared -> 'True'.
1571
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1572
        repo, client = self.setup_fake_client_and_repository(transport_path)
1573
        client.add_success_response('yes')
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1574
        result = repo.is_shared()
1575
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
1576
            [('call', 'Repository.is_shared', ('quack/',))],
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1577
            client._calls)
1578
        self.assertEqual(True, result)
1579
1580
    def test_is_not_shared(self):
1581
        # ('no', ) for Repository.is_shared -> 'False'.
1582
        transport_path = 'qwack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1583
        repo, client = self.setup_fake_client_and_repository(transport_path)
1584
        client.add_success_response('no')
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1585
        result = repo.is_shared()
1586
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
1587
            [('call', 'Repository.is_shared', ('qwack/',))],
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1588
            client._calls)
1589
        self.assertEqual(False, result)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1590
1591
1592
class TestRepositoryLockWrite(TestRemoteRepository):
1593
1594
    def test_lock_write(self):
1595
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1596
        repo, client = self.setup_fake_client_and_repository(transport_path)
1597
        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
1598
        result = repo.lock_write()
1599
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
1600
            [('call', 'Repository.lock_write', ('quack/', ''))],
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1601
            client._calls)
1602
        self.assertEqual('a token', result)
1603
1604
    def test_lock_write_already_locked(self):
1605
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1606
        repo, client = self.setup_fake_client_and_repository(transport_path)
1607
        client.add_error_response('LockContention')
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1608
        self.assertRaises(errors.LockContention, repo.lock_write)
1609
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
1610
            [('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.
1611
            client._calls)
1612
1613
    def test_lock_write_unlockable(self):
1614
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1615
        repo, client = self.setup_fake_client_and_repository(transport_path)
1616
        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.
1617
        self.assertRaises(errors.UnlockableTransport, repo.lock_write)
1618
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
1619
            [('call', 'Repository.lock_write', ('quack/', ''))],
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1620
            client._calls)
1621
1622
4017.3.4 by Robert Collins
Create a verb for Repository.set_make_working_trees.
1623
class TestRepositorySetMakeWorkingTrees(TestRemoteRepository):
1624
1625
    def test_backwards_compat(self):
1626
        self.setup_smart_server_with_call_log()
1627
        repo = self.make_repository('.')
1628
        self.reset_smart_call_log()
1629
        verb = 'Repository.set_make_working_trees'
1630
        self.disable_verb(verb)
1631
        repo.set_make_working_trees(True)
1632
        call_count = len([call for call in self.hpss_calls if
4070.3.1 by Robert Collins
Alter branch sprouting with an alternate fix for stacked branches that does not require multiple copy_content_into and set_parent calls, reducing IO and round trips.
1633
            call.call.method == verb])
4017.3.4 by Robert Collins
Create a verb for Repository.set_make_working_trees.
1634
        self.assertEqual(1, call_count)
1635
1636
    def test_current(self):
1637
        transport_path = 'quack'
1638
        repo, client = self.setup_fake_client_and_repository(transport_path)
1639
        client.add_expected_call(
1640
            'Repository.set_make_working_trees', ('quack/', 'True'),
1641
            'success', ('ok',))
1642
        client.add_expected_call(
1643
            'Repository.set_make_working_trees', ('quack/', 'False'),
1644
            'success', ('ok',))
1645
        repo.set_make_working_trees(True)
1646
        repo.set_make_working_trees(False)
1647
1648
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1649
class TestRepositoryUnlock(TestRemoteRepository):
1650
1651
    def test_unlock(self):
1652
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1653
        repo, client = self.setup_fake_client_and_repository(transport_path)
1654
        client.add_success_response('ok', 'a token')
1655
        client.add_success_response('ok')
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1656
        repo.lock_write()
1657
        repo.unlock()
1658
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
1659
            [('call', 'Repository.lock_write', ('quack/', '')),
1660
             ('call', 'Repository.unlock', ('quack/', 'a token'))],
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1661
            client._calls)
1662
1663
    def test_unlock_wrong_token(self):
1664
        # If somehow the token is wrong, unlock will raise TokenMismatch.
1665
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1666
        repo, client = self.setup_fake_client_and_repository(transport_path)
1667
        client.add_success_response('ok', 'a token')
1668
        client.add_error_response('TokenMismatch')
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1669
        repo.lock_write()
1670
        self.assertRaises(errors.TokenMismatch, repo.unlock)
1671
1672
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1673
class TestRepositoryHasRevision(TestRemoteRepository):
1674
1675
    def test_none(self):
1676
        # repo.has_revision(None) should not cause any traffic.
1677
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1678
        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.
1679
1680
        # The null revision is always there, so has_revision(None) == True.
3172.3.3 by Robert Collins
Missed one occurence of None -> NULL_REVISION.
1681
        self.assertEqual(True, repo.has_revision(NULL_REVISION))
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1682
1683
        # The remote repo shouldn't be accessed.
1684
        self.assertEqual([], client._calls)
2018.18.7 by Martin Pool
(broken) Start addng client proxy test for Repository.tarball
1685
1686
1687
class TestRepositoryTarball(TestRemoteRepository):
1688
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
1689
    # This is a canned tarball reponse we can validate against
2018.18.18 by Martin Pool
reformat
1690
    tarball_content = (
2018.18.23 by Martin Pool
review cleanups
1691
        'QlpoOTFBWSZTWdGkj3wAAWF/k8aQACBIB//A9+8cIX/v33AACEAYABAECEACNz'
1692
        'JqsgJJFPTSnk1A3qh6mTQAAAANPUHkagkSTEkaA09QaNAAAGgAAAcwCYCZGAEY'
1693
        'mJhMJghpiaYBUkKammSHqNMZQ0NABkNAeo0AGneAevnlwQoGzEzNVzaYxp/1Uk'
1694
        'xXzA1CQX0BJMZZLcPBrluJir5SQyijWHYZ6ZUtVqqlYDdB2QoCwa9GyWwGYDMA'
1695
        'OQYhkpLt/OKFnnlT8E0PmO8+ZNSo2WWqeCzGB5fBXZ3IvV7uNJVE7DYnWj6qwB'
1696
        'k5DJDIrQ5OQHHIjkS9KqwG3mc3t+F1+iujb89ufyBNIKCgeZBWrl5cXxbMGoMs'
1697
        'c9JuUkg5YsiVcaZJurc6KLi6yKOkgCUOlIlOpOoXyrTJjK8ZgbklReDdwGmFgt'
1698
        'dkVsAIslSVCd4AtACSLbyhLHryfb14PKegrVDba+U8OL6KQtzdM5HLjAc8/p6n'
1699
        '0lgaWU8skgO7xupPTkyuwheSckejFLK5T4ZOo0Gda9viaIhpD1Qn7JqqlKAJqC'
1700
        'QplPKp2nqBWAfwBGaOwVrz3y1T+UZZNismXHsb2Jq18T+VaD9k4P8DqE3g70qV'
1701
        'JLurpnDI6VS5oqDDPVbtVjMxMxMg4rzQVipn2Bv1fVNK0iq3Gl0hhnnHKm/egy'
1702
        'nWQ7QH/F3JFOFCQ0aSPfA='
1703
        ).decode('base64')
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
1704
2018.18.7 by Martin Pool
(broken) Start addng client proxy test for Repository.tarball
1705
    def test_repository_tarball(self):
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
1706
        # Test that Repository.tarball generates the right operations
2018.18.7 by Martin Pool
(broken) Start addng client proxy test for Repository.tarball
1707
        transport_path = 'repo'
2018.18.14 by Martin Pool
merge hpss again; restore incorrectly removed RemoteRepository.break_lock
1708
        expected_calls = [('call_expecting_body', 'Repository.tarball',
3104.4.2 by Andrew Bennetts
All tests passing.
1709
                           ('repo/', 'bz2',),),
2018.18.7 by Martin Pool
(broken) Start addng client proxy test for Repository.tarball
1710
            ]
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1711
        repo, client = self.setup_fake_client_and_repository(transport_path)
1712
        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
1713
        # Now actually ask for the tarball
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1714
        tarball_file = repo._get_tarball('bz2')
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1715
        try:
1716
            self.assertEqual(expected_calls, client._calls)
1717
            self.assertEqual(self.tarball_content, tarball_file.read())
1718
        finally:
1719
            tarball_file.close()
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
1720
1721
1722
class TestRemoteRepositoryCopyContent(tests.TestCaseWithTransport):
1723
    """RemoteRepository.copy_content_into optimizations"""
1724
2018.18.10 by Martin Pool
copy_content_into from Remote repositories by using temporary directories on both ends.
1725
    def test_copy_content_remote_to_local(self):
1726
        self.transport_server = server.SmartTCPServer_for_testing
1727
        src_repo = self.make_repository('repo1')
1728
        src_repo = repository.Repository.open(self.get_url('repo1'))
1729
        # At the moment the tarball-based copy_content_into can't write back
1730
        # into a smart server.  It would be good if it could upload the
1731
        # tarball; once that works we'd have to create repositories of
1732
        # different formats. -- mbp 20070410
1733
        dest_url = self.get_vfs_only_url('repo2')
1734
        dest_bzrdir = BzrDir.create(dest_url)
1735
        dest_repo = dest_bzrdir.create_repository()
1736
        self.assertFalse(isinstance(dest_repo, RemoteRepository))
1737
        self.assertTrue(isinstance(src_repo, RemoteRepository))
1738
        src_repo.copy_content_into(dest_repo)
3533.3.3 by Andrew Bennetts
Add unit tests for bzrlib.remote._translate_error.
1739
1740
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
1741
class _StubRealPackRepository(object):
1742
1743
    def __init__(self, calls):
1744
        self._pack_collection = _StubPackCollection(calls)
1745
1746
1747
class _StubPackCollection(object):
1748
1749
    def __init__(self, calls):
1750
        self.calls = calls
1751
1752
    def autopack(self):
1753
        self.calls.append(('pack collection autopack',))
1754
3801.1.13 by Andrew Bennetts
Revert returning of pack-names from the RPC.
1755
    def reload_pack_names(self):
1756
        self.calls.append(('pack collection reload_pack_names',))
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
1757
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1758
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
1759
class TestRemotePackRepositoryAutoPack(TestRemoteRepository):
1760
    """Tests for RemoteRepository.autopack implementation."""
1761
1762
    def test_ok(self):
1763
        """When the server returns 'ok' and there's no _real_repository, then
1764
        nothing else happens: the autopack method is done.
1765
        """
1766
        transport_path = 'quack'
1767
        repo, client = self.setup_fake_client_and_repository(transport_path)
1768
        client.add_expected_call(
3801.1.13 by Andrew Bennetts
Revert returning of pack-names from the RPC.
1769
            'PackRepository.autopack', ('quack/',), 'success', ('ok',))
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
1770
        repo.autopack()
1771
        client.finished_test()
1772
1773
    def test_ok_with_real_repo(self):
1774
        """When the server returns 'ok' and there is a _real_repository, then
1775
        the _real_repository's reload_pack_name's method will be called.
1776
        """
1777
        transport_path = 'quack'
1778
        repo, client = self.setup_fake_client_and_repository(transport_path)
1779
        client.add_expected_call(
1780
            'PackRepository.autopack', ('quack/',),
3801.1.13 by Andrew Bennetts
Revert returning of pack-names from the RPC.
1781
            'success', ('ok',))
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
1782
        repo._real_repository = _StubRealPackRepository(client._calls)
1783
        repo.autopack()
1784
        self.assertEqual(
1785
            [('call', 'PackRepository.autopack', ('quack/',)),
3801.1.13 by Andrew Bennetts
Revert returning of pack-names from the RPC.
1786
             ('pack collection reload_pack_names',)],
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
1787
            client._calls)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1788
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
1789
    def test_backwards_compatibility(self):
1790
        """If the server does not recognise the PackRepository.autopack verb,
1791
        fallback to the real_repository's implementation.
1792
        """
1793
        transport_path = 'quack'
1794
        repo, client = self.setup_fake_client_and_repository(transport_path)
1795
        client.add_unknown_method_response('PackRepository.autopack')
1796
        def stub_ensure_real():
1797
            client._calls.append(('_ensure_real',))
1798
            repo._real_repository = _StubRealPackRepository(client._calls)
1799
        repo._ensure_real = stub_ensure_real
1800
        repo.autopack()
1801
        self.assertEqual(
1802
            [('call', 'PackRepository.autopack', ('quack/',)),
1803
             ('_ensure_real',),
1804
             ('pack collection autopack',)],
1805
            client._calls)
1806
1807
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
1808
class TestErrorTranslationBase(tests.TestCaseWithMemoryTransport):
1809
    """Base class for unit tests for bzrlib.remote._translate_error."""
1810
1811
    def translateTuple(self, error_tuple, **context):
1812
        """Call _translate_error with an ErrorFromSmartServer built from the
1813
        given error_tuple.
1814
1815
        :param error_tuple: A tuple of a smart server response, as would be
1816
            passed to an ErrorFromSmartServer.
1817
        :kwargs context: context items to call _translate_error with.
1818
1819
        :returns: The error raised by _translate_error.
1820
        """
1821
        # Raise the ErrorFromSmartServer before passing it as an argument,
1822
        # because _translate_error may need to re-raise it with a bare 'raise'
1823
        # statement.
1824
        server_error = errors.ErrorFromSmartServer(error_tuple)
1825
        translated_error = self.translateErrorFromSmartServer(
1826
            server_error, **context)
1827
        return translated_error
1828
1829
    def translateErrorFromSmartServer(self, error_object, **context):
1830
        """Like translateTuple, but takes an already constructed
1831
        ErrorFromSmartServer rather than a tuple.
1832
        """
1833
        try:
1834
            raise error_object
1835
        except errors.ErrorFromSmartServer, server_error:
1836
            translated_error = self.assertRaises(
1837
                errors.BzrError, remote._translate_error, server_error,
1838
                **context)
1839
        return translated_error
1840
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
1841
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
1842
class TestErrorTranslationSuccess(TestErrorTranslationBase):
3533.3.3 by Andrew Bennetts
Add unit tests for bzrlib.remote._translate_error.
1843
    """Unit tests for bzrlib.remote._translate_error.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1844
3533.3.3 by Andrew Bennetts
Add unit tests for bzrlib.remote._translate_error.
1845
    Given an ErrorFromSmartServer (which has an error tuple from a smart
1846
    server) and some context, _translate_error raises more specific errors from
1847
    bzrlib.errors.
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
1848
1849
    This test case covers the cases where _translate_error succeeds in
1850
    translating an ErrorFromSmartServer to something better.  See
1851
    TestErrorTranslationRobustness for other cases.
3533.3.3 by Andrew Bennetts
Add unit tests for bzrlib.remote._translate_error.
1852
    """
1853
1854
    def test_NoSuchRevision(self):
1855
        branch = self.make_branch('')
1856
        revid = 'revid'
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
1857
        translated_error = self.translateTuple(
3533.3.3 by Andrew Bennetts
Add unit tests for bzrlib.remote._translate_error.
1858
            ('NoSuchRevision', revid), branch=branch)
1859
        expected_error = errors.NoSuchRevision(branch, revid)
1860
        self.assertEqual(expected_error, translated_error)
1861
1862
    def test_nosuchrevision(self):
1863
        repository = self.make_repository('')
1864
        revid = 'revid'
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
1865
        translated_error = self.translateTuple(
3533.3.3 by Andrew Bennetts
Add unit tests for bzrlib.remote._translate_error.
1866
            ('nosuchrevision', revid), repository=repository)
1867
        expected_error = errors.NoSuchRevision(repository, revid)
1868
        self.assertEqual(expected_error, translated_error)
1869
1870
    def test_nobranch(self):
1871
        bzrdir = self.make_bzrdir('')
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
1872
        translated_error = self.translateTuple(('nobranch',), bzrdir=bzrdir)
3533.3.3 by Andrew Bennetts
Add unit tests for bzrlib.remote._translate_error.
1873
        expected_error = errors.NotBranchError(path=bzrdir.root_transport.base)
1874
        self.assertEqual(expected_error, translated_error)
1875
1876
    def test_LockContention(self):
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
1877
        translated_error = self.translateTuple(('LockContention',))
3533.3.3 by Andrew Bennetts
Add unit tests for bzrlib.remote._translate_error.
1878
        expected_error = errors.LockContention('(remote lock)')
1879
        self.assertEqual(expected_error, translated_error)
1880
1881
    def test_UnlockableTransport(self):
1882
        bzrdir = self.make_bzrdir('')
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
1883
        translated_error = self.translateTuple(
3533.3.3 by Andrew Bennetts
Add unit tests for bzrlib.remote._translate_error.
1884
            ('UnlockableTransport',), bzrdir=bzrdir)
1885
        expected_error = errors.UnlockableTransport(bzrdir.root_transport)
1886
        self.assertEqual(expected_error, translated_error)
1887
1888
    def test_LockFailed(self):
1889
        lock = 'str() of a server lock'
1890
        why = 'str() of why'
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
1891
        translated_error = self.translateTuple(('LockFailed', lock, why))
3533.3.3 by Andrew Bennetts
Add unit tests for bzrlib.remote._translate_error.
1892
        expected_error = errors.LockFailed(lock, why)
1893
        self.assertEqual(expected_error, translated_error)
1894
1895
    def test_TokenMismatch(self):
1896
        token = 'a lock token'
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
1897
        translated_error = self.translateTuple(('TokenMismatch',), token=token)
3533.3.3 by Andrew Bennetts
Add unit tests for bzrlib.remote._translate_error.
1898
        expected_error = errors.TokenMismatch(token, '(remote token)')
1899
        self.assertEqual(expected_error, translated_error)
1900
1901
    def test_Diverged(self):
1902
        branch = self.make_branch('a')
1903
        other_branch = self.make_branch('b')
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
1904
        translated_error = self.translateTuple(
3533.3.3 by Andrew Bennetts
Add unit tests for bzrlib.remote._translate_error.
1905
            ('Diverged',), branch=branch, other_branch=other_branch)
1906
        expected_error = errors.DivergedBranches(branch, other_branch)
1907
        self.assertEqual(expected_error, translated_error)
1908
3786.4.2 by Andrew Bennetts
Add tests and fix code to make sure ReadError and PermissionDenied are robustly handled by _translate_error.
1909
    def test_ReadError_no_args(self):
1910
        path = 'a path'
1911
        translated_error = self.translateTuple(('ReadError',), path=path)
1912
        expected_error = errors.ReadError(path)
1913
        self.assertEqual(expected_error, translated_error)
1914
1915
    def test_ReadError(self):
1916
        path = 'a path'
1917
        translated_error = self.translateTuple(('ReadError', path))
1918
        expected_error = errors.ReadError(path)
1919
        self.assertEqual(expected_error, translated_error)
1920
1921
    def test_PermissionDenied_no_args(self):
1922
        path = 'a path'
1923
        translated_error = self.translateTuple(('PermissionDenied',), path=path)
1924
        expected_error = errors.PermissionDenied(path)
1925
        self.assertEqual(expected_error, translated_error)
1926
1927
    def test_PermissionDenied_one_arg(self):
1928
        path = 'a path'
1929
        translated_error = self.translateTuple(('PermissionDenied', path))
1930
        expected_error = errors.PermissionDenied(path)
1931
        self.assertEqual(expected_error, translated_error)
1932
1933
    def test_PermissionDenied_one_arg_and_context(self):
1934
        """Given a choice between a path from the local context and a path on
1935
        the wire, _translate_error prefers the path from the local context.
1936
        """
1937
        local_path = 'local path'
1938
        remote_path = 'remote path'
1939
        translated_error = self.translateTuple(
1940
            ('PermissionDenied', remote_path), path=local_path)
1941
        expected_error = errors.PermissionDenied(local_path)
1942
        self.assertEqual(expected_error, translated_error)
1943
1944
    def test_PermissionDenied_two_args(self):
1945
        path = 'a path'
1946
        extra = 'a string with extra info'
1947
        translated_error = self.translateTuple(
1948
            ('PermissionDenied', path, extra))
1949
        expected_error = errors.PermissionDenied(path, extra)
1950
        self.assertEqual(expected_error, translated_error)
1951
1952
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
1953
class TestErrorTranslationRobustness(TestErrorTranslationBase):
1954
    """Unit tests for bzrlib.remote._translate_error's robustness.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1955
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
1956
    TestErrorTranslationSuccess is for cases where _translate_error can
1957
    translate successfully.  This class about how _translate_err behaves when
1958
    it fails to translate: it re-raises the original error.
1959
    """
1960
1961
    def test_unrecognised_server_error(self):
1962
        """If the error code from the server is not recognised, the original
1963
        ErrorFromSmartServer is propagated unmodified.
1964
        """
1965
        error_tuple = ('An unknown error tuple',)
3690.1.2 by Andrew Bennetts
Rename UntranslateableErrorFromSmartServer -> UnknownErrorFromSmartServer.
1966
        server_error = errors.ErrorFromSmartServer(error_tuple)
1967
        translated_error = self.translateErrorFromSmartServer(server_error)
1968
        expected_error = errors.UnknownErrorFromSmartServer(server_error)
3690.1.1 by Andrew Bennetts
Unexpected error responses from a smart server no longer cause the client to traceback.
1969
        self.assertEqual(expected_error, translated_error)
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
1970
1971
    def test_context_missing_a_key(self):
1972
        """In case of a bug in the client, or perhaps an unexpected response
1973
        from a server, _translate_error returns the original error tuple from
1974
        the server and mutters a warning.
1975
        """
1976
        # To translate a NoSuchRevision error _translate_error needs a 'branch'
1977
        # in the context dict.  So let's give it an empty context dict instead
1978
        # to exercise its error recovery.
1979
        empty_context = {}
1980
        error_tuple = ('NoSuchRevision', 'revid')
1981
        server_error = errors.ErrorFromSmartServer(error_tuple)
1982
        translated_error = self.translateErrorFromSmartServer(server_error)
1983
        self.assertEqual(server_error, translated_error)
1984
        # In addition to re-raising ErrorFromSmartServer, some debug info has
1985
        # been muttered to the log file for developer to look at.
1986
        self.assertContainsRe(
1987
            self._get_log(keep_log_file=True),
1988
            "Missing key 'branch' in context")
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1989
3786.4.2 by Andrew Bennetts
Add tests and fix code to make sure ReadError and PermissionDenied are robustly handled by _translate_error.
1990
    def test_path_missing(self):
1991
        """Some translations (PermissionDenied, ReadError) can determine the
1992
        'path' variable from either the wire or the local context.  If neither
1993
        has it, then an error is raised.
1994
        """
1995
        error_tuple = ('ReadError',)
1996
        server_error = errors.ErrorFromSmartServer(error_tuple)
1997
        translated_error = self.translateErrorFromSmartServer(server_error)
1998
        self.assertEqual(server_error, translated_error)
1999
        # In addition to re-raising ErrorFromSmartServer, some debug info has
2000
        # been muttered to the log file for developer to look at.
2001
        self.assertContainsRe(
2002
            self._get_log(keep_log_file=True), "Missing key 'path' in context")
2003
3691.2.2 by Martin Pool
Fix some problems in access to stacked repositories over hpss (#261315)
2004
2005
class TestStacking(tests.TestCaseWithTransport):
2006
    """Tests for operations on stacked remote repositories.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2007
3691.2.2 by Martin Pool
Fix some problems in access to stacked repositories over hpss (#261315)
2008
    The underlying format type must support stacking.
2009
    """
2010
2011
    def test_access_stacked_remote(self):
2012
        # based on <http://launchpad.net/bugs/261315>
2013
        # make a branch stacked on another repository containing an empty
2014
        # revision, then open it over hpss - we should be able to see that
2015
        # revision.
2016
        base_transport = self.get_transport()
2017
        base_builder = self.make_branch_builder('base', format='1.6')
2018
        base_builder.start_series()
2019
        base_revid = base_builder.build_snapshot('rev-id', None,
2020
            [('add', ('', None, 'directory', None))],
2021
            'message')
2022
        base_builder.finish_series()
2023
        stacked_branch = self.make_branch('stacked', format='1.6')
2024
        stacked_branch.set_stacked_on_url('../base')
2025
        # start a server looking at this
2026
        smart_server = server.SmartTCPServer_for_testing()
2027
        smart_server.setUp()
2028
        self.addCleanup(smart_server.tearDown)
2029
        remote_bzrdir = BzrDir.open(smart_server.get_url() + '/stacked')
2030
        # can get its branch and repository
2031
        remote_branch = remote_bzrdir.open_branch()
2032
        remote_repo = remote_branch.repository
3691.2.6 by Martin Pool
Disable RemoteBranch stacking, but get get_stacked_on_url working, and passing back exceptions
2033
        remote_repo.lock_read()
2034
        try:
2035
            # it should have an appropriate fallback repository, which should also
2036
            # be a RemoteRepository
2037
            self.assertEquals(len(remote_repo._fallback_repositories), 1)
2038
            self.assertIsInstance(remote_repo._fallback_repositories[0],
2039
                RemoteRepository)
2040
            # and it has the revision committed to the underlying repository;
2041
            # these have varying implementations so we try several of them
2042
            self.assertTrue(remote_repo.has_revisions([base_revid]))
2043
            self.assertTrue(remote_repo.has_revision(base_revid))
2044
            self.assertEqual(remote_repo.get_revision(base_revid).message,
2045
                'message')
2046
        finally:
2047
            remote_repo.unlock()
3835.1.2 by Aaron Bentley
Add tests for get_parent_map
2048
3835.1.7 by Aaron Bentley
Updates from review
2049
    def prepare_stacked_remote_branch(self):
3835.1.2 by Aaron Bentley
Add tests for get_parent_map
2050
        smart_server = server.SmartTCPServer_for_testing()
2051
        smart_server.setUp()
2052
        self.addCleanup(smart_server.tearDown)
2053
        tree1 = self.make_branch_and_tree('tree1')
2054
        tree1.commit('rev1', rev_id='rev1')
2055
        tree2 = self.make_branch_and_tree('tree2', format='1.6')
2056
        tree2.branch.set_stacked_on_url(tree1.branch.base)
2057
        branch2 = Branch.open(smart_server.get_url() + '/tree2')
2058
        branch2.lock_read()
2059
        self.addCleanup(branch2.unlock)
3835.1.7 by Aaron Bentley
Updates from review
2060
        return branch2
2061
2062
    def test_stacked_get_parent_map(self):
2063
        # the public implementation of get_parent_map obeys stacking
2064
        branch = self.prepare_stacked_remote_branch()
2065
        repo = branch.repository
3835.1.2 by Aaron Bentley
Add tests for get_parent_map
2066
        self.assertEqual(['rev1'], repo.get_parent_map(['rev1']).keys())
3835.1.7 by Aaron Bentley
Updates from review
2067
3835.1.10 by Aaron Bentley
Move CachingExtraParentsProvider to Graph
2068
    def test_unstacked_get_parent_map(self):
2069
        # _unstacked_provider.get_parent_map ignores stacking
3835.1.7 by Aaron Bentley
Updates from review
2070
        branch = self.prepare_stacked_remote_branch()
3835.1.10 by Aaron Bentley
Move CachingExtraParentsProvider to Graph
2071
        provider = branch.repository._unstacked_provider
3835.1.8 by Aaron Bentley
Make UnstackedParentsProvider manage the cache
2072
        self.assertEqual([], provider.get_parent_map(['rev1']).keys())
3834.3.3 by John Arbash Meinel
Merge bzr.dev, resolve conflict in tests.
2073
3834.3.2 by Andrew Bennetts
Preserve BzrBranch5's _synchronize_history code without affecting Branch or BzrBranch7; add effort test for RemoteBranch.copy_content_into.
2074
2075
class TestRemoteBranchEffort(tests.TestCaseWithTransport):
2076
2077
    def setUp(self):
2078
        super(TestRemoteBranchEffort, self).setUp()
2079
        # Create a smart server that publishes whatever the backing VFS server
2080
        # does.
2081
        self.smart_server = server.SmartTCPServer_for_testing()
2082
        self.smart_server.setUp(self.get_server())
2083
        self.addCleanup(self.smart_server.tearDown)
2084
        # Log all HPSS calls into self.hpss_calls.
2085
        _SmartClient.hooks.install_named_hook(
2086
            'call', self.capture_hpss_call, None)
2087
        self.hpss_calls = []
2088
2089
    def capture_hpss_call(self, params):
2090
        self.hpss_calls.append(params.method)
2091
2092
    def test_copy_content_into_avoids_revision_history(self):
2093
        local = self.make_branch('local')
2094
        remote_backing_tree = self.make_branch_and_tree('remote')
2095
        remote_backing_tree.commit("Commit.")
2096
        remote_branch_url = self.smart_server.get_url() + 'remote'
2097
        remote_branch = bzrdir.BzrDir.open(remote_branch_url).open_branch()
2098
        local.repository.fetch(remote_branch.repository)
2099
        self.hpss_calls = []
2100
        remote_branch.copy_content_into(local)
3834.3.3 by John Arbash Meinel
Merge bzr.dev, resolve conflict in tests.
2101
        self.assertFalse('Branch.revision_history' in self.hpss_calls)