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