/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
3948.3.7 by Martin Pool
Updated tests for RemoteRepository.get_parent_map on old servers.
1
# Copyright (C) 2006, 2007, 2008, 2009 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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
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
4222.3.8 by Jelmer Vernooij
Test that for sftp and ssh getpass.getuser() is returned by AuthenticationConfig.get_user() rather than None.
28
import getpass
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
29
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
30
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.
31
    bzrdir,
3777.1.3 by Aaron Bentley
Use SSH default username from authentication.conf
32
    config,
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
33
    errors,
3184.1.9 by Robert Collins
* ``Repository.get_data_stream`` is now deprecated in favour of
34
    graph,
2535.3.39 by Andrew Bennetts
Tidy some XXXs.
35
    pack,
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
36
    remote,
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
37
    repository,
4017.3.2 by Robert Collins
Reduce the number of round trips required to create a repository over the network.
38
    smart,
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
39
    tests,
4190.1.4 by Robert Collins
Cache ghosts when we can get them from a RemoteRepository in get_parent_map.
40
    treebuilder,
3691.2.4 by Martin Pool
Add FakeRemoteTransport to clarify test_remote
41
    urlutils,
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
42
    )
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
43
from bzrlib.branch import Branch
44
from bzrlib.bzrdir import BzrDir, BzrDirFormat
45
from bzrlib.remote import (
46
    RemoteBranch,
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
47
    RemoteBranchFormat,
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
48
    RemoteBzrDir,
49
    RemoteBzrDirFormat,
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
50
    RemoteRepository,
4183.5.1 by Robert Collins
Add RepositoryFormat.fast_deltas to signal fast delta creation.
51
    RemoteRepositoryFormat,
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
52
    )
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
53
from bzrlib.repofmt import groupcompress_repo, pack_repo
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
54
from bzrlib.revision import NULL_REVISION
2432.3.2 by Andrew Bennetts
Add test, and tidy implementation.
55
from bzrlib.smart import server, medium
2018.5.159 by Andrew Bennetts
Rename SmartClient to _SmartClient.
56
from bzrlib.smart.client import _SmartClient
4214.2.1 by Andrew Bennetts
A long but failing test for the get_parent_map RPC bug.
57
from bzrlib.smart.repository import SmartServerRepositoryGetParentMap
4118.1.1 by Andrew Bennetts
Fix performance regression (many small round-trips) when pushing to a remote pack, and tidy the tests.
58
from bzrlib.tests import (
59
    condition_isinstance,
60
    split_suite_by_condition,
61
    multiply_tests,
62
    )
3431.3.11 by Andrew Bennetts
Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.
63
from bzrlib.transport import get_transport, http
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
64
from bzrlib.transport.memory import MemoryTransport
3777.1.3 by Aaron Bentley
Use SSH default username from authentication.conf
65
from bzrlib.transport.remote import (
66
    RemoteTransport,
67
    RemoteSSHTransport,
68
    RemoteTCPTransport,
69
)
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
70
4118.1.1 by Andrew Bennetts
Fix performance regression (many small round-trips) when pushing to a remote pack, and tidy the tests.
71
def load_tests(standard_tests, module, loader):
72
    to_adapt, result = split_suite_by_condition(
73
        standard_tests, condition_isinstance(BasicRemoteObjectTests))
74
    smart_server_version_scenarios = [
4104.4.2 by Robert Collins
Fix test_source for 1.13 landing.
75
        ('HPSS-v2',
4118.1.1 by Andrew Bennetts
Fix performance regression (many small round-trips) when pushing to a remote pack, and tidy the tests.
76
            {'transport_server': server.SmartTCPServer_for_testing_v2_only}),
4104.4.2 by Robert Collins
Fix test_source for 1.13 landing.
77
        ('HPSS-v3',
4118.1.1 by Andrew Bennetts
Fix performance regression (many small round-trips) when pushing to a remote pack, and tidy the tests.
78
            {'transport_server': server.SmartTCPServer_for_testing})]
79
    return multiply_tests(to_adapt, smart_server_version_scenarios, result)
80
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)
81
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
82
class BasicRemoteObjectTests(tests.TestCaseWithTransport):
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
83
84
    def setUp(self):
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
85
        super(BasicRemoteObjectTests, self).setUp()
86
        self.transport = self.get_transport()
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
87
        # 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
88
        self.local_wt = BzrDir.create_standalone_workingtree('.')
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
89
2018.5.171 by Andrew Bennetts
Disconnect RemoteTransports in some tests to avoid tripping up test_strace with leftover threads from previous tests.
90
    def tearDown(self):
91
        self.transport.disconnect()
92
        tests.TestCaseWithTransport.tearDown(self)
93
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
94
    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.
95
        b = remote.RemoteBzrDir(self.transport, remote.RemoteBzrDirFormat())
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
96
        self.assertIsInstance(b, BzrDir)
97
98
    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.
99
        # 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.
100
        b = remote.RemoteBzrDir(self.transport, remote.RemoteBzrDirFormat())
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
101
        branch = b.open_branch()
2018.5.163 by Andrew Bennetts
Deal with various review comments from Robert.
102
        self.assertIsInstance(branch, Branch)
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
103
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
104
    def test_remote_repository(self):
105
        b = BzrDir.open_from_transport(self.transport)
106
        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.
107
        revid = u'\xc823123123'.encode('utf8')
2018.5.40 by Robert Collins
Implement a remote Repository.has_revision method.
108
        self.assertFalse(repo.has_revision(revid))
109
        self.local_wt.commit(message='test commit', rev_id=revid)
110
        self.assertTrue(repo.has_revision(revid))
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
111
112
    def test_remote_branch_revision_history(self):
113
        b = BzrDir.open_from_transport(self.transport).open_branch()
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
114
        self.assertEqual([], b.revision_history())
115
        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.
116
        r2 = self.local_wt.commit('1st commit', rev_id=u'\xc8'.encode('utf8'))
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
117
        self.assertEqual([r1, r2], b.revision_history())
1752.2.31 by Martin Pool
[broken] some support for write operations over hpss
118
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
119
    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)
120
        """Should open a RemoteBzrDir over a RemoteTransport"""
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
121
        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.
122
        self.assertTrue(RemoteBzrDirFormat
123
                        in BzrDirFormat._control_server_formats)
1752.2.30 by Martin Pool
Start adding a RemoteBzrDir, etc
124
        self.assertIsInstance(fmt, remote.RemoteBzrDirFormat)
125
126
    def test_open_detected_smart_format(self):
127
        fmt = BzrDirFormat.find_format(self.transport)
128
        d = fmt.open(self.transport)
129
        self.assertIsInstance(d, BzrDir)
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
130
2477.1.1 by Martin Pool
Add RemoteBranch repr
131
    def test_remote_branch_repr(self):
132
        b = BzrDir.open_from_transport(self.transport).open_branch()
133
        self.assertStartsWith(str(b), 'RemoteBranch(')
134
4103.2.2 by Andrew Bennetts
Fix RemoteBranchFormat.supports_stacking()
135
    def test_remote_branch_format_supports_stacking(self):
136
        t = self.transport
137
        self.make_branch('unstackable', format='pack-0.92')
138
        b = BzrDir.open_from_transport(t.clone('unstackable')).open_branch()
139
        self.assertFalse(b._format.supports_stacking())
140
        self.make_branch('stackable', format='1.9')
141
        b = BzrDir.open_from_transport(t.clone('stackable')).open_branch()
142
        self.assertTrue(b._format.supports_stacking())
143
4118.1.1 by Andrew Bennetts
Fix performance regression (many small round-trips) when pushing to a remote pack, and tidy the tests.
144
    def test_remote_repo_format_supports_external_references(self):
145
        t = self.transport
146
        bd = self.make_bzrdir('unstackable', format='pack-0.92')
147
        r = bd.create_repository()
148
        self.assertFalse(r._format.supports_external_lookups)
149
        r = BzrDir.open_from_transport(t.clone('unstackable')).open_repository()
150
        self.assertFalse(r._format.supports_external_lookups)
151
        bd = self.make_bzrdir('stackable', format='1.9')
152
        r = bd.create_repository()
153
        self.assertTrue(r._format.supports_external_lookups)
154
        r = BzrDir.open_from_transport(t.clone('stackable')).open_repository()
155
        self.assertTrue(r._format.supports_external_lookups)
156
3691.2.4 by Martin Pool
Add FakeRemoteTransport to clarify test_remote
157
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
158
class FakeProtocol(object):
159
    """Lookalike SmartClientRequestProtocolOne allowing body reading tests."""
160
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
161
    def __init__(self, body, fake_client):
2535.4.2 by Andrew Bennetts
Nasty hackery to make stream_knit_data_for_revisions response use streaming.
162
        self.body = body
163
        self._body_buffer = None
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
164
        self._fake_client = fake_client
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
165
166
    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.
167
        if self._body_buffer is None:
168
            self._body_buffer = StringIO(self.body)
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
169
        bytes = self._body_buffer.read(count)
170
        if self._body_buffer.tell() == len(self._body_buffer.getvalue()):
171
            self._fake_client.expecting_body = False
172
        return bytes
173
174
    def cancel_read_body(self):
175
        self._fake_client.expecting_body = False
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
176
2535.4.2 by Andrew Bennetts
Nasty hackery to make stream_knit_data_for_revisions response use streaming.
177
    def read_streamed_body(self):
178
        return self.body
179
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
180
2018.5.159 by Andrew Bennetts
Rename SmartClient to _SmartClient.
181
class FakeClient(_SmartClient):
182
    """Lookalike for _SmartClient allowing testing."""
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
183
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
184
    def __init__(self, fake_medium_base='fake base'):
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
185
        """Create a FakeClient."""
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
186
        self.responses = []
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
187
        self._calls = []
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
188
        self.expecting_body = False
3691.2.7 by Martin Pool
FakeClient can know what calls to expect
189
        # if non-None, this is the list of expected calls, with only the
190
        # 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.
191
        # compute so is not included. If a call is None, that call can
192
        # be anything.
3691.2.7 by Martin Pool
FakeClient can know what calls to expect
193
        self._expected_calls = None
3431.3.2 by Andrew Bennetts
Remove 'base' from _SmartClient entirely, now that the medium has it.
194
        _SmartClient.__init__(self, FakeMedium(self._calls, fake_medium_base))
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
195
3691.2.7 by Martin Pool
FakeClient can know what calls to expect
196
    def add_expected_call(self, call_name, call_args, response_type,
197
        response_args, response_body=None):
198
        if self._expected_calls is None:
199
            self._expected_calls = []
200
        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
201
        self.responses.append((response_type, response_args, response_body))
3691.2.7 by Martin Pool
FakeClient can know what calls to expect
202
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
203
    def add_success_response(self, *args):
204
        self.responses.append(('success', args, None))
205
206
    def add_success_response_with_body(self, body, *args):
207
        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.
208
        if self._expected_calls is not None:
209
            self._expected_calls.append(None)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
210
211
    def add_error_response(self, *args):
212
        self.responses.append(('error', args))
213
214
    def add_unknown_method_response(self, verb):
215
        self.responses.append(('unknown', verb))
216
3691.2.8 by Martin Pool
Update some test_remote tests for Branch.get_stacked_on_url and with clearer assertions
217
    def finished_test(self):
218
        if self._expected_calls:
219
            raise AssertionError("%r finished but was still expecting %r"
220
                % (self, self._expected_calls[0]))
221
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.
222
    def _get_next_response(self):
3691.2.7 by Martin Pool
FakeClient can know what calls to expect
223
        try:
224
            response_tuple = self.responses.pop(0)
225
        except IndexError, e:
226
            raise AssertionError("%r didn't expect any more calls"
227
                % (self,))
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
228
        if response_tuple[0] == 'unknown':
229
            raise errors.UnknownSmartMethod(response_tuple[1])
230
        elif response_tuple[0] == 'error':
231
            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.
232
        return response_tuple
233
3691.2.7 by Martin Pool
FakeClient can know what calls to expect
234
    def _check_call(self, method, args):
235
        if self._expected_calls is None:
236
            # the test should be updated to say what it expects
237
            return
238
        try:
239
            next_call = self._expected_calls.pop(0)
240
        except IndexError:
