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