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