241
            raise AssertionError("%r didn't expect any more calls "
242
                "but got %r%r"
3691.2.11 by Martin Pool
More tests around RemoteBranch stacking.
243
                % (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.
244
        if next_call is None:
245
            return
3691.2.7 by Martin Pool
FakeClient can know what calls to expect
246
        if method != next_call[0] or args != next_call[1]:
247
            raise AssertionError("%r expected %r%r "
248
                "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
249
                % (self, next_call[0], next_call[1], method, args,))
3691.2.7 by Martin Pool
FakeClient can know what calls to expect
250
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
251
    def call(self, method, *args):
3691.2.7 by Martin Pool
FakeClient can know what calls to expect
252
        self._check_call(method, args)
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
253
        self._calls.append(('call', method, args))
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
254
        return self._get_next_response()[1]
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
255
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
256
    def call_expecting_body(self, method, *args):
3691.2.7 by Martin Pool
FakeClient can know what calls to expect
257
        self._check_call(method, args)
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
258
        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.
259
        result = self._get_next_response()
2535.3.68 by Andrew Bennetts
Backwards compatibility for new smart method.
260
        self.expecting_body = True
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
261
        return result[1], FakeProtocol(result[2], self)
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
262
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.
263
    def call_with_body_bytes_expecting_body(self, method, args, body):
3691.2.7 by Martin Pool
FakeClient can know what calls to expect
264
        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.
265
        self._calls.append(('call_with_body_bytes_expecting_body', method,
266
            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.
267
        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.
268
        self.expecting_body = True
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
269
        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.
270
3842.3.9 by Andrew Bennetts
Backing up the stream so that we can fallback correctly.
271
    def call_with_body_stream(self, args, stream):
272
        # Explicitly consume the stream before checking for an error, because
273
        # that's what happens a real medium.
274
        stream = list(stream)
275
        self._check_call(args[0], args[1:])
276
        self._calls.append(('call_with_body_stream', args[0], args[1:], stream))
4144.3.2 by Andrew Bennetts
Use Repository.insert_stream_locked if there is a lock_token for the remote repo.
277
        result = self._get_next_response()
4144.3.3 by Andrew Bennetts
Tweaks based on review from Robert.
278
        # The second value returned from call_with_body_stream is supposed to
279
        # be a response_handler object, but so far no tests depend on that.
280
        response_handler = None 
281
        return result[1], response_handler
3842.3.9 by Andrew Bennetts
Backing up the stream so that we can fallback correctly.
282
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
283
3431.3.11 by Andrew Bennetts
Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.
284
class FakeMedium(medium.SmartClientMedium):
3104.4.2 by Andrew Bennetts
All tests passing.
285
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.
286
    def __init__(self, client_calls, base):
3453.4.1 by Andrew Bennetts
Better infrastructure on SmartClientMedium for tracking the remote version.
287
        medium.SmartClientMedium.__init__(self, base)
3213.1.2 by Andrew Bennetts
Add test for reconnection if get_parent_map is unknown by the server.
288
        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.
289
290
    def disconnect(self):
3213.1.2 by Andrew Bennetts
Add test for reconnection if get_parent_map is unknown by the server.
291
        self._client_calls.append(('disconnect medium',))
3104.4.2 by Andrew Bennetts
All tests passing.
292
293
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.
294
class TestVfsHas(tests.TestCase):
295
296
    def test_unicode_path(self):
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
297
        client = FakeClient('/')
298
        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.
299
        transport = RemoteTransport('bzr://localhost/', _client=client)
300
        filename = u'/hell\u00d8'.encode('utf8')
301
        result = transport.has(filename)
302
        self.assertEqual(
303
            [('call', 'has', (filename,))],
304
            client._calls)
305
        self.assertTrue(result)
306
307
4017.3.4 by Robert Collins
Create a verb for Repository.set_make_working_trees.
308
class TestRemote(tests.TestCaseWithMemoryTransport):
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
309
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
310
    def get_branch_format(self):
311
        reference_bzrdir_format = bzrdir.format_registry.get('default')()
312
        return reference_bzrdir_format.get_branch_format()
313
4053.1.2 by Robert Collins
Actually make this branch work.
314
    def get_repo_format(self):
315
        reference_bzrdir_format = bzrdir.format_registry.get('default')()
316
        return reference_bzrdir_format.repository_format
317
4017.3.4 by Robert Collins
Create a verb for Repository.set_make_working_trees.
318
    def disable_verb(self, verb):
319
        """Disable a verb for one test."""
320
        request_handlers = smart.request.request_handlers
321
        orig_method = request_handlers.get(verb)
322
        request_handlers.remove(verb)
323
        def restoreVerb():
324
            request_handlers.register(verb, orig_method)
325
        self.addCleanup(restoreVerb)
326
327
3431.3.11 by Andrew Bennetts
Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.
328
class Test_ClientMedium_remote_path_from_transport(tests.TestCase):
329
    """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.
330
331
    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.
332
        """Assert that the result of
333
        SmartClientMedium.remote_path_from_transport is the expected value for
334
        a given client_base and transport_base.
3313.3.3 by Andrew Bennetts
Add tests for _SmartClient.remote_path_for_transport.
335
        """
3431.3.11 by Andrew Bennetts
Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.
336
        client_medium = medium.SmartClientMedium(client_base)
3313.3.3 by Andrew Bennetts
Add tests for _SmartClient.remote_path_for_transport.
337
        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.
338
        result = client_medium.remote_path_from_transport(transport)
3313.3.3 by Andrew Bennetts
Add tests for _SmartClient.remote_path_for_transport.
339
        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.
340
3313.3.3 by Andrew Bennetts
Add tests for _SmartClient.remote_path_for_transport.
341
    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.
342
        """SmartClientMedium.remote_path_from_transport calculates a URL for
343
        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.
344
        """
345
        self.assertRemotePath('xyz/', 'bzr://host/path', 'bzr://host/xyz')
346
        self.assertRemotePath(
347
            'path/xyz/', 'bzr://host/path', 'bzr://host/path/xyz')
348
3431.3.11 by Andrew Bennetts
Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.
349
    def assertRemotePathHTTP(self, expected, transport_base, relpath):
350
        """Assert that the result of
351
        HttpTransportBase.remote_path_from_transport is the expected value for
352
        a given transport_base and relpath of that transport.  (Note that
353
        HttpTransportBase is a subclass of SmartClientMedium)
354
        """
355
        base_transport = get_transport(transport_base)
356
        client_medium = base_transport.get_smart_medium()
357
        cloned_transport = base_transport.clone(relpath)
358
        result = client_medium.remote_path_from_transport(cloned_transport)
359
        self.assertEqual(expected, result)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
360
3313.3.3 by Andrew Bennetts
Add tests for _SmartClient.remote_path_for_transport.
361
    def test_remote_path_from_transport_http(self):
362
        """Remote paths for HTTP transports are calculated differently to other
363
        transports.  They are just relative to the client base, not the root
364
        directory of the host.
365
        """
366
        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.
367
            self.assertRemotePathHTTP(
368
                '../xyz/', scheme + '//host/path', '../xyz/')
369
            self.assertRemotePathHTTP(
370
                'xyz/', scheme + '//host/path', 'xyz/')
3313.3.3 by Andrew Bennetts
Add tests for _SmartClient.remote_path_for_transport.
371
372
3453.4.1 by Andrew Bennetts
Better infrastructure on SmartClientMedium for tracking the remote version.
373
class Test_ClientMedium_remote_is_at_least(tests.TestCase):
374
    """Tests for the behaviour of client_medium.remote_is_at_least."""
375
376
    def test_initially_unlimited(self):
377
        """A fresh medium assumes that the remote side supports all
378
        versions.
379
        """
380
        client_medium = medium.SmartClientMedium('dummy base')
3453.4.10 by Andrew Bennetts
Change _is_remote_at_least to _is_remote_before.
381
        self.assertFalse(client_medium._is_remote_before((99, 99)))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
382
3453.4.9 by Andrew Bennetts
Rename _remote_is_not to _remember_remote_is_before.
383
    def test__remember_remote_is_before(self):
384
        """Calling _remember_remote_is_before ratchets down the known remote
385
        version.
386
        """
3453.4.1 by Andrew Bennetts
Better infrastructure on SmartClientMedium for tracking the remote version.
387
        client_medium = medium.SmartClientMedium('dummy base')
388
        # Mark the remote side as being less than 1.6.  The remote side may
389
        # still be 1.5.
3453.4.9 by Andrew Bennetts
Rename _remote_is_not to _remember_remote_is_before.
390
        client_medium._remember_remote_is_before((1, 6))
3453.4.10 by Andrew Bennetts
Change _is_remote_at_least to _is_remote_before.
391
        self.assertTrue(client_medium._is_remote_before((1, 6)))
392
        self.assertFalse(client_medium._is_remote_before((1, 5)))
3453.4.9 by Andrew Bennetts
Rename _remote_is_not to _remember_remote_is_before.
393
        # Calling _remember_remote_is_before again with a lower value works.
394
        client_medium._remember_remote_is_before((1, 5))
3453.4.10 by Andrew Bennetts
Change _is_remote_at_least to _is_remote_before.
395
        self.assertTrue(client_medium._is_remote_before((1, 5)))
3453.4.9 by Andrew Bennetts
Rename _remote_is_not to _remember_remote_is_before.
396
        # 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.
397
        self.assertRaises(
3453.4.9 by Andrew Bennetts
Rename _remote_is_not to _remember_remote_is_before.
398
            AssertionError, client_medium._remember_remote_is_before, (1, 9))
3453.4.1 by Andrew Bennetts
Better infrastructure on SmartClientMedium for tracking the remote version.
399
400
4070.2.3 by Robert Collins
Get BzrDir.cloning_metadir working.
401
class TestBzrDirCloningMetaDir(TestRemote):
402
403
    def test_backwards_compat(self):
404
        self.setup_smart_server_with_call_log()
405
        a_dir = self.make_bzrdir('.')
406
        self.reset_smart_call_log()
407
        verb = 'BzrDir.cloning_metadir'
408
        self.disable_verb(verb)
409
        format = a_dir.cloning_metadir()
410
        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.
411
            call.call.method == verb])
4070.2.3 by Robert Collins
Get BzrDir.cloning_metadir working.
412
        self.assertEqual(1, call_count)
413
4160.2.9 by Andrew Bennetts
Fix BzrDir.cloning_metadir RPC to fail on branch references, and make
414
    def test_branch_reference(self):
415
        transport = self.get_transport('quack')
416
        referenced = self.make_branch('referenced')
417
        expected = referenced.bzrdir.cloning_metadir()
418
        client = FakeClient(transport.base)
419
        client.add_expected_call(
420
            'BzrDir.cloning_metadir', ('quack/', 'False'),
421
            'error', ('BranchReference',)),
422
        client.add_expected_call(
423
            'BzrDir.open_branchV2', ('quack/',),
424
            'success', ('ref', self.get_url('referenced'))),
425
        a_bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
426
            _client=client)
427
        result = a_bzrdir.cloning_metadir()
428
        # We should have got a control dir matching the referenced branch.
429
        self.assertEqual(bzrdir.BzrDirMetaFormat1, type(result))
430
        self.assertEqual(expected._repository_format, result._repository_format)
431
        self.assertEqual(expected._branch_format, result._branch_format)
432
        client.finished_test()
433
4070.2.3 by Robert Collins
Get BzrDir.cloning_metadir working.
434
    def test_current_server(self):
435
        transport = self.get_transport('.')
436
        transport = transport.clone('quack')
437
        self.make_bzrdir('quack')
438
        client = FakeClient(transport.base)
439
        reference_bzrdir_format = bzrdir.format_registry.get('default')()
440
        control_name = reference_bzrdir_format.network_name()
441
        client.add_expected_call(
442
            'BzrDir.cloning_metadir', ('quack/', 'False'),
4084.2.2 by Robert Collins
Review feedback.
443
            'success', (control_name, '', ('branch', ''))),
4070.2.3 by Robert Collins
Get BzrDir.cloning_metadir working.
444
        a_bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
445
            _client=client)
446
        result = a_bzrdir.cloning_metadir()
447
        # We should have got a reference control dir with default branch and
448
        # repository formats.
449
        # This pokes a little, just to be sure.
450
        self.assertEqual(bzrdir.BzrDirMetaFormat1, type(result))
4070.2.8 by Robert Collins
Really test the current BzrDir.cloning_metadir contract.
451
        self.assertEqual(None, result._repository_format)
452
        self.assertEqual(None, result._branch_format)
4070.2.3 by Robert Collins
Get BzrDir.cloning_metadir working.
453
        client.finished_test()
454
455
4053.1.2 by Robert Collins
Actually make this branch work.
456
class TestBzrDirOpenBranch(TestRemote):
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
457
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
458
    def test_backwards_compat(self):
459
        self.setup_smart_server_with_call_log()
460
        self.make_branch('.')
461
        a_dir = BzrDir.open(self.get_url('.'))
462
        self.reset_smart_call_log()
463
        verb = 'BzrDir.open_branchV2'
464
        self.disable_verb(verb)
465
        format = a_dir.open_branch()
466
        call_count = len([call for call in self.hpss_calls if
467
            call.call.method == verb])
468
        self.assertEqual(1, call_count)
469
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
470
    def test_branch_present(self):
4053.1.2 by Robert Collins
Actually make this branch work.
471
        reference_format = self.get_repo_format()
472
        network_name = reference_format.network_name()
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
473
        branch_network_name = self.get_branch_format().network_name()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
474
        transport = MemoryTransport()
475
        transport.mkdir('quack')
476
        transport = transport.clone('quack')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
477
        client = FakeClient(transport.base)
3691.2.10 by Martin Pool
Update more test_remote tests
478
        client.add_expected_call(
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
479
            'BzrDir.open_branchV2', ('quack/',),
480
            'success', ('branch', branch_network_name))
3691.2.10 by Martin Pool
Update more test_remote tests
481
        client.add_expected_call(
4053.1.2 by Robert Collins
Actually make this branch work.
482
            'BzrDir.find_repositoryV3', ('quack/',),
483
            'success', ('ok', '', 'no', 'no', 'no', network_name))
3691.2.10 by Martin Pool
Update more test_remote tests
484
        client.add_expected_call(
485
            'Branch.get_stacked_on_url', ('quack/',),
486
            '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.
487
        bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
488
            _client=client)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
489
        result = bzrdir.open_branch()
490
        self.assertIsInstance(result, RemoteBranch)
491
        self.assertEqual(bzrdir, result.bzrdir)
3691.2.10 by Martin Pool
Update more test_remote tests
492
        client.finished_test()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
493
494
    def test_branch_missing(self):
495
        transport = MemoryTransport()
496
        transport.mkdir('quack')
497
        transport = transport.clone('quack')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
498
        client = FakeClient(transport.base)
499
        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.
500
        bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
501
            _client=client)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
502
        self.assertRaises(errors.NotBranchError, bzrdir.open_branch)
503
        self.assertEqual(
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
504
            [('call', 'BzrDir.open_branchV2', ('quack/',))],
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
505
            client._calls)
506
3211.4.1 by Robert Collins
* ``RemoteBzrDir._get_tree_branch`` no longer triggers ``_ensure_real``,
507
    def test__get_tree_branch(self):
508
        # _get_tree_branch is a form of open_branch, but it should only ask for
509
        # branch opening, not any other network requests.
510
        calls = []
511
        def open_branch():
512
            calls.append("Called")
513
            return "a-branch"
514
        transport = MemoryTransport()
515
        # 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.
516
        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.
517
        bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
518
            _client=client)
3211.4.1 by Robert Collins
* ``RemoteBzrDir._get_tree_branch`` no longer triggers ``_ensure_real``,
519
        # patch the open_branch call to record that it was called.
520
        bzrdir.open_branch = open_branch
521
        self.assertEqual((None, "a-branch"), bzrdir._get_tree_branch())
522
        self.assertEqual(["Called"], calls)
523
        self.assertEqual([], client._calls)
524
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.
525
    def test_url_quoting_of_path(self):
526
        # Relpaths on the wire should not be URL-escaped.  So "~" should be
527
        # 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.
528
        transport = RemoteTCPTransport('bzr://localhost/~hello/')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
529
        client = FakeClient(transport.base)
4053.1.2 by Robert Collins
Actually make this branch work.
530
        reference_format = self.get_repo_format()
531
        network_name = reference_format.network_name()
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
532
        branch_network_name = self.get_branch_format().network_name()
3691.2.10 by Martin Pool
Update more test_remote tests
533
        client.add_expected_call(
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
534
            'BzrDir.open_branchV2', ('~hello/',),
535
            'success', ('branch', branch_network_name))
3691.2.10 by Martin Pool
Update more test_remote tests
536
        client.add_expected_call(
4053.1.2 by Robert Collins
Actually make this branch work.
537
            'BzrDir.find_repositoryV3', ('~hello/',),
538
            'success', ('ok', '', 'no', 'no', 'no', network_name))
3691.2.10 by Martin Pool
Update more test_remote tests
539
        client.add_expected_call(
540
            'Branch.get_stacked_on_url', ('~hello/',),
541
            '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.
542
        bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
543
            _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.
544
        result = bzrdir.open_branch()
3691.2.10 by Martin Pool
Update more test_remote tests
545
        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.
546
3221.3.3 by Robert Collins
* Hook up the new remote method ``RemoteBzrDir.find_repositoryV2`` so
547
    def check_open_repository(self, rich_root, subtrees, external_lookup='no'):
4053.1.2 by Robert Collins
Actually make this branch work.
548
        reference_format = self.get_repo_format()
549
        network_name = reference_format.network_name()
3104.4.2 by Andrew Bennetts
All tests passing.
550
        transport = MemoryTransport()
551
        transport.mkdir('quack')
552
        transport = transport.clone('quack')
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
553
        if rich_root:
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
554
            rich_response = 'yes'
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
555
        else:
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
556
            rich_response = 'no'
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
557
        if subtrees:
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
558
            subtree_response = 'yes'
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
559
        else:
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
560
            subtree_response = 'no'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
561
        client = FakeClient(transport.base)
562
        client.add_success_response(
4053.1.2 by Robert Collins
Actually make this branch work.
563
            'ok', '', rich_response, subtree_response, external_lookup,
564
            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.
565
        bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
566
            _client=client)
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
567
        result = bzrdir.open_repository()
568
        self.assertEqual(
4053.1.2 by Robert Collins
Actually make this branch work.
569
            [('call', 'BzrDir.find_repositoryV3', ('quack/',))],
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
570
            client._calls)
571
        self.assertIsInstance(result, RemoteRepository)
572
        self.assertEqual(bzrdir, result.bzrdir)
573
        self.assertEqual(rich_root, result._format.rich_root_data)
2018.5.138 by Robert Collins
Merge bzr.dev.
574
        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.
575
576
    def test_open_repository_sets_format_attributes(self):
577
        self.check_open_repository(True, True)
578
        self.check_open_repository(False, True)
579
        self.check_open_repository(True, False)
580
        self.check_open_repository(False, False)
3221.3.3 by Robert Collins
* Hook up the new remote method ``RemoteBzrDir.find_repositoryV2`` so
581
        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.
582
2432.3.2 by Andrew Bennetts
Add test, and tidy implementation.
583
    def test_old_server(self):
584
        """RemoteBzrDirFormat should fail to probe if the server version is too
585
        old.
586
        """
587
        self.assertRaises(errors.NotBranchError,
588
            RemoteBzrDirFormat.probe_transport, OldServerTransport())
589
590
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
591
class TestBzrDirCreateBranch(TestRemote):
592
593
    def test_backwards_compat(self):
594
        self.setup_smart_server_with_call_log()
595
        repo = self.make_repository('.')
596
        self.reset_smart_call_log()
597
        self.disable_verb('BzrDir.create_branch')
598
        branch = repo.bzrdir.create_branch()
599
        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.
600
            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.
601
        self.assertEqual(1, create_branch_call_count)
602
603
    def test_current_server(self):
604
        transport = self.get_transport('.')
605
        transport = transport.clone('quack')
606
        self.make_repository('quack')
607
        client = FakeClient(transport.base)
608
        reference_bzrdir_format = bzrdir.format_registry.get('default')()
609
        reference_format = reference_bzrdir_format.get_branch_format()
610
        network_name = reference_format.network_name()
611
        reference_repo_fmt = reference_bzrdir_format.repository_format
612
        reference_repo_name = reference_repo_fmt.network_name()
613
        client.add_expected_call(
614
            'BzrDir.create_branch', ('quack/', network_name),
615
            'success', ('ok', network_name, '', 'no', 'no', 'yes',
616
            reference_repo_name))
617
        a_bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
618
            _client=client)
619
        branch = a_bzrdir.create_branch()
620
        # We should have got a remote branch
621
        self.assertIsInstance(branch, remote.RemoteBranch)
622
        # its format should have the settings from the response
623
        format = branch._format
624
        self.assertEqual(network_name, format.network_name())
625
626
4017.3.4 by Robert Collins
Create a verb for Repository.set_make_working_trees.
627
class TestBzrDirCreateRepository(TestRemote):
4017.3.2 by Robert Collins
Reduce the number of round trips required to create a repository over the network.
628
629
    def test_backwards_compat(self):
630
        self.setup_smart_server_with_call_log()
631
        bzrdir = self.make_bzrdir('.')
632
        self.reset_smart_call_log()
4017.3.4 by Robert Collins
Create a verb for Repository.set_make_working_trees.
633
        self.disable_verb('BzrDir.create_repository')
634
        repo = bzrdir.create_repository()
635
        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.
636
            call.call.method == 'BzrDir.create_repository'])
4017.3.4 by Robert Collins
Create a verb for Repository.set_make_working_trees.
637
        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.
638
639
    def test_current_server(self):
640
        transport = self.get_transport('.')
641
        transport = transport.clone('quack')
642
        self.make_bzrdir('quack')
643
        client = FakeClient(transport.base)
644
        reference_bzrdir_format = bzrdir.format_registry.get('default')()
645
        reference_format = reference_bzrdir_format.repository_format
646
        network_name = reference_format.network_name()
647
        client.add_expected_call(
648
            'BzrDir.create_repository', ('quack/',
649
                'Bazaar pack repository format 1 (needs bzr 0.92)\n', 'False'),
650
            'success', ('ok', 'no', 'no', 'no', network_name))
651
        a_bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
652
            _client=client)
653
        repo = a_bzrdir.create_repository()
654
        # We should have got a remote repository
655
        self.assertIsInstance(repo, remote.RemoteRepository)
656
        # its format should have the settings from the response
657
        format = repo._format
658
        self.assertFalse(format.rich_root_data)
659
        self.assertFalse(format.supports_tree_reference)
660
        self.assertFalse(format.supports_external_lookups)
661
        self.assertEqual(network_name, format.network_name())
662
663
4053.1.1 by Robert Collins
New version of the BzrDir.find_repository verb supporting _network_name to support removing more _ensure_real calls.
664
class TestBzrDirOpenRepository(TestRemote):
665
666
    def test_backwards_compat_1_2_3(self):
667
        # fallback all the way to the first version.
668
        reference_format = self.get_repo_format()
669
        network_name = reference_format.network_name()
670
        client = FakeClient('bzr://example.com/')
671
        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.
672
        client.add_unknown_method_response('BzrDir.find_repositoryV2')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
673
        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.
674
        # A real repository instance will be created to determine the network
675
        # name.
676
        client.add_success_response_with_body(
677
            "Bazaar-NG meta directory, format 1\n", 'ok')
678
        client.add_success_response_with_body(
679
            reference_format.get_format_string(), 'ok')
680
        # PackRepository wants to do a stat
681
        client.add_success_response('stat', '0', '65535')
682
        remote_transport = RemoteTransport('bzr://example.com/quack/', medium=False,
683
            _client=client)
684
        bzrdir = RemoteBzrDir(remote_transport, remote.RemoteBzrDirFormat(),
685
            _client=client)
686
        repo = bzrdir.open_repository()
687
        self.assertEqual(
688
            [('call', 'BzrDir.find_repositoryV3', ('quack/',)),
689
             ('call', 'BzrDir.find_repositoryV2', ('quack/',)),
690
             ('call', 'BzrDir.find_repository', ('quack/',)),
691
             ('call_expecting_body', 'get', ('/quack/.bzr/branch-format',)),
692
             ('call_expecting_body', 'get', ('/quack/.bzr/repository/format',)),
693
             ('call', 'stat', ('/quack/.bzr/repository',)),
694
             ],
695
            client._calls)
696
        self.assertEqual(network_name, repo._format.network_name())
697
698
    def test_backwards_compat_2(self):
699
        # fallback to find_repositoryV2
700
        reference_format = self.get_repo_format()
701
        network_name = reference_format.network_name()
702
        client = FakeClient('bzr://example.com/')
703
        client.add_unknown_method_response('BzrDir.find_repositoryV3')
704
        client.add_success_response('ok', '', 'no', 'no', 'no')
705
        # A real repository instance will be created to determine the network
706
        # name.
707
        client.add_success_response_with_body(
708
            "Bazaar-NG meta directory, format 1\n", 'ok')
709
        client.add_success_response_with_body(
710
            reference_format.get_format_string(), 'ok')
711
        # PackRepository wants to do a stat
712
        client.add_success_response('stat', '0', '65535')
713
        remote_transport = RemoteTransport('bzr://example.com/quack/', medium=False,
714
            _client=client)
715
        bzrdir = RemoteBzrDir(remote_transport, remote.RemoteBzrDirFormat(),
716
            _client=client)
717
        repo = bzrdir.open_repository()
718
        self.assertEqual(
719
            [('call', 'BzrDir.find_repositoryV3', ('quack/',)),
720
             ('call', 'BzrDir.find_repositoryV2', ('quack/',)),
721
             ('call_expecting_body', 'get', ('/quack/.bzr/branch-format',)),
722
             ('call_expecting_body', 'get', ('/quack/.bzr/repository/format',)),
723
             ('call', 'stat', ('/quack/.bzr/repository',)),
724
             ],
725
            client._calls)
726
        self.assertEqual(network_name, repo._format.network_name())
727
728
    def test_current_server(self):
729
        reference_format = self.get_repo_format()
730
        network_name = reference_format.network_name()
731
        transport = MemoryTransport()
732
        transport.mkdir('quack')
733
        transport = transport.clone('quack')
734
        client = FakeClient(transport.base)
735
        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.
736
        bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
737
            _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.
738
        repo = bzrdir.open_repository()
739
        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.
740
            [('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.
741
            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.
742
        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.
743
744
2432.3.2 by Andrew Bennetts
Add test, and tidy implementation.
745
class OldSmartClient(object):
746
    """A fake smart client for test_old_version that just returns a version one
747
    response to the 'hello' (query version) command.
748
    """
749
750
    def get_request(self):
751
        input_file = StringIO('ok\x011\n')
752
        output_file = StringIO()
753
        client_medium = medium.SmartSimplePipesClientMedium(
754
            input_file, output_file)
755
        return medium.SmartClientStreamMediumRequest(client_medium)
756
3241.1.1 by Andrew Bennetts
Shift protocol version querying from RemoteBzrDirFormat into SmartClientMedium.
757
    def protocol_version(self):
758
        return 1
759
2432.3.2 by Andrew Bennetts
Add test, and tidy implementation.
760
761
class OldServerTransport(object):
762
    """A fake transport for test_old_server that reports it's smart server
763
    protocol version as version one.
764
    """
765
766
    def __init__(self):
767
        self.base = 'fake:'
768
769
    def get_smart_client(self):
770
        return OldSmartClient()
771
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
772
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
773
class RemoteBranchTestCase(TestRemote):
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
774
775
    def make_remote_branch(self, transport, client):
776
        """Make a RemoteBranch using 'client' as its _SmartClient.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
777
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
778
        A RemoteBzrDir and RemoteRepository will also be created to fill out
779
        the RemoteBranch, albeit with stub values for some of their attributes.
780
        """
781
        # we do not want bzrdir to make any remote calls, so use False as its
782
        # _client.  If it tries to make a remote call, this will fail
783
        # 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.
784
        bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
785
            _client=False)
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
786
        repo = RemoteRepository(bzrdir, None, _client=client)
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
787
        branch_format = self.get_branch_format()
788
        format = RemoteBranchFormat(network_name=branch_format.network_name())
789
        return RemoteBranch(bzrdir, repo, _client=client, format=format)
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
790
791
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
792
class TestBranchGetParent(RemoteBranchTestCase):
793
794
    def test_no_parent(self):
795
        # in an empty branch we decode the response properly
796
        transport = MemoryTransport()
797
        client = FakeClient(transport.base)
798
        client.add_expected_call(
799
            'Branch.get_stacked_on_url', ('quack/',),
800
            'error', ('NotStacked',))
801
        client.add_expected_call(
802
            'Branch.get_parent', ('quack/',),
4083.1.7 by Andrew Bennetts
Fix same trivial bug [(x) != (x,)] in test_remote and test_smart.
803
            'success', ('',))
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
804
        transport.mkdir('quack')
805
        transport = transport.clone('quack')
806
        branch = self.make_remote_branch(transport, client)
807
        result = branch.get_parent()
808
        client.finished_test()
809
        self.assertEqual(None, result)
810
811
    def test_parent_relative(self):
812
        transport = MemoryTransport()
813
        client = FakeClient(transport.base)
814
        client.add_expected_call(
815
            'Branch.get_stacked_on_url', ('kwaak/',),
816
            'error', ('NotStacked',))
817
        client.add_expected_call(
818
            'Branch.get_parent', ('kwaak/',),
4083.1.7 by Andrew Bennetts
Fix same trivial bug [(x) != (x,)] in test_remote and test_smart.
819
            'success', ('../foo/',))
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
820
        transport.mkdir('kwaak')
821
        transport = transport.clone('kwaak')
822
        branch = self.make_remote_branch(transport, client)
823
        result = branch.get_parent()
824
        self.assertEqual(transport.clone('../foo').base, result)
825
826
    def test_parent_absolute(self):
827
        transport = MemoryTransport()
828
        client = FakeClient(transport.base)
829
        client.add_expected_call(
830
            'Branch.get_stacked_on_url', ('kwaak/',),
831
            'error', ('NotStacked',))
832
        client.add_expected_call(
833
            'Branch.get_parent', ('kwaak/',),
4083.1.7 by Andrew Bennetts
Fix same trivial bug [(x) != (x,)] in test_remote and test_smart.
834
            'success', ('http://foo/',))
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
835
        transport.mkdir('kwaak')
836
        transport = transport.clone('kwaak')
837
        branch = self.make_remote_branch(transport, client)
838
        result = branch.get_parent()
839
        self.assertEqual('http://foo/', result)
840
841
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
842
class TestBranchGetTagsBytes(RemoteBranchTestCase):
843
844
    def test_backwards_compat(self):
845
        self.setup_smart_server_with_call_log()
846
        branch = self.make_branch('.')
847
        self.reset_smart_call_log()
848
        verb = 'Branch.get_tags_bytes'
849
        self.disable_verb(verb)
850
        branch.tags.get_tag_dict()
851
        call_count = len([call for call in self.hpss_calls if
852
            call.call.method == verb])
853
        self.assertEqual(1, call_count)
854
855
    def test_trivial(self):
856
        transport = MemoryTransport()
857
        client = FakeClient(transport.base)
858
        client.add_expected_call(
859
            'Branch.get_stacked_on_url', ('quack/',),
860
            'error', ('NotStacked',))
861
        client.add_expected_call(
862
            'Branch.get_tags_bytes', ('quack/',),
863
            'success', ('',))
864
        transport.mkdir('quack')
865
        transport = transport.clone('quack')
866
        branch = self.make_remote_branch(transport, client)
867
        result = branch.tags.get_tag_dict()
868
        client.finished_test()
869
        self.assertEqual({}, result)
870
871
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
872
class TestBranchLastRevisionInfo(RemoteBranchTestCase):
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
873
874
    def test_empty_branch(self):
875
        # in an empty branch we decode the response properly
876
        transport = MemoryTransport()
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
877
        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
878
        client.add_expected_call(
879
            'Branch.get_stacked_on_url', ('quack/',),
880
            'error', ('NotStacked',))
881
        client.add_expected_call(
882
            'Branch.last_revision_info', ('quack/',),
883
            'success', ('ok', '0', 'null:'))
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
884
        transport.mkdir('quack')
885
        transport = transport.clone('quack')
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
886
        branch = self.make_remote_branch(transport, client)
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
887
        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
888
        client.finished_test()
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
889
        self.assertEqual((0, NULL_REVISION), result)
890
891
    def test_non_empty_branch(self):
892
        # 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.
893
        revid = u'\xc8'.encode('utf8')
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
894
        transport = MemoryTransport()
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
895
        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
896
        client.add_expected_call(
897
            'Branch.get_stacked_on_url', ('kwaak/',),
898
            'error', ('NotStacked',))
899
        client.add_expected_call(
900
            'Branch.last_revision_info', ('kwaak/',),
901
            'success', ('ok', '2', revid))
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
902
        transport.mkdir('kwaak')
903
        transport = transport.clone('kwaak')
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
904
        branch = self.make_remote_branch(transport, client)
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
905
        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.
906
        self.assertEqual((2, revid), result)
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
907
908
4053.1.2 by Robert Collins
Actually make this branch work.
909
class TestBranch_get_stacked_on_url(TestRemote):
3691.2.5 by Martin Pool
Add Branch.get_stacked_on_url rpc and tests for same
910
    """Test Branch._get_stacked_on_url rpc"""
911
3691.2.10 by Martin Pool
Update more test_remote tests
912
    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.
913
        # test that asking for a stacked on url the server can't access works.
914
        # This isn't perfect, but then as we're in the same process there
915
        # really isn't anything we can do to be 100% sure that the server
916
        # doesn't just open in - this test probably needs to be rewritten using
917
        # a spawn()ed server.
918
        stacked_branch = self.make_branch('stacked', format='1.9')
919
        memory_branch = self.make_branch('base', format='1.9')
920
        vfs_url = self.get_vfs_only_url('base')
921
        stacked_branch.set_stacked_on_url(vfs_url)
922
        transport = stacked_branch.bzrdir.root_transport
3691.2.5 by Martin Pool
Add Branch.get_stacked_on_url rpc and tests for same
923
        client = FakeClient(transport.base)
3691.2.10 by Martin Pool
Update more test_remote tests
924
        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.
925
            'Branch.get_stacked_on_url', ('stacked/',),
926
            'success', ('ok', vfs_url))
927
        # XXX: Multiple calls are bad, this second call documents what is
928
        # today.
929
        client.add_expected_call(
930
            'Branch.get_stacked_on_url', ('stacked/',),
931
            'success', ('ok', vfs_url))
932
        bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
933
            _client=client)
4118.1.5 by Andrew Bennetts
Fix test_remote tests.
934
        repo_fmt = remote.RemoteRepositoryFormat()
935
        repo_fmt._custom_format = stacked_branch.repository._format
936
        branch = RemoteBranch(bzrdir, RemoteRepository(bzrdir, repo_fmt),
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.
937
            _client=client)
3691.2.5 by Martin Pool
Add Branch.get_stacked_on_url rpc and tests for same
938
        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.
939
        self.assertEqual(vfs_url, result)
3691.2.5 by Martin Pool
Add Branch.get_stacked_on_url rpc and tests for same
940
3691.2.12 by Martin Pool
Add test for coping without Branch.get_stacked_on_url
941
    def test_backwards_compatible(self):
942
        # like with bzr1.6 with no Branch.get_stacked_on_url rpc
943
        base_branch = self.make_branch('base', format='1.6')
944
        stacked_branch = self.make_branch('stacked', format='1.6')
945
        stacked_branch.set_stacked_on_url('../base')
946
        client = FakeClient(self.get_url())
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
947
        branch_network_name = self.get_branch_format().network_name()
3691.2.12 by Martin Pool
Add test for coping without Branch.get_stacked_on_url
948
        client.add_expected_call(
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
949
            'BzrDir.open_branchV2', ('stacked/',),
950
            'success', ('branch', branch_network_name))
3691.2.12 by Martin Pool
Add test for coping without Branch.get_stacked_on_url
951
        client.add_expected_call(
4053.1.2 by Robert Collins
Actually make this branch work.
952
            'BzrDir.find_repositoryV3', ('stacked/',),
4118.1.5 by Andrew Bennetts
Fix test_remote tests.
953
            'success', ('ok', '', 'no', 'no', 'yes',
4053.1.2 by Robert Collins
Actually make this branch work.
954
                stacked_branch.repository._format.network_name()))
3691.2.12 by Martin Pool
Add test for coping without Branch.get_stacked_on_url
955
        # called twice, once from constructor and then again by us
956
        client.add_expected_call(
957
            'Branch.get_stacked_on_url', ('stacked/',),
958
            'unknown', ('Branch.get_stacked_on_url',))
959
        client.add_expected_call(
960
            'Branch.get_stacked_on_url', ('stacked/',),
961
            'unknown', ('Branch.get_stacked_on_url',))
962
        # this will also do vfs access, but that goes direct to the transport
963
        # 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.
964
        bzrdir = RemoteBzrDir(self.get_transport('stacked'),
965
            remote.RemoteBzrDirFormat(), _client=client)
3691.2.12 by Martin Pool
Add test for coping without Branch.get_stacked_on_url
966
        branch = bzrdir.open_branch()
967
        result = branch.get_stacked_on_url()
968
        self.assertEqual('../base', result)
969
        client.finished_test()
970
        # it's in the fallback list both for the RemoteRepository and its vfs
971
        # repository
972
        self.assertEqual(1, len(branch.repository._fallback_repositories))
973
        self.assertEqual(1,
974
            len(branch.repository._real_repository._fallback_repositories))
975
3691.2.11 by Martin Pool
More tests around RemoteBranch stacking.
976
    def test_get_stacked_on_real_branch(self):
977
        base_branch = self.make_branch('base', format='1.6')
978
        stacked_branch = self.make_branch('stacked', format='1.6')
979
        stacked_branch.set_stacked_on_url('../base')
4053.1.2 by Robert Collins
Actually make this branch work.
980
        reference_format = self.get_repo_format()
981
        network_name = reference_format.network_name()
3691.2.11 by Martin Pool
More tests around RemoteBranch stacking.
982
        client = FakeClient(self.get_url())
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
983
        branch_network_name = self.get_branch_format().network_name()
3691.2.11 by Martin Pool
More tests around RemoteBranch stacking.
984
        client.add_expected_call(
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
985
            'BzrDir.open_branchV2', ('stacked/',),
986
            'success', ('branch', branch_network_name))
3691.2.11 by Martin Pool
More tests around RemoteBranch stacking.
987
        client.add_expected_call(
4053.1.2 by Robert Collins
Actually make this branch work.
988
            'BzrDir.find_repositoryV3', ('stacked/',),
4118.1.5 by Andrew Bennetts
Fix test_remote tests.
989
            'success', ('ok', '', 'no', 'no', 'yes', network_name))
3691.2.11 by Martin Pool
More tests around RemoteBranch stacking.
990
        # called twice, once from constructor and then again by us
991
        client.add_expected_call(
992
            'Branch.get_stacked_on_url', ('stacked/',),
993
            'success', ('ok', '../base'))
994
        client.add_expected_call(
995
            'Branch.get_stacked_on_url', ('stacked/',),
996
            '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.
997
        bzrdir = RemoteBzrDir(self.get_transport('stacked'),
998
            remote.RemoteBzrDirFormat(), _client=client)
3691.2.11 by Martin Pool
More tests around RemoteBranch stacking.
999
        branch = bzrdir.open_branch()
1000
        result = branch.get_stacked_on_url()
1001
        self.assertEqual('../base', result)
1002
        client.finished_test()
4226.1.2 by Robert Collins
Fix test_remote failing because of less _real_repository objects.
1003
        # it's in the fallback list both for the RemoteRepository.
3691.2.11 by Martin Pool
More tests around RemoteBranch stacking.
1004
        self.assertEqual(1, len(branch.repository._fallback_repositories))
4226.1.2 by Robert Collins
Fix test_remote failing because of less _real_repository objects.
1005
        # And we haven't had to construct a real repository.
1006
        self.assertEqual(None, branch.repository._real_repository)
3691.2.11 by Martin Pool
More tests around RemoteBranch stacking.
1007
3691.2.5 by Martin Pool
Add Branch.get_stacked_on_url rpc and tests for same
1008
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1009
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.
1010
1011
    def test_set_empty(self):
1012
        # set_revision_history([]) is translated to calling
1013
        # Branch.set_last_revision(path, '') on the wire.
3104.4.2 by Andrew Bennetts
All tests passing.
1014
        transport = MemoryTransport()
1015
        transport.mkdir('branch')
1016
        transport = transport.clone('branch')
1017
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1018
        client = FakeClient(transport.base)
3691.2.10 by Martin Pool
Update more test_remote tests
1019
        client.add_expected_call(
1020
            'Branch.get_stacked_on_url', ('branch/',),
1021
            'error', ('NotStacked',))
1022
        client.add_expected_call(
1023
            'Branch.lock_write', ('branch/', '', ''),
1024
            'success', ('ok', 'branch token', 'repo token'))
1025
        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.
1026
            'Branch.last_revision_info',
1027
            ('branch/',),
1028
            'success', ('ok', '0', 'null:'))
1029
        client.add_expected_call(
3691.2.10 by Martin Pool
Update more test_remote tests
1030
            'Branch.set_last_revision', ('branch/', 'branch token', 'repo token', 'null:',),
1031
            'success', ('ok',))
1032
        client.add_expected_call(
1033
            'Branch.unlock', ('branch/', 'branch token', 'repo token'),
1034
            'success', ('ok',))
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1035
        branch = self.make_remote_branch(transport, client)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1036
        # This is a hack to work around the problem that RemoteBranch currently
1037
        # unnecessarily invokes _ensure_real upon a call to lock_write.
1038
        branch._ensure_real = lambda: None
1039
        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.
1040
        result = branch.set_revision_history([])
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1041
        branch.unlock()
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
1042
        self.assertEqual(None, result)
3691.2.10 by Martin Pool
Update more test_remote tests
1043
        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.
1044
1045
    def test_set_nonempty(self):
1046
        # set_revision_history([rev-id1, ..., rev-idN]) is translated to calling
1047
        # Branch.set_last_revision(path, rev-idN) on the wire.
3104.4.2 by Andrew Bennetts
All tests passing.
1048
        transport = MemoryTransport()
1049
        transport.mkdir('branch')
1050
        transport = transport.clone('branch')
1051
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1052
        client = FakeClient(transport.base)
3691.2.10 by Martin Pool
Update more test_remote tests
1053
        client.add_expected_call(
1054
            'Branch.get_stacked_on_url', ('branch/',),
1055
            'error', ('NotStacked',))
1056
        client.add_expected_call(
1057
            'Branch.lock_write', ('branch/', '', ''),
1058
            'success', ('ok', 'branch token', 'repo token'))
1059
        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.
1060
            'Branch.last_revision_info',
1061
            ('branch/',),
1062
            'success', ('ok', '0', 'null:'))
1063
        lines = ['rev-id2']
1064
        encoded_body = bz2.compress('\n'.join(lines))
1065
        client.add_success_response_with_body(encoded_body, 'ok')
1066
        client.add_expected_call(
3691.2.10 by Martin Pool
Update more test_remote tests
1067
            'Branch.set_last_revision', ('branch/', 'branch token', 'repo token', 'rev-id2',),
1068
            'success', ('ok',))
1069
        client.add_expected_call(
1070
            'Branch.unlock', ('branch/', 'branch token', 'repo token'),
1071
            'success', ('ok',))
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1072
        branch = self.make_remote_branch(transport, client)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1073
        # This is a hack to work around the problem that RemoteBranch currently
1074
        # unnecessarily invokes _ensure_real upon a call to lock_write.
1075
        branch._ensure_real = lambda: None
1076
        # Lock the branch, reset the record of remote calls.
1077
        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.
1078
        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.
1079
        branch.unlock()
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
1080
        self.assertEqual(None, result)
3691.2.10 by Martin Pool
Update more test_remote tests
1081
        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.
1082
1083
    def test_no_such_revision(self):
1084
        transport = MemoryTransport()
1085
        transport.mkdir('branch')
1086
        transport = transport.clone('branch')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1087
        # A response of 'NoSuchRevision' is translated into an exception.
1088
        client = FakeClient(transport.base)
3691.2.9 by Martin Pool
Convert and update more test_remote tests
1089
        client.add_expected_call(
1090
            'Branch.get_stacked_on_url', ('branch/',),
1091
            'error', ('NotStacked',))
1092
        client.add_expected_call(
1093
            'Branch.lock_write', ('branch/', '', ''),
1094
            'success', ('ok', 'branch token', 'repo token'))
1095
        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.
1096
            'Branch.last_revision_info',
1097
            ('branch/',),
1098
            'success', ('ok', '0', 'null:'))
1099
        # get_graph calls to construct the revision history, for the set_rh
1100
        # hook
1101
        lines = ['rev-id']
1102
        encoded_body = bz2.compress('\n'.join(lines))
1103
        client.add_success_response_with_body(encoded_body, 'ok')
1104
        client.add_expected_call(
3691.2.9 by Martin Pool
Convert and update more test_remote tests
1105
            'Branch.set_last_revision', ('branch/', 'branch token', 'repo token', 'rev-id',),
1106
            'error', ('NoSuchRevision', 'rev-id'))
1107
        client.add_expected_call(
1108
            'Branch.unlock', ('branch/', 'branch token', 'repo token'),
1109
            'success', ('ok',))
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
1110
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1111
        branch = self.make_remote_branch(transport, client)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1112
        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.
1113
        self.assertRaises(
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1114
            errors.NoSuchRevision, branch.set_revision_history, ['rev-id'])
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1115
        branch.unlock()
3691.2.9 by Martin Pool
Convert and update more test_remote tests
1116
        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.
1117
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
1118
    def test_tip_change_rejected(self):
1119
        """TipChangeRejected responses cause a TipChangeRejected exception to
1120
        be raised.
1121
        """
1122
        transport = MemoryTransport()
1123
        transport.mkdir('branch')
1124
        transport = transport.clone('branch')
1125
        client = FakeClient(transport.base)
1126
        rejection_msg_unicode = u'rejection message\N{INTERROBANG}'
1127
        rejection_msg_utf8 = rejection_msg_unicode.encode('utf8')
3691.2.10 by Martin Pool
Update more test_remote tests
1128
        client.add_expected_call(
1129
            'Branch.get_stacked_on_url', ('branch/',),
1130
            'error', ('NotStacked',))
1131
        client.add_expected_call(
1132
            'Branch.lock_write', ('branch/', '', ''),
1133
            'success', ('ok', 'branch token', 'repo token'))
1134
        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.
1135
            'Branch.last_revision_info',
1136
            ('branch/',),
1137
            'success', ('ok', '0', 'null:'))
1138
        lines = ['rev-id']
1139
        encoded_body = bz2.compress('\n'.join(lines))
1140
        client.add_success_response_with_body(encoded_body, 'ok')
1141
        client.add_expected_call(
3691.2.10 by Martin Pool
Update more test_remote tests
1142
            'Branch.set_last_revision', ('branch/', 'branch token', 'repo token', 'rev-id',),
1143
            'error', ('TipChangeRejected', rejection_msg_utf8))
1144
        client.add_expected_call(
1145
            'Branch.unlock', ('branch/', 'branch token', 'repo token'),
1146
            'success', ('ok',))
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1147
        branch = self.make_remote_branch(transport, client)
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
1148
        branch._ensure_real = lambda: None
1149
        branch.lock_write()
1150
        # The 'TipChangeRejected' error response triggered by calling
1151
        # set_revision_history causes a TipChangeRejected exception.
1152
        err = self.assertRaises(
1153
            errors.TipChangeRejected, branch.set_revision_history, ['rev-id'])
1154
        # The UTF-8 message from the response has been decoded into a unicode
1155
        # object.
1156
        self.assertIsInstance(err.msg, unicode)
1157
        self.assertEqual(rejection_msg_unicode, err.msg)
3691.2.10 by Martin Pool
Update more test_remote tests
1158
        branch.unlock()
1159
        client.finished_test()
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
1160
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
1161
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1162
class TestBranchSetLastRevisionInfo(RemoteBranchTestCase):
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
1163
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
1164
    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.
1165
        # set_last_revision_info(num, 'rev-id') is translated to calling
1166
        # 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'.
1167
        transport = MemoryTransport()
1168
        transport.mkdir('branch')
1169
        transport = transport.clone('branch')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1170
        client = FakeClient(transport.base)
3691.2.10 by Martin Pool
Update more test_remote tests
1171
        # get_stacked_on_url
1172
        client.add_error_response('NotStacked')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1173
        # lock_write
1174
        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.
1175
        # query the current revision
1176
        client.add_success_response('ok', '0', 'null:')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1177
        # set_last_revision
1178
        client.add_success_response('ok')
1179
        # unlock
1180
        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.
1181
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1182
        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.
1183
        # Lock the branch, reset the record of remote calls.
1184
        branch.lock_write()
1185
        client._calls = []
1186
        result = branch.set_last_revision_info(1234, 'a-revision-id')
1187
        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.
1188
            [('call', 'Branch.last_revision_info', ('branch/',)),
1189
             ('call', 'Branch.set_last_revision_info',
3297.4.1 by Andrew Bennetts
Merge 'Add Branch.set_last_revision_info smart method'.
1190
                ('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.
1191
                 '1234', 'a-revision-id'))],
1192
            client._calls)
1193
        self.assertEqual(None, result)
1194
1195
    def test_no_such_revision(self):
1196
        # A response of 'NoSuchRevision' is translated into an exception.
1197
        transport = MemoryTransport()
1198
        transport.mkdir('branch')
1199
        transport = transport.clone('branch')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1200
        client = FakeClient(transport.base)
3691.2.10 by Martin Pool
Update more test_remote tests
1201
        # get_stacked_on_url
1202
        client.add_error_response('NotStacked')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1203
        # lock_write
1204
        client.add_success_response('ok', 'branch token', 'repo token')
1205
        # set_last_revision
1206
        client.add_error_response('NoSuchRevision', 'revid')
1207
        # unlock
1208
        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.
1209
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1210
        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.
1211
        # Lock the branch, reset the record of remote calls.
1212
        branch.lock_write()
1213
        client._calls = []
1214
1215
        self.assertRaises(
1216
            errors.NoSuchRevision, branch.set_last_revision_info, 123, 'revid')
1217
        branch.unlock()
1218
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
1219
    def lock_remote_branch(self, branch):
1220
        """Trick a RemoteBranch into thinking it is locked."""
1221
        branch._lock_mode = 'w'
1222
        branch._lock_count = 2
1223
        branch._lock_token = 'branch token'
1224
        branch._repo_lock_token = 'repo token'
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1225
        branch.repository._lock_mode = 'w'
1226
        branch.repository._lock_count = 2
1227
        branch.repository._lock_token = 'repo token'
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
1228
1229
    def test_backwards_compatibility(self):
1230
        """If the server does not support the Branch.set_last_revision_info
1231
        verb (which is new in 1.4), then the client falls back to VFS methods.
1232
        """
1233
        # This test is a little messy.  Unlike most tests in this file, it
1234
        # doesn't purely test what a Remote* object sends over the wire, and
1235
        # how it reacts to responses from the wire.  It instead relies partly
1236
        # on asserting that the RemoteBranch will call
1237
        # self._real_branch.set_last_revision_info(...).
1238
1239
        # First, set up our RemoteBranch with a FakeClient that raises
1240
        # UnknownSmartMethod, and a StubRealBranch that logs how it is called.
1241
        transport = MemoryTransport()
1242
        transport.mkdir('branch')
1243
        transport = transport.clone('branch')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1244
        client = FakeClient(transport.base)
3691.2.10 by Martin Pool
Update more test_remote tests
1245
        client.add_expected_call(
1246
            'Branch.get_stacked_on_url', ('branch/',),
1247
            'error', ('NotStacked',))
1248
        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.
1249
            'Branch.last_revision_info',
1250
            ('branch/',),
1251
            'success', ('ok', '0', 'null:'))
1252
        client.add_expected_call(
3691.2.10 by Martin Pool
Update more test_remote tests
1253
            'Branch.set_last_revision_info',
1254
            ('branch/', 'branch token', 'repo token', '1234', 'a-revision-id',),
1255
            'unknown', 'Branch.set_last_revision_info')
1256
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1257
        branch = self.make_remote_branch(transport, client)
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
1258
        class StubRealBranch(object):
1259
            def __init__(self):
1260
                self.calls = []
1261
            def set_last_revision_info(self, revno, revision_id):
1262
                self.calls.append(
1263
                    ('set_last_revision_info', revno, revision_id))
3441.5.5 by Andrew Bennetts
Some small tweaks and comments.
1264
            def _clear_cached_state(self):
1265
                pass
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
1266
        real_branch = StubRealBranch()
1267
        branch._real_branch = real_branch
1268
        self.lock_remote_branch(branch)
1269
1270
        # Call set_last_revision_info, and verify it behaved as expected.
1271
        result = branch.set_last_revision_info(1234, 'a-revision-id')
1272
        self.assertEqual(
1273
            [('set_last_revision_info', 1234, 'a-revision-id')],
1274
            real_branch.calls)
3691.2.10 by Martin Pool
Update more test_remote tests
1275
        client.finished_test()
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
1276
3245.4.53 by Andrew Bennetts
Add some missing 'raise' statements to test_remote.
1277
    def test_unexpected_error(self):
3697.2.6 by Martin Pool
Merge 261315 fix into 1.7 branch
1278
        # If the server sends an error the client doesn't understand, it gets
1279
        # turned into an UnknownErrorFromSmartServer, which is presented as a
1280
        # non-internal error to the user.
3245.4.53 by Andrew Bennetts
Add some missing 'raise' statements to test_remote.
1281
        transport = MemoryTransport()
1282
        transport.mkdir('branch')
1283
        transport = transport.clone('branch')
1284
        client = FakeClient(transport.base)
3691.2.10 by Martin Pool
Update more test_remote tests
1285
        # get_stacked_on_url
1286
        client.add_error_response('NotStacked')
3245.4.53 by Andrew Bennetts
Add some missing 'raise' statements to test_remote.
1287
        # lock_write
1288
        client.add_success_response('ok', 'branch token', 'repo token')
1289
        # set_last_revision
1290
        client.add_error_response('UnexpectedError')
1291
        # unlock
1292
        client.add_success_response('ok')
1293
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1294
        branch = self.make_remote_branch(transport, client)
3245.4.53 by Andrew Bennetts
Add some missing 'raise' statements to test_remote.
1295
        # Lock the branch, reset the record of remote calls.
1296
        branch.lock_write()
1297
        client._calls = []
1298
1299
        err = self.assertRaises(
3690.1.2 by Andrew Bennetts
Rename UntranslateableErrorFromSmartServer -> UnknownErrorFromSmartServer.
1300
            errors.UnknownErrorFromSmartServer,
3245.4.53 by Andrew Bennetts
Add some missing 'raise' statements to test_remote.
1301
            branch.set_last_revision_info, 123, 'revid')
1302
        self.assertEqual(('UnexpectedError',), err.error_tuple)
1303
        branch.unlock()
1304
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
1305
    def test_tip_change_rejected(self):
1306
        """TipChangeRejected responses cause a TipChangeRejected exception to
1307
        be raised.
1308
        """
1309
        transport = MemoryTransport()
1310
        transport.mkdir('branch')
1311
        transport = transport.clone('branch')
1312
        client = FakeClient(transport.base)
3691.2.10 by Martin Pool
Update more test_remote tests
1313
        # get_stacked_on_url
1314
        client.add_error_response('NotStacked')
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
1315
        # lock_write
1316
        client.add_success_response('ok', 'branch token', 'repo token')
1317
        # set_last_revision
1318
        client.add_error_response('TipChangeRejected', 'rejection message')
1319
        # unlock
1320
        client.add_success_response('ok')
1321
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1322
        branch = self.make_remote_branch(transport, client)
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
1323
        # Lock the branch, reset the record of remote calls.
1324
        branch.lock_write()
1325
        self.addCleanup(branch.unlock)
1326
        client._calls = []
1327
1328
        # The 'TipChangeRejected' error response triggered by calling
1329
        # set_last_revision_info causes a TipChangeRejected exception.
1330
        err = self.assertRaises(
1331
            errors.TipChangeRejected,
1332
            branch.set_last_revision_info, 123, 'revid')
1333
        self.assertEqual('rejection message', err.msg)
1334
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
1335
4226.2.1 by Robert Collins
Set branch config options via a smart method.
1336
class TestBranchGetSetConfig(RemoteBranchTestCase):
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1337
1338
    def test_get_branch_conf(self):
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
1339
        # in an empty branch we decode the response properly
1340
        client = FakeClient()
1341
        client.add_expected_call(
1342
            'Branch.get_stacked_on_url', ('memory:///',),
1343
            'error', ('NotStacked',),)
1344
        client.add_success_response_with_body('# config file body', 'ok')
1345
        transport = MemoryTransport()
1346
        branch = self.make_remote_branch(transport, client)
1347
        config = branch.get_config()
1348
        config.has_explicit_nickname()
1349
        self.assertEqual(
1350
            [('call', 'Branch.get_stacked_on_url', ('memory:///',)),
1351
             ('call_expecting_body', 'Branch.get_config_file', ('memory:///',))],
1352
            client._calls)
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1353
4241.5.2 by Matt Nordhoff
Add a test
1354
    def test_get_multi_line_branch_conf(self):
1355
        # Make sure that multiple-line branch.conf files are supported
1356
        #
1357
        # https://bugs.edge.launchpad.net/bzr/+bug/354075
1358
        client = FakeClient()
1359
        client.add_expected_call(
1360
            'Branch.get_stacked_on_url', ('memory:///',),
1361
            'error', ('NotStacked',),)
1362
        client.add_success_response_with_body('a = 1\nb = 2\nc = 3\n', 'ok')
1363
        transport = MemoryTransport()
1364
        branch = self.make_remote_branch(transport, client)
1365
        config = branch.get_config()
1366
        self.assertEqual(u'2', config.get_user_option('b'))
1367
4226.2.1 by Robert Collins
Set branch config options via a smart method.
1368
    def test_set_option(self):
1369
        client = FakeClient()
1370
        client.add_expected_call(
1371
            'Branch.get_stacked_on_url', ('memory:///',),
1372
            'error', ('NotStacked',),)
1373
        client.add_expected_call(
1374
            'Branch.lock_write', ('memory:///', '', ''),
1375
            'success', ('ok', 'branch token', 'repo token'))
1376
        client.add_expected_call(
1377
            'Branch.set_config_option', ('memory:///', 'branch token',
1378
            'repo token', 'foo', 'bar', ''),
1379
            'success', ())
1380
        client.add_expected_call(
1381
            'Branch.unlock', ('memory:///', 'branch token', 'repo token'),
1382
            'success', ('ok',))
1383
        transport = MemoryTransport()
1384
        branch = self.make_remote_branch(transport, client)
1385
        branch.lock_write()
1386
        config = branch._get_config()
1387
        config.set_option('foo', 'bar')
1388
        branch.unlock()
1389
        client.finished_test()
1390
1391
    def test_backwards_compat_set_option(self):
1392
        self.setup_smart_server_with_call_log()
1393
        branch = self.make_branch('.')
1394
        verb = 'Branch.set_config_option'
1395
        self.disable_verb(verb)
1396
        branch.lock_write()
1397
        self.addCleanup(branch.unlock)
1398
        self.reset_smart_call_log()
1399
        branch._get_config().set_option('value', 'name')
1400
        self.assertLength(10, self.hpss_calls)
1401
        self.assertEqual('value', branch._get_config().get_option('name'))
1402
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1403
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1404
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.
1405
1406
    def test_lock_write_unlockable(self):
1407
        transport = MemoryTransport()
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1408
        client = FakeClient(transport.base)
3691.2.9 by Martin Pool
Convert and update more test_remote tests
1409
        client.add_expected_call(
1410
            'Branch.get_stacked_on_url', ('quack/',),
1411
            'error', ('NotStacked',),)
1412
        client.add_expected_call(
1413
            'Branch.lock_write', ('quack/', '', ''),
1414
            '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.
1415
        transport.mkdir('quack')
1416
        transport = transport.clone('quack')
3692.1.1 by Andrew Bennetts
Make RemoteBranch.lock_write lock the repository too.
1417
        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.
1418
        self.assertRaises(errors.UnlockableTransport, branch.lock_write)
3691.2.9 by Martin Pool
Convert and update more test_remote tests
1419
        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.
1420
1421
2466.2.2 by Andrew Bennetts
Add tests for RemoteTransport.is_readonly in the style of the other remote object tests.
1422
class TestTransportIsReadonly(tests.TestCase):
1423
1424
    def test_true(self):
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1425
        client = FakeClient()
1426
        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.
1427
        transport = RemoteTransport('bzr://example.com/', medium=False,
1428
                                    _client=client)
1429
        self.assertEqual(True, transport.is_readonly())
1430
        self.assertEqual(
1431
            [('call', 'Transport.is_readonly', ())],
1432
            client._calls)
1433
1434
    def test_false(self):
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1435
        client = FakeClient()
1436
        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.
1437
        transport = RemoteTransport('bzr://example.com/', medium=False,
1438
                                    _client=client)
1439
        self.assertEqual(False, transport.is_readonly())
1440
        self.assertEqual(
1441
            [('call', 'Transport.is_readonly', ())],
1442
            client._calls)
1443
1444
    def test_error_from_old_server(self):
1445
        """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
1446
2466.2.2 by Andrew Bennetts
Add tests for RemoteTransport.is_readonly in the style of the other remote object tests.
1447
        Clients should treat it as a "no" response, because is_readonly is only
1448
        advisory anyway (a transport could be read-write, but then the
1449
        underlying filesystem could be readonly anyway).
1450
        """
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1451
        client = FakeClient()
1452
        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.
1453
        transport = RemoteTransport('bzr://example.com/', medium=False,
1454
                                    _client=client)
1455
        self.assertEqual(False, transport.is_readonly())
1456
        self.assertEqual(
1457
            [('call', 'Transport.is_readonly', ())],
1458
            client._calls)
1459
2466.2.2 by Andrew Bennetts
Add tests for RemoteTransport.is_readonly in the style of the other remote object tests.
1460
3840.1.1 by Andrew Bennetts
Fix RemoteTransport's translation of errors involving paths; it wasn't passing orig_path to _translate_error.
1461
class TestTransportMkdir(tests.TestCase):
1462
1463
    def test_permissiondenied(self):
1464
        client = FakeClient()
1465
        client.add_error_response('PermissionDenied', 'remote path', 'extra')
1466
        transport = RemoteTransport('bzr://example.com/', medium=False,
1467
                                    _client=client)
1468
        exc = self.assertRaises(
1469
            errors.PermissionDenied, transport.mkdir, 'client path')
1470
        expected_error = errors.PermissionDenied('/client path', 'extra')
1471
        self.assertEqual(expected_error, exc)
1472
1473
3777.1.3 by Aaron Bentley
Use SSH default username from authentication.conf
1474
class TestRemoteSSHTransportAuthentication(tests.TestCaseInTempDir):
1475
4222.3.8 by Jelmer Vernooij
Test that for sftp and ssh getpass.getuser() is returned by AuthenticationConfig.get_user() rather than None.
1476
    def test_defaults_to_getuser(self):
3777.1.3 by Aaron Bentley
Use SSH default username from authentication.conf
1477
        t = RemoteSSHTransport('bzr+ssh://example.com')
4222.3.8 by Jelmer Vernooij
Test that for sftp and ssh getpass.getuser() is returned by AuthenticationConfig.get_user() rather than None.
1478
        self.assertIs(getpass.getuser(), t._get_credentials()[0])
3777.1.3 by Aaron Bentley
Use SSH default username from authentication.conf
1479
1480
    def test_uses_authentication_config(self):
1481
        conf = config.AuthenticationConfig()
1482
        conf._get_config().update(
1483
            {'bzr+sshtest': {'scheme': 'ssh', 'user': 'bar', 'host':
1484
            'example.com'}})
1485
        conf._save()
1486
        t = RemoteSSHTransport('bzr+ssh://example.com')
1487
        self.assertEqual('bar', t._get_credentials()[0])
1488
1489
4017.3.4 by Robert Collins
Create a verb for Repository.set_make_working_trees.
1490
class TestRemoteRepository(TestRemote):
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
1491
    """Base for testing RemoteRepository protocol usage.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1492
1493
    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
1494
    what is sent or expected to be require a thoughtful update to these tests
1495
    because they might break compatibility with different-versioned servers.
1496
    """
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1497
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1498
    def setup_fake_client_and_repository(self, transport_path):
2018.18.7 by Martin Pool
(broken) Start addng client proxy test for Repository.tarball
1499
        """Create the fake client and repository for testing with.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1500
2018.18.7 by Martin Pool
(broken) Start addng client proxy test for Repository.tarball
1501
        There's no real server here; we just have canned responses sent
1502
        back one by one.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1503
2018.18.7 by Martin Pool
(broken) Start addng client proxy test for Repository.tarball
1504
        :param transport_path: Path below the root of the MemoryTransport
1505
            where the repository will be created.
1506
        """
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1507
        transport = MemoryTransport()
1508
        transport.mkdir(transport_path)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1509
        client = FakeClient(transport.base)
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1510
        transport = transport.clone(transport_path)
1511
        # 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.
1512
        bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
1513
            _client=False)
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1514
        repo = RemoteRepository(bzrdir, None, _client=client)
1515
        return repo, client
1516
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1517
4183.5.1 by Robert Collins
Add RepositoryFormat.fast_deltas to signal fast delta creation.
1518
class TestRepositoryFormat(TestRemoteRepository):
1519
1520
    def test_fast_delta(self):
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
1521
        true_name = groupcompress_repo.RepositoryFormatCHK1().network_name()
4183.5.1 by Robert Collins
Add RepositoryFormat.fast_deltas to signal fast delta creation.
1522
        true_format = RemoteRepositoryFormat()
1523
        true_format._network_name = true_name
1524
        self.assertEqual(True, true_format.fast_deltas)
1525
        false_name = pack_repo.RepositoryFormatKnitPack1().network_name()
1526
        false_format = RemoteRepositoryFormat()
1527
        false_format._network_name = false_name
1528
        self.assertEqual(False, false_format.fast_deltas)
1529
1530
2018.12.2 by Andrew Bennetts
Remove some duplicate code in test_remote
1531
class TestRepositoryGatherStats(TestRemoteRepository):
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
1532
1533
    def test_revid_none(self):
1534
        # ('ok',), body with revisions and size
1535
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1536
        repo, client = self.setup_fake_client_and_repository(transport_path)
1537
        client.add_success_response_with_body(
1538
            'revisions: 2\nsize: 18\n', 'ok')
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
1539
        result = repo.gather_stats(None)
1540
        self.assertEqual(
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
1541
            [('call_expecting_body', 'Repository.gather_stats',
3104.4.2 by Andrew Bennetts
All tests passing.
1542
             ('quack/','','no'))],
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
1543
            client._calls)
1544
        self.assertEqual({'revisions': 2, 'size': 18}, result)
1545
1546
    def test_revid_no_committers(self):
1547
        # ('ok',), body without committers
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1548
        body = ('firstrev: 123456.300 3600\n'
1549
                'latestrev: 654231.400 0\n'
1550
                'revisions: 2\n'
1551
                'size: 18\n')
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
1552
        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.
1553
        revid = u'\xc8'.encode('utf8')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1554
        repo, client = self.setup_fake_client_and_repository(transport_path)
1555
        client.add_success_response_with_body(body, 'ok')
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
1556
        result = repo.gather_stats(revid)
1557
        self.assertEqual(
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
1558
            [('call_expecting_body', 'Repository.gather_stats',
3104.4.2 by Andrew Bennetts
All tests passing.
1559
              ('quick/', revid, 'no'))],
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
1560
            client._calls)
1561
        self.assertEqual({'revisions': 2, 'size': 18,
1562
                          'firstrev': (123456.300, 3600),
1563
                          'latestrev': (654231.400, 0),},
1564
                         result)
1565
1566
    def test_revid_with_committers(self):
1567
        # ('ok',), body with committers
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1568
        body = ('committers: 128\n'
1569
                'firstrev: 123456.300 3600\n'
1570
                'latestrev: 654231.400 0\n'
1571
                'revisions: 2\n'
1572
                'size: 18\n')
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
1573
        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.
1574
        revid = u'\xc8'.encode('utf8')
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1575
        repo, client = self.setup_fake_client_and_repository(transport_path)
1576
        client.add_success_response_with_body(body, 'ok')
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
1577
        result = repo.gather_stats(revid, True)
1578
        self.assertEqual(
2018.5.153 by Andrew Bennetts
Rename call2 to call_expecting_body, and other small changes prompted by review.
1579
            [('call_expecting_body', 'Repository.gather_stats',
3104.4.2 by Andrew Bennetts
All tests passing.
1580
              ('buick/', revid, 'yes'))],
2018.10.3 by v.ladeuil+lp at free
more tests for gather_stats
1581
            client._calls)
1582
        self.assertEqual({'revisions': 2, 'size': 18,
1583
                          'committers': 128,
1584
                          'firstrev': (123456.300, 3600),
1585
                          'latestrev': (654231.400, 0),},
1586
                         result)
1587
1588
3172.5.4 by Robert Collins
Implement get_parent_map for RemoteRepository with caching, based on get_revision_graph.
1589
class TestRepositoryGetGraph(TestRemoteRepository):
1590
1591
    def test_get_graph(self):
3835.1.6 by Aaron Bentley
Reduce inefficiency when doing make_parents_provider frequently
1592
        # 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.
1593
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1594
        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.
1595
        graph = repo.get_graph()
3835.1.6 by Aaron Bentley
Reduce inefficiency when doing make_parents_provider frequently
1596
        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.
1597
1598
1599
class TestRepositoryGetParentMap(TestRemoteRepository):
1600
1601
    def test_get_parent_map_caching(self):
1602
        # get_parent_map returns from cache until unlock()
1603
        # setup a reponse with two revisions
1604
        r1 = u'\u0e33'.encode('utf8')
1605
        r2 = u'\u0dab'.encode('utf8')
1606
        lines = [' '.join([r2, r1]), r1]
3211.5.2 by Robert Collins
Change RemoteRepository.get_parent_map to use bz2 not gzip for compression.
1607
        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.
1608
1609
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1610
        repo, client = self.setup_fake_client_and_repository(transport_path)
1611
        client.add_success_response_with_body(encoded_body, 'ok')
1612
        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.
1613
        repo.lock_read()
1614
        graph = repo.get_graph()
1615
        parents = graph.get_parent_map([r2])
1616
        self.assertEqual({r2: (r1,)}, parents)
1617
        # locking and unlocking deeper should not reset
1618
        repo.lock_read()
1619
        repo.unlock()
1620
        parents = graph.get_parent_map([r1])
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
1621
        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.
1622
        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.
1623
            [('call_with_body_bytes_expecting_body',
4190.1.6 by Robert Collins
Missed some unit tests.
1624
              'Repository.get_parent_map', ('quack/', 'include-missing:', r2),
1625
              '\n\n0')],
3172.5.4 by Robert Collins
Implement get_parent_map for RemoteRepository with caching, based on get_revision_graph.
1626
            client._calls)
1627
        repo.unlock()
1628
        # now we call again, and it should use the second response.
1629
        repo.lock_read()
1630
        graph = repo.get_graph()
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
1631
        parents = graph.get_parent_map([r1])
1632
        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.
1633
        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.
1634
            [('call_with_body_bytes_expecting_body',
4190.1.6 by Robert Collins
Missed some unit tests.
1635
              'Repository.get_parent_map', ('quack/', 'include-missing:', r2),
1636
              '\n\n0'),
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.
1637
             ('call_with_body_bytes_expecting_body',
4190.1.6 by Robert Collins
Missed some unit tests.
1638
              'Repository.get_parent_map', ('quack/', 'include-missing:', r1),
1639
              '\n\n0'),
3172.5.4 by Robert Collins
Implement get_parent_map for RemoteRepository with caching, based on get_revision_graph.
1640
            ],
1641
            client._calls)
1642
        repo.unlock()
1643
3213.1.2 by Andrew Bennetts
Add test for reconnection if get_parent_map is unknown by the server.
1644
    def test_get_parent_map_reconnects_if_unknown_method(self):
1645
        transport_path = 'quack'
3948.3.7 by Martin Pool
Updated tests for RemoteRepository.get_parent_map on old servers.
1646
        rev_id = 'revision-id'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1647
        repo, client = self.setup_fake_client_and_repository(transport_path)
3948.3.7 by Martin Pool
Updated tests for RemoteRepository.get_parent_map on old servers.
1648
        client.add_unknown_method_response('Repository.get_parent_map')
1649
        client.add_success_response_with_body(rev_id, 'ok')
3453.4.10 by Andrew Bennetts
Change _is_remote_at_least to _is_remote_before.
1650
        self.assertFalse(client._medium._is_remote_before((1, 2)))
3948.3.7 by Martin Pool
Updated tests for RemoteRepository.get_parent_map on old servers.
1651
        parents = 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.
1652
        self.assertEqual(
3213.1.8 by Andrew Bennetts
Merge from bzr.dev.
1653
            [('call_with_body_bytes_expecting_body',
4190.1.6 by Robert Collins
Missed some unit tests.
1654
              'Repository.get_parent_map', ('quack/', 'include-missing:',
1655
              rev_id), '\n\n0'),
3213.1.2 by Andrew Bennetts
Add test for reconnection if get_parent_map is unknown by the server.
1656
             ('disconnect medium',),
1657
             ('call_expecting_body', 'Repository.get_revision_graph',
1658
              ('quack/', ''))],
1659
            client._calls)
3389.1.2 by Andrew Bennetts
Add test for the bug John found.
1660
        # 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.
1661
        self.assertTrue(client._medium._is_remote_before((1, 2)))
3948.3.7 by Martin Pool
Updated tests for RemoteRepository.get_parent_map on old servers.
1662
        self.assertEqual({rev_id: ('null:',)}, parents)
3389.1.2 by Andrew Bennetts
Add test for the bug John found.
1663
1664
    def test_get_parent_map_fallback_parentless_node(self):
1665
        """get_parent_map falls back to get_revision_graph on old servers.  The
1666
        results from get_revision_graph are tweaked to match the get_parent_map
1667
        API.
1668
3389.1.3 by Andrew Bennetts
Remove XXX from test description.
1669
        Specifically, a {key: ()} result from get_revision_graph means "no
3389.1.2 by Andrew Bennetts
Add test for the bug John found.
1670
        parents" for that key, which in get_parent_map results should be
3389.1.3 by Andrew Bennetts
Remove XXX from test description.
1671
        represented as {key: ('null:',)}.
3389.1.2 by Andrew Bennetts
Add test for the bug John found.
1672
1673
        This is the test for https://bugs.launchpad.net/bzr/+bug/214894
1674
        """
1675
        rev_id = 'revision-id'
1676
        transport_path = 'quack'
3245.4.40 by Andrew Bennetts
Merge from bzr.dev.
1677
        repo, client = self.setup_fake_client_and_repository(transport_path)
1678
        client.add_success_response_with_body(rev_id, 'ok')
3453.4.9 by Andrew Bennetts
Rename _remote_is_not to _remember_remote_is_before.
1679
        client._medium._remember_remote_is_before((1, 2))
3948.3.7 by Martin Pool
Updated tests for RemoteRepository.get_parent_map on old servers.
1680
        parents = repo.get_parent_map([rev_id])
3389.1.2 by Andrew Bennetts
Add test for the bug John found.
1681
        self.assertEqual(
1682
            [('call_expecting_body', 'Repository.get_revision_graph',
1683
             ('quack/', ''))],
1684
            client._calls)
1685
        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.
1686
3297.2.3 by Andrew Bennetts
Test the code path that the typo is on.
1687
    def test_get_parent_map_unexpected_response(self):
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1688
        repo, client = self.setup_fake_client_and_repository('path')
1689
        client.add_success_response('something unexpected!')
3297.2.3 by Andrew Bennetts
Test the code path that the typo is on.
1690
        self.assertRaises(
1691
            errors.UnexpectedSmartServerResponse,
1692
            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.
1693
4190.1.1 by Robert Collins
Negatively cache misses during read-locks in RemoteRepository.
1694
    def test_get_parent_map_negative_caches_missing_keys(self):
1695
        self.setup_smart_server_with_call_log()
1696
        repo = self.make_repository('foo')
1697
        self.assertIsInstance(repo, RemoteRepository)
1698
        repo.lock_read()
1699
        self.addCleanup(repo.unlock)
1700
        self.reset_smart_call_log()
1701
        graph = repo.get_graph()
1702
        self.assertEqual({},
1703
            graph.get_parent_map(['some-missing', 'other-missing']))
1704
        self.assertLength(1, self.hpss_calls)
1705
        # No call if we repeat this
1706
        self.reset_smart_call_log()
1707
        graph = repo.get_graph()
1708
        self.assertEqual({},
1709
            graph.get_parent_map(['some-missing', 'other-missing']))
1710
        self.assertLength(0, self.hpss_calls)
1711
        # Asking for more unknown keys makes a request.
1712
        self.reset_smart_call_log()
1713
        graph = repo.get_graph()
1714
        self.assertEqual({},
1715
            graph.get_parent_map(['some-missing', 'other-missing',
1716
                'more-missing']))
1717
        self.assertLength(1, self.hpss_calls)
1718
4214.2.1 by Andrew Bennetts
A long but failing test for the get_parent_map RPC bug.
1719
    def disableExtraResults(self):
1720
        old_flag = SmartServerRepositoryGetParentMap.no_extra_results
1721
        SmartServerRepositoryGetParentMap.no_extra_results = True
1722
        def reset_values():
1723
            SmartServerRepositoryGetParentMap.no_extra_results = old_flag
1724
        self.addCleanup(reset_values)
1725
4214.2.5 by Andrew Bennetts
Fix the bug.
1726
    def test_null_cached_missing_and_stop_key(self):
4214.2.1 by Andrew Bennetts
A long but failing test for the get_parent_map RPC bug.
1727
        self.setup_smart_server_with_call_log()
4214.2.4 by Andrew Bennetts
Further simplify the test to reproduce the bug.
1728
        # Make a branch with a single revision.
4214.2.1 by Andrew Bennetts
A long but failing test for the get_parent_map RPC bug.
1729
        builder = self.make_branch_builder('foo')
1730
        builder.start_series()
1731
        builder.build_snapshot('first', None, [
1732
            ('add', ('', 'root-id', 'directory', ''))])
1733
        builder.finish_series()
1734
        branch = builder.get_branch()
1735
        repo = branch.repository
1736
        self.assertIsInstance(repo, RemoteRepository)
4214.2.3 by Andrew Bennetts
Further simplify test case, and add more comments.
1737
        # Stop the server from sending extra results.
1738
        self.disableExtraResults()
4214.2.1 by Andrew Bennetts
A long but failing test for the get_parent_map RPC bug.
1739
        repo.lock_read()
1740
        self.addCleanup(repo.unlock)
1741
        self.reset_smart_call_log()
1742
        graph = repo.get_graph()
4214.2.4 by Andrew Bennetts
Further simplify the test to reproduce the bug.
1743
        # Query for 'first' and 'null:'.  Because 'null:' is a parent of
4214.2.5 by Andrew Bennetts
Fix the bug.
1744
        # 'first' it will be a candidate for the stop_keys of subsequent
1745
        # requests, and because 'null:' was queried but not returned it will be
1746
        # cached as missing.
4214.2.1 by Andrew Bennetts
A long but failing test for the get_parent_map RPC bug.
1747
        self.assertEqual({'first': ('null:',)},
4214.2.4 by Andrew Bennetts
Further simplify the test to reproduce the bug.
1748
            graph.get_parent_map(['first', 'null:']))
1749
        # Now query for another key.  This request will pass along a recipe of
1750
        # start and stop keys describing the already cached results, and this
4214.2.5 by Andrew Bennetts
Fix the bug.
1751
        # recipe's revision count must be correct (or else it will trigger an
4214.2.4 by Andrew Bennetts
Further simplify the test to reproduce the bug.
1752
        # error from the server).
4214.2.5 by Andrew Bennetts
Fix the bug.
1753
        self.assertEqual({}, graph.get_parent_map(['another-key']))
4214.2.3 by Andrew Bennetts
Further simplify test case, and add more comments.
1754
        # This assertion guards against disableExtraResults silently failing to
1755
        # work, thus invalidating the test.
4214.2.4 by Andrew Bennetts
Further simplify the test to reproduce the bug.
1756
        self.assertLength(2, self.hpss_calls)
4214.2.1 by Andrew Bennetts
A long but failing test for the get_parent_map RPC bug.
1757
4190.1.4 by Robert Collins
Cache ghosts when we can get them from a RemoteRepository in get_parent_map.
1758
    def test_get_parent_map_gets_ghosts_from_result(self):
1759
        # asking for a revision should negatively cache close ghosts in its
1760
        # ancestry.
1761
        self.setup_smart_server_with_call_log()
1762
        tree = self.make_branch_and_memory_tree('foo')
1763
        tree.lock_write()
1764
        try:
1765
            builder = treebuilder.TreeBuilder()
1766
            builder.start_tree(tree)
1767
            builder.build([])
1768
            builder.finish_tree()
1769
            tree.set_parent_ids(['non-existant'], allow_leftmost_as_ghost=True)
1770
            rev_id = tree.commit('')
1771
        finally:
1772
            tree.unlock()
1773
        tree.lock_read()
1774
        self.addCleanup(tree.unlock)
1775
        repo = tree.branch.repository
1776
        self.assertIsInstance(repo, RemoteRepository)
1777
        # ask for rev_id
1778
        repo.get_parent_map([rev_id])
1779
        self.reset_smart_call_log()
1780
        # Now asking for rev_id's ghost parent should not make calls
1781
        self.assertEqual({}, repo.get_parent_map(['non-existant']))
1782
        self.assertLength(0, self.hpss_calls)
1783
3172.5.4 by Robert Collins
Implement get_parent_map for RemoteRepository with caching, based on get_revision_graph.
1784
3835.1.15 by Aaron Bentley
Allow miss caching to be disabled.
1785
class TestGetParentMapAllowsNew(tests.TestCaseWithTransport):
1786
1787
    def test_allows_new_revisions(self):
1788
        """get_parent_map's results can be updated by commit."""
1789
        smart_server = server.SmartTCPServer_for_testing()
1790
        smart_server.setUp()
1791
        self.addCleanup(smart_server.tearDown)
1792
        self.make_branch('branch')
1793
        branch = Branch.open(smart_server.get_url() + '/branch')
1794
        tree = branch.create_checkout('tree', lightweight=True)
1795
        tree.lock_write()
1796
        self.addCleanup(tree.unlock)
1797
        graph = tree.branch.repository.get_graph()
1798
        # This provides an opportunity for the missing rev-id to be cached.
1799
        self.assertEqual({}, graph.get_parent_map(['rev1']))
1800
        tree.commit('message', rev_id='rev1')
1801
        graph = tree.branch.repository.get_graph()
1802
        self.assertEqual({'rev1': ('null:',)}, graph.get_parent_map(['rev1']))
1803
1804
3948.3.9 by Martin Pool
Undelete TestRepositoryGetRevisionGraph but make it use private client methods to simulate old clients
1805
class TestRepositoryGetRevisionGraph(TestRemoteRepository):
1806
1807
    def test_null_revision(self):
1808
        # a null revision has the predictable result {}, we should have no wire
1809
        # traffic when calling it with this argument
1810
        transport_path = 'empty'
1811
        repo, client = self.setup_fake_client_and_repository(transport_path)
1812
        client.add_success_response('notused')
1813
        # actual RemoteRepository.get_revision_graph is gone, but there's an
1814
        # equivalent private method for testing
1815
        result = repo._get_revision_graph(NULL_REVISION)
1816
        self.assertEqual([], client._calls)
1817
        self.assertEqual({}, result)
1818
1819
    def test_none_revision(self):
1820
        # with none we want the entire graph
1821
        r1 = u'\u0e33'.encode('utf8')
1822
        r2 = u'\u0dab'.encode('utf8')
1823
        lines = [' '.join([r2, r1]), r1]
1824
        encoded_body = '\n'.join(lines)
1825
1826
        transport_path = 'sinhala'
1827
        repo, client = self.setup_fake_client_and_repository(transport_path)
1828
        client.add_success_response_with_body(encoded_body, 'ok')
1829
        # actual RemoteRepository.get_revision_graph is gone, but there's an
1830
        # equivalent private method for testing
1831
        result = repo._get_revision_graph(None)
1832
        self.assertEqual(
1833
            [('call_expecting_body', 'Repository.get_revision_graph',
1834
             ('sinhala/', ''))],
1835
            client._calls)
1836
        self.assertEqual({r1: (), r2: (r1, )}, result)
1837
1838
    def test_specific_revision(self):
1839
        # with a specific revision we want the graph for that
1840
        # with none we want the entire graph
1841
        r11 = u'\u0e33'.encode('utf8')
1842
        r12 = u'\xc9'.encode('utf8')
1843
        r2 = u'\u0dab'.encode('utf8')
1844
        lines = [' '.join([r2, r11, r12]), r11, r12]
1845
        encoded_body = '\n'.join(lines)
1846
1847
        transport_path = 'sinhala'
1848
        repo, client = self.setup_fake_client_and_repository(transport_path)
1849
        client.add_success_response_with_body(encoded_body, 'ok')
1850
        result = repo._get_revision_graph(r2)
1851
        self.assertEqual(
1852
            [('call_expecting_body', 'Repository.get_revision_graph',
1853
             ('sinhala/', r2))],
1854
            client._calls)
1855
        self.assertEqual({r11: (), r12: (), r2: (r11, r12), }, result)
1856
1857
    def test_no_such_revision(self):
1858
        revid = '123'
1859
        transport_path = 'sinhala'
1860
        repo, client = self.setup_fake_client_and_repository(transport_path)
1861
        client.add_error_response('nosuchrevision', revid)
1862
        # also check that the right revision is reported in the error
1863
        self.assertRaises(errors.NoSuchRevision,
1864
            repo._get_revision_graph, revid)
1865
        self.assertEqual(
1866
            [('call_expecting_body', 'Repository.get_revision_graph',
1867
             ('sinhala/', revid))],
1868
            client._calls)
1869
1870
    def test_unexpected_error(self):
1871
        revid = '123'
1872
        transport_path = 'sinhala'
1873
        repo, client = self.setup_fake_client_and_repository(transport_path)
1874
        client.add_error_response('AnUnexpectedError')
1875
        e = self.assertRaises(errors.UnknownErrorFromSmartServer,
1876
            repo._get_revision_graph, revid)
1877
        self.assertEqual(('AnUnexpectedError',), e.error_tuple)
1878
1879
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1880
class TestRepositoryIsShared(TestRemoteRepository):
1881
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1882
    def test_is_shared(self):
1883
        # ('yes', ) for Repository.is_shared -> 'True'.
1884
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1885
        repo, client = self.setup_fake_client_and_repository(transport_path)
1886
        client.add_success_response('yes')
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1887
        result = repo.is_shared()
1888
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
1889
            [('call', 'Repository.is_shared', ('quack/',))],
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1890
            client._calls)
1891
        self.assertEqual(True, result)
1892
1893
    def test_is_not_shared(self):
1894
        # ('no', ) for Repository.is_shared -> 'False'.
1895
        transport_path = 'qwack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1896
        repo, client = self.setup_fake_client_and_repository(transport_path)
1897
        client.add_success_response('no')
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1898
        result = repo.is_shared()
1899
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
1900
            [('call', 'Repository.is_shared', ('qwack/',))],
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1901
            client._calls)
1902
        self.assertEqual(False, result)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1903
1904
1905
class TestRepositoryLockWrite(TestRemoteRepository):
1906
1907
    def test_lock_write(self):
1908
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1909
        repo, client = self.setup_fake_client_and_repository(transport_path)
1910
        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
1911
        result = repo.lock_write()
1912
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
1913
            [('call', 'Repository.lock_write', ('quack/', ''))],
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1914
            client._calls)
1915
        self.assertEqual('a token', result)
1916
1917
    def test_lock_write_already_locked(self):
1918
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1919
        repo, client = self.setup_fake_client_and_repository(transport_path)
1920
        client.add_error_response('LockContention')
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1921
        self.assertRaises(errors.LockContention, repo.lock_write)
1922
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
1923
            [('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.
1924
            client._calls)
1925
1926
    def test_lock_write_unlockable(self):
1927
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1928
        repo, client = self.setup_fake_client_and_repository(transport_path)
1929
        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.
1930
        self.assertRaises(errors.UnlockableTransport, repo.lock_write)
1931
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
1932
            [('call', 'Repository.lock_write', ('quack/', ''))],
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1933
            client._calls)
1934
1935
4017.3.4 by Robert Collins
Create a verb for Repository.set_make_working_trees.
1936
class TestRepositorySetMakeWorkingTrees(TestRemoteRepository):
1937
1938
    def test_backwards_compat(self):
1939
        self.setup_smart_server_with_call_log()
1940
        repo = self.make_repository('.')
1941
        self.reset_smart_call_log()
1942
        verb = 'Repository.set_make_working_trees'
1943
        self.disable_verb(verb)
1944
        repo.set_make_working_trees(True)
1945
        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.
1946
            call.call.method == verb])
