/brz/remove-bazaar

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