~bzr-pqm/bzr/bzr.dev

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