4017.3.4 by Robert Collins
Create a verb for Repository.set_make_working_trees.
1947
        self.assertEqual(1, call_count)
1948
1949
    def test_current(self):
1950
        transport_path = 'quack'
1951
        repo, client = self.setup_fake_client_and_repository(transport_path)
1952
        client.add_expected_call(
1953
            'Repository.set_make_working_trees', ('quack/', 'True'),
1954
            'success', ('ok',))
1955
        client.add_expected_call(
1956
            'Repository.set_make_working_trees', ('quack/', 'False'),
1957
            'success', ('ok',))
1958
        repo.set_make_working_trees(True)
1959
        repo.set_make_working_trees(False)
1960
1961
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1962
class TestRepositoryUnlock(TestRemoteRepository):
1963
1964
    def test_unlock(self):
1965
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1966
        repo, client = self.setup_fake_client_and_repository(transport_path)
1967
        client.add_success_response('ok', 'a token')
1968
        client.add_success_response('ok')
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1969
        repo.lock_write()
1970
        repo.unlock()
1971
        self.assertEqual(
3104.4.2 by Andrew Bennetts
All tests passing.
1972
            [('call', 'Repository.lock_write', ('quack/', '')),
1973
             ('call', 'Repository.unlock', ('quack/', 'a token'))],
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1974
            client._calls)
1975
1976
    def test_unlock_wrong_token(self):
1977
        # If somehow the token is wrong, unlock will raise TokenMismatch.
1978
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1979
        repo, client = self.setup_fake_client_and_repository(transport_path)
1980
        client.add_success_response('ok', 'a token')
1981
        client.add_error_response('TokenMismatch')
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1982
        repo.lock_write()
1983
        self.assertRaises(errors.TokenMismatch, repo.unlock)
1984
1985
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1986
class TestRepositoryHasRevision(TestRemoteRepository):
1987
1988
    def test_none(self):
1989
        # repo.has_revision(None) should not cause any traffic.
1990
        transport_path = 'quack'
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1991
        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.
1992
1993
        # The null revision is always there, so has_revision(None) == True.
3172.3.3 by Robert Collins
Missed one occurence of None -> NULL_REVISION.
1994
        self.assertEqual(True, repo.has_revision(NULL_REVISION))
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1995
1996
        # The remote repo shouldn't be accessed.
1997
        self.assertEqual([], client._calls)
2018.18.7 by Martin Pool
(broken) Start addng client proxy test for Repository.tarball
1998
1999
4144.3.2 by Andrew Bennetts
Use Repository.insert_stream_locked if there is a lock_token for the remote repo.
2000
class TestRepositoryInsertStream(TestRemoteRepository):
2001
2002
    def test_unlocked_repo(self):
2003
        transport_path = 'quack'
2004
        repo, client = self.setup_fake_client_and_repository(transport_path)
2005
        client.add_expected_call(
2006
            'Repository.insert_stream', ('quack/', ''),
2007
            'success', ('ok',))
2008
        client.add_expected_call(
2009
            'Repository.insert_stream', ('quack/', ''),
2010
            'success', ('ok',))
2011
        sink = repo._get_sink()
2012
        fmt = repository.RepositoryFormat.get_default_format()
2013
        resume_tokens, missing_keys = sink.insert_stream([], fmt, [])
2014
        self.assertEqual([], resume_tokens)
2015
        self.assertEqual(set(), missing_keys)
2016
        client.finished_test()
2017
2018
    def test_locked_repo_with_no_lock_token(self):
2019
        transport_path = 'quack'
2020
        repo, client = self.setup_fake_client_and_repository(transport_path)
2021
        client.add_expected_call(
2022
            'Repository.lock_write', ('quack/', ''),
2023
            'success', ('ok', ''))
2024
        client.add_expected_call(
2025
            'Repository.insert_stream', ('quack/', ''),
2026
            'success', ('ok',))
2027
        client.add_expected_call(
2028
            'Repository.insert_stream', ('quack/', ''),
2029
            'success', ('ok',))
2030
        repo.lock_write()
2031
        sink = repo._get_sink()
2032
        fmt = repository.RepositoryFormat.get_default_format()
2033
        resume_tokens, missing_keys = sink.insert_stream([], fmt, [])
2034
        self.assertEqual([], resume_tokens)
2035
        self.assertEqual(set(), missing_keys)
2036
        client.finished_test()
2037
2038
    def test_locked_repo_with_lock_token(self):
2039
        transport_path = 'quack'
2040
        repo, client = self.setup_fake_client_and_repository(transport_path)
2041
        client.add_expected_call(
2042
            'Repository.lock_write', ('quack/', ''),
2043
            'success', ('ok', 'a token'))
2044
        client.add_expected_call(
2045
            'Repository.insert_stream_locked', ('quack/', '', 'a token'),
2046
            'success', ('ok',))
2047
        client.add_expected_call(
2048
            'Repository.insert_stream_locked', ('quack/', '', 'a token'),
2049
            'success', ('ok',))
2050
        repo.lock_write()
2051
        sink = repo._get_sink()
2052
        fmt = repository.RepositoryFormat.get_default_format()
2053
        resume_tokens, missing_keys = sink.insert_stream([], fmt, [])
2054
        self.assertEqual([], resume_tokens)
2055
        self.assertEqual(set(), missing_keys)
2056
        client.finished_test()
2057
2058
2018.18.7 by Martin Pool
(broken) Start addng client proxy test for Repository.tarball
2059
class TestRepositoryTarball(TestRemoteRepository):
2060
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
2061
    # This is a canned tarball reponse we can validate against
2018.18.18 by Martin Pool
reformat
2062
    tarball_content = (
2018.18.23 by Martin Pool
review cleanups
2063
        'QlpoOTFBWSZTWdGkj3wAAWF/k8aQACBIB//A9+8cIX/v33AACEAYABAECEACNz'
2064
        'JqsgJJFPTSnk1A3qh6mTQAAAANPUHkagkSTEkaA09QaNAAAGgAAAcwCYCZGAEY'
2065
        'mJhMJghpiaYBUkKammSHqNMZQ0NABkNAeo0AGneAevnlwQoGzEzNVzaYxp/1Uk'
2066
        'xXzA1CQX0BJMZZLcPBrluJir5SQyijWHYZ6ZUtVqqlYDdB2QoCwa9GyWwGYDMA'
2067
        'OQYhkpLt/OKFnnlT8E0PmO8+ZNSo2WWqeCzGB5fBXZ3IvV7uNJVE7DYnWj6qwB'
2068
        'k5DJDIrQ5OQHHIjkS9KqwG3mc3t+F1+iujb89ufyBNIKCgeZBWrl5cXxbMGoMs'
2069
        'c9JuUkg5YsiVcaZJurc6KLi6yKOkgCUOlIlOpOoXyrTJjK8ZgbklReDdwGmFgt'
2070
        'dkVsAIslSVCd4AtACSLbyhLHryfb14PKegrVDba+U8OL6KQtzdM5HLjAc8/p6n'
2071
        '0lgaWU8skgO7xupPTkyuwheSckejFLK5T4ZOo0Gda9viaIhpD1Qn7JqqlKAJqC'
2072
        'QplPKp2nqBWAfwBGaOwVrz3y1T+UZZNismXHsb2Jq18T+VaD9k4P8DqE3g70qV'
2073
        'JLurpnDI6VS5oqDDPVbtVjMxMxMg4rzQVipn2Bv1fVNK0iq3Gl0hhnnHKm/egy'
2074
        'nWQ7QH/F3JFOFCQ0aSPfA='
2075
        ).decode('base64')
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
2076
2018.18.7 by Martin Pool
(broken) Start addng client proxy test for Repository.tarball
2077
    def test_repository_tarball(self):
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
2078
        # Test that Repository.tarball generates the right operations
2018.18.7 by Martin Pool
(broken) Start addng client proxy test for Repository.tarball
2079
        transport_path = 'repo'
2018.18.14 by Martin Pool
merge hpss again; restore incorrectly removed RemoteRepository.break_lock
2080
        expected_calls = [('call_expecting_body', 'Repository.tarball',
3104.4.2 by Andrew Bennetts
All tests passing.
2081
                           ('repo/', 'bz2',),),
2018.18.7 by Martin Pool
(broken) Start addng client proxy test for Repository.tarball
2082
            ]
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
2083
        repo, client = self.setup_fake_client_and_repository(transport_path)
2084
        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
2085
        # Now actually ask for the tarball
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
2086
        tarball_file = repo._get_tarball('bz2')
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
2087
        try:
2088
            self.assertEqual(expected_calls, client._calls)
2089
            self.assertEqual(self.tarball_content, tarball_file.read())
2090
        finally:
2091
            tarball_file.close()
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
2092
2093
2094
class TestRemoteRepositoryCopyContent(tests.TestCaseWithTransport):
2095
    """RemoteRepository.copy_content_into optimizations"""
2096
2018.18.10 by Martin Pool
copy_content_into from Remote repositories by using temporary directories on both ends.
2097
    def test_copy_content_remote_to_local(self):
2098
        self.transport_server = server.SmartTCPServer_for_testing
2099
        src_repo = self.make_repository('repo1')
2100
        src_repo = repository.Repository.open(self.get_url('repo1'))
2101
        # At the moment the tarball-based copy_content_into can't write back
2102
        # into a smart server.  It would be good if it could upload the
2103
        # tarball; once that works we'd have to create repositories of
2104
        # different formats. -- mbp 20070410
2105
        dest_url = self.get_vfs_only_url('repo2')
2106
        dest_bzrdir = BzrDir.create(dest_url)
2107
        dest_repo = dest_bzrdir.create_repository()
2108
        self.assertFalse(isinstance(dest_repo, RemoteRepository))
2109
        self.assertTrue(isinstance(src_repo, RemoteRepository))
2110
        src_repo.copy_content_into(dest_repo)
3533.3.3 by Andrew Bennetts
Add unit tests for bzrlib.remote._translate_error.
2111
2112
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
2113
class _StubRealPackRepository(object):
2114
2115
    def __init__(self, calls):
4145.1.6 by Robert Collins
More test fallout, but all caught now.
2116
        self.calls = calls
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
2117
        self._pack_collection = _StubPackCollection(calls)
2118
4145.1.6 by Robert Collins
More test fallout, but all caught now.
2119
    def is_in_write_group(self):
2120
        return False
2121
2122
    def refresh_data(self):
2123
        self.calls.append(('pack collection reload_pack_names',))
2124
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
2125
2126
class _StubPackCollection(object):
2127
2128
    def __init__(self, calls):
2129
        self.calls = calls
2130
2131
    def autopack(self):
2132
        self.calls.append(('pack collection autopack',))
2133
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2134
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
2135
class TestRemotePackRepositoryAutoPack(TestRemoteRepository):
2136
    """Tests for RemoteRepository.autopack implementation."""
2137
2138
    def test_ok(self):
2139
        """When the server returns 'ok' and there's no _real_repository, then
2140
        nothing else happens: the autopack method is done.
2141
        """
2142
        transport_path = 'quack'
2143
        repo, client = self.setup_fake_client_and_repository(transport_path)
2144
        client.add_expected_call(
3801.1.13 by Andrew Bennetts
Revert returning of pack-names from the RPC.
2145
            'PackRepository.autopack', ('quack/',), 'success', ('ok',))
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
2146
        repo.autopack()
2147
        client.finished_test()
2148
2149
    def test_ok_with_real_repo(self):
2150
        """When the server returns 'ok' and there is a _real_repository, then
2151
        the _real_repository's reload_pack_name's method will be called.
2152
        """
2153
        transport_path = 'quack'
2154
        repo, client = self.setup_fake_client_and_repository(transport_path)
2155
        client.add_expected_call(
2156
            'PackRepository.autopack', ('quack/',),
3801.1.13 by Andrew Bennetts
Revert returning of pack-names from the RPC.
2157
            'success', ('ok',))
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
2158
        repo._real_repository = _StubRealPackRepository(client._calls)
2159
        repo.autopack()
2160
        self.assertEqual(
2161
            [('call', 'PackRepository.autopack', ('quack/',)),
3801.1.13 by Andrew Bennetts
Revert returning of pack-names from the RPC.
2162
             ('pack collection reload_pack_names',)],
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
2163
            client._calls)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2164
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
2165
    def test_backwards_compatibility(self):
2166
        """If the server does not recognise the PackRepository.autopack verb,
2167
        fallback to the real_repository's implementation.
2168
        """
2169
        transport_path = 'quack'
2170
        repo, client = self.setup_fake_client_and_repository(transport_path)
2171
        client.add_unknown_method_response('PackRepository.autopack')
2172
        def stub_ensure_real():
2173
            client._calls.append(('_ensure_real',))
2174
            repo._real_repository = _StubRealPackRepository(client._calls)
2175
        repo._ensure_real = stub_ensure_real
2176
        repo.autopack()
2177
        self.assertEqual(
2178
            [('call', 'PackRepository.autopack', ('quack/',)),
2179
             ('_ensure_real',),
2180
             ('pack collection autopack',)],
2181
            client._calls)
2182
2183
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
2184
class TestErrorTranslationBase(tests.TestCaseWithMemoryTransport):
2185
    """Base class for unit tests for bzrlib.remote._translate_error."""
2186
2187
    def translateTuple(self, error_tuple, **context):
2188
        """Call _translate_error with an ErrorFromSmartServer built from the
2189
        given error_tuple.
2190
2191
        :param error_tuple: A tuple of a smart server response, as would be
2192
            passed to an ErrorFromSmartServer.
2193
        :kwargs context: context items to call _translate_error with.
2194
2195
        :returns: The error raised by _translate_error.
2196
        """
2197
        # Raise the ErrorFromSmartServer before passing it as an argument,
2198
        # because _translate_error may need to re-raise it with a bare 'raise'
2199
        # statement.
2200
        server_error = errors.ErrorFromSmartServer(error_tuple)
2201
        translated_error = self.translateErrorFromSmartServer(
2202
            server_error, **context)
2203
        return translated_error
2204
2205
    def translateErrorFromSmartServer(self, error_object, **context):
2206
        """Like translateTuple, but takes an already constructed
2207
        ErrorFromSmartServer rather than a tuple.
2208
        """
2209
        try:
2210
            raise error_object
2211
        except errors.ErrorFromSmartServer, server_error:
2212
            translated_error = self.assertRaises(
2213
                errors.BzrError, remote._translate_error, server_error,
2214
                **context)
2215
        return translated_error
2216
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
2217
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
2218
class TestErrorTranslationSuccess(TestErrorTranslationBase):
3533.3.3 by Andrew Bennetts
Add unit tests for bzrlib.remote._translate_error.
2219
    """Unit tests for bzrlib.remote._translate_error.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2220
3533.3.3 by Andrew Bennetts
Add unit tests for bzrlib.remote._translate_error.
2221
    Given an ErrorFromSmartServer (which has an error tuple from a smart
2222
    server) and some context, _translate_error raises more specific errors from
2223
    bzrlib.errors.
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
2224
2225
    This test case covers the cases where _translate_error succeeds in
2226
    translating an ErrorFromSmartServer to something better.  See
2227
    TestErrorTranslationRobustness for other cases.
3533.3.3 by Andrew Bennetts
Add unit tests for bzrlib.remote._translate_error.
2228
    """
2229
2230
    def test_NoSuchRevision(self):
2231
        branch = self.make_branch('')
2232
        revid = 'revid'
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
2233
        translated_error = self.translateTuple(
3533.3.3 by Andrew Bennetts
Add unit tests for bzrlib.remote._translate_error.
2234
            ('NoSuchRevision', revid), branch=branch)
2235
        expected_error = errors.NoSuchRevision(branch, revid)
2236
        self.assertEqual(expected_error, translated_error)
2237
2238
    def test_nosuchrevision(self):
2239
        repository = self.make_repository('')
2240
        revid = 'revid'
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
2241
        translated_error = self.translateTuple(
3533.3.3 by Andrew Bennetts
Add unit tests for bzrlib.remote._translate_error.
2242
            ('nosuchrevision', revid), repository=repository)
2243
        expected_error = errors.NoSuchRevision(repository, revid)
2244
        self.assertEqual(expected_error, translated_error)
2245
2246
    def test_nobranch(self):
2247
        bzrdir = self.make_bzrdir('')
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
2248
        translated_error = self.translateTuple(('nobranch',), bzrdir=bzrdir)
3533.3.3 by Andrew Bennetts
Add unit tests for bzrlib.remote._translate_error.
2249
        expected_error = errors.NotBranchError(path=bzrdir.root_transport.base)
2250
        self.assertEqual(expected_error, translated_error)
2251
2252
    def test_LockContention(self):
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
2253
        translated_error = self.translateTuple(('LockContention',))
3533.3.3 by Andrew Bennetts
Add unit tests for bzrlib.remote._translate_error.
2254
        expected_error = errors.LockContention('(remote lock)')
2255
        self.assertEqual(expected_error, translated_error)
2256
2257
    def test_UnlockableTransport(self):
2258
        bzrdir = self.make_bzrdir('')
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
2259
        translated_error = self.translateTuple(
3533.3.3 by Andrew Bennetts
Add unit tests for bzrlib.remote._translate_error.
2260
            ('UnlockableTransport',), bzrdir=bzrdir)
2261
        expected_error = errors.UnlockableTransport(bzrdir.root_transport)
2262
        self.assertEqual(expected_error, translated_error)
2263
2264
    def test_LockFailed(self):
2265
        lock = 'str() of a server lock'
2266
        why = 'str() of why'
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
2267
        translated_error = self.translateTuple(('LockFailed', lock, why))
3533.3.3 by Andrew Bennetts
Add unit tests for bzrlib.remote._translate_error.
2268
        expected_error = errors.LockFailed(lock, why)
2269
        self.assertEqual(expected_error, translated_error)
2270
2271
    def test_TokenMismatch(self):
2272
        token = 'a lock token'
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
2273
        translated_error = self.translateTuple(('TokenMismatch',), token=token)
3533.3.3 by Andrew Bennetts
Add unit tests for bzrlib.remote._translate_error.
2274
        expected_error = errors.TokenMismatch(token, '(remote token)')
2275
        self.assertEqual(expected_error, translated_error)
2276
2277
    def test_Diverged(self):
2278
        branch = self.make_branch('a')
2279
        other_branch = self.make_branch('b')
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
2280
        translated_error = self.translateTuple(
3533.3.3 by Andrew Bennetts
Add unit tests for bzrlib.remote._translate_error.
2281
            ('Diverged',), branch=branch, other_branch=other_branch)
2282
        expected_error = errors.DivergedBranches(branch, other_branch)
2283
        self.assertEqual(expected_error, translated_error)
2284
3786.4.2 by Andrew Bennetts
Add tests and fix code to make sure ReadError and PermissionDenied are robustly handled by _translate_error.
2285
    def test_ReadError_no_args(self):
2286
        path = 'a path'
2287
        translated_error = self.translateTuple(('ReadError',), path=path)
2288
        expected_error = errors.ReadError(path)
2289
        self.assertEqual(expected_error, translated_error)
2290
2291
    def test_ReadError(self):
2292
        path = 'a path'
2293
        translated_error = self.translateTuple(('ReadError', path))
2294
        expected_error = errors.ReadError(path)
2295
        self.assertEqual(expected_error, translated_error)
2296
2297
    def test_PermissionDenied_no_args(self):
2298
        path = 'a path'
2299
        translated_error = self.translateTuple(('PermissionDenied',), path=path)
2300
        expected_error = errors.PermissionDenied(path)
2301
        self.assertEqual(expected_error, translated_error)
2302
2303
    def test_PermissionDenied_one_arg(self):
2304
        path = 'a path'
2305
        translated_error = self.translateTuple(('PermissionDenied', path))
2306
        expected_error = errors.PermissionDenied(path)
2307
        self.assertEqual(expected_error, translated_error)
2308
2309
    def test_PermissionDenied_one_arg_and_context(self):
2310
        """Given a choice between a path from the local context and a path on
2311
        the wire, _translate_error prefers the path from the local context.
2312
        """
2313
        local_path = 'local path'
2314
        remote_path = 'remote path'
2315
        translated_error = self.translateTuple(
2316
            ('PermissionDenied', remote_path), path=local_path)
2317
        expected_error = errors.PermissionDenied(local_path)
2318
        self.assertEqual(expected_error, translated_error)
2319
2320
    def test_PermissionDenied_two_args(self):
2321
        path = 'a path'
2322
        extra = 'a string with extra info'
2323
        translated_error = self.translateTuple(
2324
            ('PermissionDenied', path, extra))
2325
        expected_error = errors.PermissionDenied(path, extra)
2326
        self.assertEqual(expected_error, translated_error)
2327
2328
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
2329
class TestErrorTranslationRobustness(TestErrorTranslationBase):
2330
    """Unit tests for bzrlib.remote._translate_error's robustness.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2331
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
2332
    TestErrorTranslationSuccess is for cases where _translate_error can
2333
    translate successfully.  This class about how _translate_err behaves when
2334
    it fails to translate: it re-raises the original error.
2335
    """
2336
2337
    def test_unrecognised_server_error(self):
2338
        """If the error code from the server is not recognised, the original
2339
        ErrorFromSmartServer is propagated unmodified.
2340
        """
2341
        error_tuple = ('An unknown error tuple',)
3690.1.2 by Andrew Bennetts
Rename UntranslateableErrorFromSmartServer -> UnknownErrorFromSmartServer.
2342
        server_error = errors.ErrorFromSmartServer(error_tuple)
2343
        translated_error = self.translateErrorFromSmartServer(server_error)
2344
        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.
2345
        self.assertEqual(expected_error, translated_error)
3533.3.4 by Andrew Bennetts
Add tests for _translate_error's robustness.
2346
2347
    def test_context_missing_a_key(self):
2348
        """In case of a bug in the client, or perhaps an unexpected response
2349
        from a server, _translate_error returns the original error tuple from
2350
        the server and mutters a warning.
2351
        """
2352
        # To translate a NoSuchRevision error _translate_error needs a 'branch'
2353
        # in the context dict.  So let's give it an empty context dict instead
2354
        # to exercise its error recovery.
2355
        empty_context = {}
2356
        error_tuple = ('NoSuchRevision', 'revid')
2357
        server_error = errors.ErrorFromSmartServer(error_tuple)
2358
        translated_error = self.translateErrorFromSmartServer(server_error)
2359
        self.assertEqual(server_error, translated_error)
2360
        # In addition to re-raising ErrorFromSmartServer, some debug info has
2361
        # been muttered to the log file for developer to look at.
2362
        self.assertContainsRe(
2363
            self._get_log(keep_log_file=True),
2364
            "Missing key 'branch' in context")
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2365
3786.4.2 by Andrew Bennetts
Add tests and fix code to make sure ReadError and PermissionDenied are robustly handled by _translate_error.
2366
    def test_path_missing(self):
2367
        """Some translations (PermissionDenied, ReadError) can determine the
2368
        'path' variable from either the wire or the local context.  If neither
2369
        has it, then an error is raised.
2370
        """
2371
        error_tuple = ('ReadError',)
2372
        server_error = errors.ErrorFromSmartServer(error_tuple)
2373
        translated_error = self.translateErrorFromSmartServer(server_error)
2374
        self.assertEqual(server_error, translated_error)
2375
        # In addition to re-raising ErrorFromSmartServer, some debug info has
2376
        # been muttered to the log file for developer to look at.
2377
        self.assertContainsRe(
2378
            self._get_log(keep_log_file=True), "Missing key 'path' in context")
2379
3691.2.2 by Martin Pool
Fix some problems in access to stacked repositories over hpss (#261315)
2380
2381
class TestStacking(tests.TestCaseWithTransport):
2382
    """Tests for operations on stacked remote repositories.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2383
3691.2.2 by Martin Pool
Fix some problems in access to stacked repositories over hpss (#261315)
2384
    The underlying format type must support stacking.
2385
    """
2386
2387
    def test_access_stacked_remote(self):
2388
        # based on <http://launchpad.net/bugs/261315>
2389
        # make a branch stacked on another repository containing an empty
2390
        # revision, then open it over hpss - we should be able to see that
2391
        # revision.
2392
        base_transport = self.get_transport()
4152.1.1 by Robert Collins
Add specific tests for fetch streaming in the bzr protocol client.
2393
        base_builder = self.make_branch_builder('base', format='1.9')
3691.2.2 by Martin Pool
Fix some problems in access to stacked repositories over hpss (#261315)
2394
        base_builder.start_series()
2395
        base_revid = base_builder.build_snapshot('rev-id', None,
2396
            [('add', ('', None, 'directory', None))],
2397
            'message')
2398
        base_builder.finish_series()
4152.1.1 by Robert Collins
Add specific tests for fetch streaming in the bzr protocol client.
2399
        stacked_branch = self.make_branch('stacked', format='1.9')
3691.2.2 by Martin Pool
Fix some problems in access to stacked repositories over hpss (#261315)
2400
        stacked_branch.set_stacked_on_url('../base')
2401
        # start a server looking at this
2402
        smart_server = server.SmartTCPServer_for_testing()
2403
        smart_server.setUp()
2404
        self.addCleanup(smart_server.tearDown)
2405
        remote_bzrdir = BzrDir.open(smart_server.get_url() + '/stacked')
2406
        # can get its branch and repository
2407
        remote_branch = remote_bzrdir.open_branch()
2408
        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
2409
        remote_repo.lock_read()
2410
        try:
2411
            # it should have an appropriate fallback repository, which should also
2412
            # be a RemoteRepository
2413
            self.assertEquals(len(remote_repo._fallback_repositories), 1)
2414
            self.assertIsInstance(remote_repo._fallback_repositories[0],
2415
                RemoteRepository)
2416
            # and it has the revision committed to the underlying repository;
2417
            # these have varying implementations so we try several of them
2418
            self.assertTrue(remote_repo.has_revisions([base_revid]))
2419
            self.assertTrue(remote_repo.has_revision(base_revid))
2420
            self.assertEqual(remote_repo.get_revision(base_revid).message,
2421
                'message')
2422
        finally:
2423
            remote_repo.unlock()
3835.1.2 by Aaron Bentley
Add tests for get_parent_map
2424
3835.1.7 by Aaron Bentley
Updates from review
2425
    def prepare_stacked_remote_branch(self):
4152.1.1 by Robert Collins
Add specific tests for fetch streaming in the bzr protocol client.
2426
        """Get stacked_upon and stacked branches with content in each."""
4152.1.2 by Robert Collins
Add streaming from a stacked branch when the sort order is compatible with doing so.
2427
        self.setup_smart_server_with_call_log()
4152.1.1 by Robert Collins
Add specific tests for fetch streaming in the bzr protocol client.
2428
        tree1 = self.make_branch_and_tree('tree1', format='1.9')
3835.1.2 by Aaron Bentley
Add tests for get_parent_map
2429
        tree1.commit('rev1', rev_id='rev1')
4152.1.1 by Robert Collins
Add specific tests for fetch streaming in the bzr protocol client.
2430
        tree2 = tree1.branch.bzrdir.sprout('tree2', stacked=True
2431
            ).open_workingtree()
2432
        tree2.commit('local changes make me feel good.')
4152.1.2 by Robert Collins
Add streaming from a stacked branch when the sort order is compatible with doing so.
2433
        branch2 = Branch.open(self.get_url('tree2'))
3835.1.2 by Aaron Bentley
Add tests for get_parent_map
2434
        branch2.lock_read()
2435
        self.addCleanup(branch2.unlock)
4152.1.1 by Robert Collins
Add specific tests for fetch streaming in the bzr protocol client.
2436
        return tree1.branch, branch2
3835.1.7 by Aaron Bentley
Updates from review
2437
2438
    def test_stacked_get_parent_map(self):
2439
        # the public implementation of get_parent_map obeys stacking
4152.1.1 by Robert Collins
Add specific tests for fetch streaming in the bzr protocol client.
2440
        _, branch = self.prepare_stacked_remote_branch()
3835.1.7 by Aaron Bentley
Updates from review
2441
        repo = branch.repository
3835.1.2 by Aaron Bentley
Add tests for get_parent_map
2442
        self.assertEqual(['rev1'], repo.get_parent_map(['rev1']).keys())
3835.1.7 by Aaron Bentley
Updates from review
2443
3835.1.10 by Aaron Bentley
Move CachingExtraParentsProvider to Graph
2444
    def test_unstacked_get_parent_map(self):
2445
        # _unstacked_provider.get_parent_map ignores stacking
4152.1.1 by Robert Collins
Add specific tests for fetch streaming in the bzr protocol client.
2446
        _, branch = self.prepare_stacked_remote_branch()
3835.1.10 by Aaron Bentley
Move CachingExtraParentsProvider to Graph
2447
        provider = branch.repository._unstacked_provider
3835.1.8 by Aaron Bentley
Make UnstackedParentsProvider manage the cache
2448
        self.assertEqual([], provider.get_parent_map(['rev1']).keys())
3834.3.3 by John Arbash Meinel
Merge bzr.dev, resolve conflict in tests.
2449
4152.1.1 by Robert Collins
Add specific tests for fetch streaming in the bzr protocol client.
2450
    def fetch_stream_to_rev_order(self, stream):
2451
        result = []
2452
        for kind, substream in stream:
2453
            if not kind == 'revisions':
2454
                list(substream)
2455
            else:
2456
                for content in substream:
2457
                    result.append(content.key[-1])
2458
        return result
2459
2460
    def get_ordered_revs(self, format, order):
2461
        """Get a list of the revisions in a stream to format format.
2462
2463
        :param format: The format of the target.
2464
        :param order: the order that target should have requested.
2465
        :result: The revision ids in the stream, in the order seen,
2466
            the topological order of revisions in the source.
2467
        """
2468
        unordered_format = bzrdir.format_registry.get(format)()
2469
        target_repository_format = unordered_format.repository_format
2470
        # Cross check
2471
        self.assertEqual(order, target_repository_format._fetch_order)
2472
        trunk, stacked = self.prepare_stacked_remote_branch()
2473
        source = stacked.repository._get_source(target_repository_format)
2474
        tip = stacked.last_revision()
2475
        revs = stacked.repository.get_ancestry(tip)
2476
        search = graph.PendingAncestryResult([tip], stacked.repository)
4152.1.2 by Robert Collins
Add streaming from a stacked branch when the sort order is compatible with doing so.
2477
        self.reset_smart_call_log()
4152.1.1 by Robert Collins
Add specific tests for fetch streaming in the bzr protocol client.
2478
        stream = source.get_stream(search)
2479
        if None in revs:
2480
            revs.remove(None)
2481
        # We trust that if a revision is in the stream the rest of the new
2482
        # content for it is too, as per our main fetch tests; here we are
2483
        # checking that the revisions are actually included at all, and their
2484
        # order.
2485
        return self.fetch_stream_to_rev_order(stream), revs
2486
2487
    def test_stacked_get_stream_unordered(self):
2488
        # Repository._get_source.get_stream() from a stacked repository with
2489
        # unordered yields the full data from both stacked and stacked upon
2490
        # sources.
2491
        rev_ord, expected_revs = self.get_ordered_revs('1.9', 'unordered')
4152.1.2 by Robert Collins
Add streaming from a stacked branch when the sort order is compatible with doing so.
2492
        self.assertEqual(set(expected_revs), set(rev_ord))
2493
        # Getting unordered results should have made a streaming data request
2494
        # from the server, then one from the backing branch.
2495
        self.assertLength(2, self.hpss_calls)
4152.1.1 by Robert Collins
Add specific tests for fetch streaming in the bzr protocol client.
2496
2497
    def test_stacked_get_stream_topological(self):
2498
        # Repository._get_source.get_stream() from a stacked repository with
2499
        # topological sorting yields the full data from both stacked and
2500
        # stacked upon sources in topological order.
2501
        rev_ord, expected_revs = self.get_ordered_revs('knit', 'topological')
4152.1.2 by Robert Collins
Add streaming from a stacked branch when the sort order is compatible with doing so.
2502
        self.assertEqual(expected_revs, rev_ord)
2503
        # Getting topological sort requires VFS calls still
4190.1.6 by Robert Collins
Missed some unit tests.
2504
        self.assertLength(12, self.hpss_calls)
4152.1.1 by Robert Collins
Add specific tests for fetch streaming in the bzr protocol client.
2505
2506
    def test_stacked_get_stream_groupcompress(self):
2507
        # Repository._get_source.get_stream() from a stacked repository with
2508
        # groupcompress sorting yields the full data from both stacked and
2509
        # stacked upon sources in groupcompress order.
2510
        raise tests.TestSkipped('No groupcompress ordered format available')
2511
        rev_ord, expected_revs = self.get_ordered_revs('dev5', 'groupcompress')
4152.1.2 by Robert Collins
Add streaming from a stacked branch when the sort order is compatible with doing so.
2512
        self.assertEqual(expected_revs, reversed(rev_ord))
2513
        # Getting unordered results should have made a streaming data request
2514
        # from the backing branch, and one from the stacked on branch.
2515
        self.assertLength(2, self.hpss_calls)
4152.1.1 by Robert Collins
Add specific tests for fetch streaming in the bzr protocol client.
2516
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.
2517
2518
class TestRemoteBranchEffort(tests.TestCaseWithTransport):
2519
2520
    def setUp(self):
2521
        super(TestRemoteBranchEffort, self).setUp()
2522
        # Create a smart server that publishes whatever the backing VFS server
2523
        # does.
2524
        self.smart_server = server.SmartTCPServer_for_testing()
2525
        self.smart_server.setUp(self.get_server())
2526
        self.addCleanup(self.smart_server.tearDown)
2527
        # Log all HPSS calls into self.hpss_calls.
2528
        _SmartClient.hooks.install_named_hook(
2529
            'call', self.capture_hpss_call, None)
2530
        self.hpss_calls = []
2531
2532
    def capture_hpss_call(self, params):
2533
        self.hpss_calls.append(params.method)
2534
2535
    def test_copy_content_into_avoids_revision_history(self):
2536
        local = self.make_branch('local')
2537
        remote_backing_tree = self.make_branch_and_tree('remote')
2538
        remote_backing_tree.commit("Commit.")
2539
        remote_branch_url = self.smart_server.get_url() + 'remote'
2540
        remote_branch = bzrdir.BzrDir.open(remote_branch_url).open_branch()
2541
        local.repository.fetch(remote_branch.repository)
2542
        self.hpss_calls = []
2543
        remote_branch.copy_content_into(local)
3834.3.3 by John Arbash Meinel
Merge bzr.dev, resolve conflict in tests.
2544
        self.assertFalse('Branch.revision_history' in self.hpss_calls)