~bzr-pqm/bzr/bzr.dev

4988.10.5 by John Arbash Meinel
Merge bzr.dev 5021 to resolve NEWS
1
# Copyright (C) 2006-2010 Canonical Ltd
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
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
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
16
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
17
"""Tests for the smart wire/domain protocol.
18
19
This module contains tests for the domain-level smart requests and responses,
3015.2.12 by Robert Collins
Make test_smart use specific formats as needed to exercise locked and unlocked repositories.
20
such as the 'Branch.lock_write' request. Many of these use specific disk
21
formats to exercise calls that only make sense for formats with specific
22
properties.
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
23
24
Tests for low-level protocol encoding are found in test_smart_transport.
25
"""
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
26
3211.5.2 by Robert Collins
Change RemoteRepository.get_parent_map to use bz2 not gzip for compression.
27
import bz2
2692.1.18 by Andrew Bennetts
Merge from bzr.dev.
28
from cStringIO import StringIO
2018.18.2 by Martin Pool
smart method Repository.tarball actually returns the tarball
29
import tarfile
30
2692.1.2 by Andrew Bennetts
Merge from bzr.dev.
31
from bzrlib import (
2694.5.4 by Jelmer Vernooij
Move bzrlib.util.bencode to bzrlib._bencode_py.
32
    bencode,
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
33
    branch as _mod_branch,
2692.1.2 by Andrew Bennetts
Merge from bzr.dev.
34
    bzrdir,
35
    errors,
36
    pack,
37
    tests,
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
38
    transport,
2692.1.2 by Andrew Bennetts
Merge from bzr.dev.
39
    urlutils,
4634.19.1 by Robert Collins
Combine adjacent substreams of the same type in bzrlib.smart.repository._byte_stream_to_stream.
40
    versionedfile,
2692.1.2 by Andrew Bennetts
Merge from bzr.dev.
41
    )
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
42
from bzrlib.smart import (
43
    branch as smart_branch,
44
    bzrdir as smart_dir,
45
    repository as smart_repo,
46
    packrepository as smart_packrepo,
47
    request as smart_req,
48
    server,
49
    vfs,
50
    )
5017.3.25 by Vincent Ladeuil
selftest -s bt.test_smart_transport passing
51
from bzrlib.tests import test_server
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
52
from bzrlib.transport import (
53
    chroot,
5017.3.45 by Vincent Ladeuil
Move MemoryServer back into bzrlib.transport.memory as it's needed as soon as a MemoryTransport is used. Add a NEWS entry.
54
    memory,
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
55
    )
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
56
57
3221.3.2 by Robert Collins
* New remote method ``RemoteBzrDir.find_repositoryV2`` adding support for
58
def load_tests(standard_tests, module, loader):
59
    """Multiply tests version and protocol consistency."""
60
    # FindRepository tests.
4084.5.1 by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters.
61
    scenarios = [
3221.3.2 by Robert Collins
* New remote method ``RemoteBzrDir.find_repositoryV2`` adding support for
62
        ("find_repository", {
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
63
            "_request_class": smart_dir.SmartServerRequestFindRepositoryV1}),
3221.3.2 by Robert Collins
* New remote method ``RemoteBzrDir.find_repositoryV2`` adding support for
64
        ("find_repositoryV2", {
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
65
            "_request_class": smart_dir.SmartServerRequestFindRepositoryV2}),
4053.1.4 by Robert Collins
Move the fetch control attributes from Repository to RepositoryFormat.
66
        ("find_repositoryV3", {
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
67
            "_request_class": smart_dir.SmartServerRequestFindRepositoryV3}),
3221.3.2 by Robert Collins
* New remote method ``RemoteBzrDir.find_repositoryV2`` adding support for
68
        ]
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
69
    to_adapt, result = tests.split_suite_by_re(standard_tests,
3221.3.2 by Robert Collins
* New remote method ``RemoteBzrDir.find_repositoryV2`` adding support for
70
        "TestSmartServerRequestFindRepository")
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
71
    v2_only, v1_and_2 = tests.split_suite_by_re(to_adapt,
3221.3.2 by Robert Collins
* New remote method ``RemoteBzrDir.find_repositoryV2`` adding support for
72
        "_v2")
4084.5.1 by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters.
73
    tests.multiply_tests(v1_and_2, scenarios, result)
74
    # The first scenario is only applicable to v1 protocols, it is deleted
75
    # since.
76
    tests.multiply_tests(v2_only, scenarios[1:], result)
3221.3.2 by Robert Collins
* New remote method ``RemoteBzrDir.find_repositoryV2`` adding support for
77
    return result
78
79
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
80
class TestCaseWithChrootedTransport(tests.TestCaseWithTransport):
81
82
    def setUp(self):
5017.3.45 by Vincent Ladeuil
Move MemoryServer back into bzrlib.transport.memory as it's needed as soon as a MemoryTransport is used. Add a NEWS entry.
83
        self.vfs_transport_factory = memory.MemoryServer
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
84
        tests.TestCaseWithTransport.setUp(self)
85
        self._chroot_server = None
86
87
    def get_transport(self, relpath=None):
88
        if self._chroot_server is None:
89
            backing_transport = tests.TestCaseWithTransport.get_transport(self)
90
            self._chroot_server = chroot.ChrootServer(backing_transport)
4659.1.2 by Robert Collins
Refactor creation and shutdown of test servers to use a common helper,
91
            self.start_server(self._chroot_server)
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
92
        t = transport.get_transport(self._chroot_server.get_url())
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
93
        if relpath is not None:
94
            t = t.clone(relpath)
95
        return t
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
96
97
4634.47.4 by Andrew Bennetts
Make more of bzrlib/tests/test_smart.py use MemoryTransport.
98
class TestCaseWithSmartMedium(tests.TestCaseWithMemoryTransport):
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
99
100
    def setUp(self):
101
        super(TestCaseWithSmartMedium, self).setUp()
102
        # We're allowed to set  the transport class here, so that we don't use
103
        # the default or a parameterized class, but rather use the
104
        # TestCaseWithTransport infrastructure to set up a smart server and
105
        # transport.
3245.4.28 by Andrew Bennetts
Remove another XXX, and include test ID in smart server thread names.
106
        self.transport_server = self.make_transport_server
107
108
    def make_transport_server(self):
5017.3.25 by Vincent Ladeuil
selftest -s bt.test_smart_transport passing
109
        return test_server.SmartTCPServer_for_testing('-' + self.id())
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
110
111
    def get_smart_medium(self):
112
        """Get a smart medium to use in tests."""
113
        return self.get_transport().get_smart_medium()
114
115
4634.19.1 by Robert Collins
Combine adjacent substreams of the same type in bzrlib.smart.repository._byte_stream_to_stream.
116
class TestByteStreamToStream(tests.TestCase):
117
118
    def test_repeated_substreams_same_kind_are_one_stream(self):
119
        # Make a stream - an iterable of bytestrings.
120
        stream = [('text', [versionedfile.FulltextContentFactory(('k1',), None,
121
            None, 'foo')]),('text', [
122
            versionedfile.FulltextContentFactory(('k2',), None, None, 'bar')])]
123
        fmt = bzrdir.format_registry.get('pack-0.92')().repository_format
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
124
        bytes = smart_repo._stream_to_byte_stream(stream, fmt)
4634.19.1 by Robert Collins
Combine adjacent substreams of the same type in bzrlib.smart.repository._byte_stream_to_stream.
125
        streams = []
126
        # Iterate the resulting iterable; checking that we get only one stream
127
        # out.
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
128
        fmt, stream = smart_repo._byte_stream_to_stream(bytes)
4634.19.1 by Robert Collins
Combine adjacent substreams of the same type in bzrlib.smart.repository._byte_stream_to_stream.
129
        for kind, substream in stream:
130
            streams.append((kind, list(substream)))
131
        self.assertLength(1, streams)
132
        self.assertLength(2, streams[0][1])
133
134
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
135
class TestSmartServerResponse(tests.TestCase):
136
137
    def test__eq__(self):
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
138
        self.assertEqual(smart_req.SmartServerResponse(('ok', )),
139
            smart_req.SmartServerResponse(('ok', )))
140
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), 'body'),
141
            smart_req.SmartServerResponse(('ok', ), 'body'))
142
        self.assertNotEqual(smart_req.SmartServerResponse(('ok', )),
143
            smart_req.SmartServerResponse(('notok', )))
144
        self.assertNotEqual(smart_req.SmartServerResponse(('ok', ), 'body'),
145
            smart_req.SmartServerResponse(('ok', )))
2018.5.41 by Robert Collins
Fix SmartServerResponse.__eq__ to handle None.
146
        self.assertNotEqual(None,
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
147
            smart_req.SmartServerResponse(('ok', )))
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
148
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
149
    def test__str__(self):
150
        """SmartServerResponses can be stringified."""
151
        self.assertEqual(
3691.2.6 by Martin Pool
Disable RemoteBranch stacking, but get get_stacked_on_url working, and passing back exceptions
152
            "<SuccessfulSmartServerResponse args=('args',) body='body'>",
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
153
            str(smart_req.SuccessfulSmartServerResponse(('args',), 'body')))
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
154
        self.assertEqual(
3691.2.6 by Martin Pool
Disable RemoteBranch stacking, but get get_stacked_on_url working, and passing back exceptions
155
            "<FailedSmartServerResponse args=('args',) body='body'>",
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
156
            str(smart_req.FailedSmartServerResponse(('args',), 'body')))
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
157
158
159
class TestSmartServerRequest(tests.TestCaseWithMemoryTransport):
160
161
    def test_translate_client_path(self):
162
        transport = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
163
        request = smart_req.SmartServerRequest(transport, 'foo/')
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
164
        self.assertEqual('./', request.translate_client_path('foo/'))
165
        self.assertRaises(
166
            errors.InvalidURLJoin, request.translate_client_path, 'foo/..')
167
        self.assertRaises(
168
            errors.PathNotChild, request.translate_client_path, '/')
169
        self.assertRaises(
170
            errors.PathNotChild, request.translate_client_path, 'bar/')
171
        self.assertEqual('./baz', request.translate_client_path('foo/baz'))
4760.2.2 by Michael Hudson
test
172
        e_acute = u'\N{LATIN SMALL LETTER E WITH ACUTE}'.encode('utf-8')
173
        self.assertEqual('./' + urlutils.escape(e_acute),
174
                         request.translate_client_path('foo/' + e_acute))
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
175
4760.2.5 by Andrew Bennetts
Add some more tests.
176
    def test_translate_client_path_vfs(self):
177
        """VfsRequests receive escaped paths rather than raw UTF-8."""
178
        transport = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
179
        request = vfs.VfsRequest(transport, 'foo/')
4760.2.5 by Andrew Bennetts
Add some more tests.
180
        e_acute = u'\N{LATIN SMALL LETTER E WITH ACUTE}'.encode('utf-8')
181
        escaped = urlutils.escape('foo/' + e_acute)
182
        self.assertEqual('./' + urlutils.escape(e_acute),
183
                         request.translate_client_path(escaped))
184
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
185
    def test_transport_from_client_path(self):
186
        transport = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
187
        request = smart_req.SmartServerRequest(transport, 'foo/')
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
188
        self.assertEqual(
189
            transport.base,
190
            request.transport_from_client_path('foo/').base)
191
192
4070.2.3 by Robert Collins
Get BzrDir.cloning_metadir working.
193
class TestSmartServerBzrDirRequestCloningMetaDir(
194
    tests.TestCaseWithMemoryTransport):
195
    """Tests for BzrDir.cloning_metadir."""
196
197
    def test_cloning_metadir(self):
198
        """When there is a bzrdir present, the call succeeds."""
199
        backing = self.get_transport()
200
        dir = self.make_bzrdir('.')
201
        local_result = dir.cloning_metadir()
202
        request_class = smart_dir.SmartServerBzrDirRequestCloningMetaDir
203
        request = request_class(backing)
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
204
        expected = smart_req.SuccessfulSmartServerResponse(
4070.2.3 by Robert Collins
Get BzrDir.cloning_metadir working.
205
            (local_result.network_name(),
206
            local_result.repository_format.network_name(),
4084.2.2 by Robert Collins
Review feedback.
207
            ('branch', local_result.get_branch_format().network_name())))
4070.7.4 by Andrew Bennetts
Deal with branch references better in BzrDir.cloning_metadir RPC (changes protocol).
208
        self.assertEqual(expected, request.execute('', 'False'))
209
210
    def test_cloning_metadir_reference(self):
4160.2.9 by Andrew Bennetts
Fix BzrDir.cloning_metadir RPC to fail on branch references, and make
211
        """The request fails when bzrdir contains a branch reference."""
4070.7.4 by Andrew Bennetts
Deal with branch references better in BzrDir.cloning_metadir RPC (changes protocol).
212
        backing = self.get_transport()
213
        referenced_branch = self.make_branch('referenced')
214
        dir = self.make_bzrdir('.')
215
        local_result = dir.cloning_metadir()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
216
        reference = _mod_branch.BranchReferenceFormat().initialize(
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
217
            dir, target_branch=referenced_branch)
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
218
        reference_url = _mod_branch.BranchReferenceFormat().get_reference(dir)
4070.7.4 by Andrew Bennetts
Deal with branch references better in BzrDir.cloning_metadir RPC (changes protocol).
219
        # The server shouldn't try to follow the branch reference, so it's fine
220
        # if the referenced branch isn't reachable.
221
        backing.rename('referenced', 'moved')
222
        request_class = smart_dir.SmartServerBzrDirRequestCloningMetaDir
223
        request = request_class(backing)
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
224
        expected = smart_req.FailedSmartServerResponse(('BranchReference',))
4070.2.3 by Robert Collins
Get BzrDir.cloning_metadir working.
225
        self.assertEqual(expected, request.execute('', 'False'))
226
227
4017.3.2 by Robert Collins
Reduce the number of round trips required to create a repository over the network.
228
class TestSmartServerRequestCreateRepository(tests.TestCaseWithMemoryTransport):
229
    """Tests for BzrDir.create_repository."""
230
231
    def test_makes_repository(self):
232
        """When there is a bzrdir present, the call succeeds."""
233
        backing = self.get_transport()
234
        self.make_bzrdir('.')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
235
        request_class = smart_dir.SmartServerRequestCreateRepository
4017.3.2 by Robert Collins
Reduce the number of round trips required to create a repository over the network.
236
        request = request_class(backing)
4606.3.1 by Robert Collins
Make test_smart tests more stable when the default format changes.
237
        reference_bzrdir_format = bzrdir.format_registry.get('pack-0.92')()
4017.3.2 by Robert Collins
Reduce the number of round trips required to create a repository over the network.
238
        reference_format = reference_bzrdir_format.repository_format
239
        network_name = reference_format.network_name()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
240
        expected = smart_req.SuccessfulSmartServerResponse(
4017.3.2 by Robert Collins
Reduce the number of round trips required to create a repository over the network.
241
            ('ok', 'no', 'no', 'no', network_name))
242
        self.assertEqual(expected, request.execute('', network_name, 'True'))
243
244
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
245
class TestSmartServerRequestFindRepository(tests.TestCaseWithMemoryTransport):
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
246
    """Tests for BzrDir.find_repository."""
2018.5.34 by Robert Collins
Get test_remote.BasicRemoteObjectTests.test_open_remote_branch passing by implementing a remote method BzrDir.find_repository.
247
248
    def test_no_repository(self):
249
        """When there is no repository to be found, ('norepository', ) is returned."""
250
        backing = self.get_transport()
3221.3.2 by Robert Collins
* New remote method ``RemoteBzrDir.find_repositoryV2`` adding support for
251
        request = self._request_class(backing)
2018.5.34 by Robert Collins
Get test_remote.BasicRemoteObjectTests.test_open_remote_branch passing by implementing a remote method BzrDir.find_repository.
252
        self.make_bzrdir('.')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
253
        self.assertEqual(smart_req.SmartServerResponse(('norepository', )),
2692.1.19 by Andrew Bennetts
Tweak for consistency suggested by John's review.
254
            request.execute(''))
2018.5.34 by Robert Collins
Get test_remote.BasicRemoteObjectTests.test_open_remote_branch passing by implementing a remote method BzrDir.find_repository.
255
256
    def test_nonshared_repository(self):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
257
        # nonshared repositorys only allow 'find' to return a handle when the
258
        # path the repository is being searched on is the same as that that
2018.5.34 by Robert Collins
Get test_remote.BasicRemoteObjectTests.test_open_remote_branch passing by implementing a remote method BzrDir.find_repository.
259
        # the repository is at.
260
        backing = self.get_transport()
3221.3.2 by Robert Collins
* New remote method ``RemoteBzrDir.find_repositoryV2`` adding support for
261
        request = self._request_class(backing)
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
262
        result = self._make_repository_and_result()
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
263
        self.assertEqual(result, request.execute(''))
2018.5.34 by Robert Collins
Get test_remote.BasicRemoteObjectTests.test_open_remote_branch passing by implementing a remote method BzrDir.find_repository.
264
        self.make_bzrdir('subdir')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
265
        self.assertEqual(smart_req.SmartServerResponse(('norepository', )),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
266
            request.execute('subdir'))
2018.5.34 by Robert Collins
Get test_remote.BasicRemoteObjectTests.test_open_remote_branch passing by implementing a remote method BzrDir.find_repository.
267
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
268
    def _make_repository_and_result(self, shared=False, format=None):
269
        """Convenience function to setup a repository.
270
271
        :result: The SmartServerResponse to expect when opening it.
272
        """
273
        repo = self.make_repository('.', shared=shared, format=format)
274
        if repo.supports_rich_root():
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
275
            rich_root = 'yes'
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
276
        else:
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
277
            rich_root = 'no'
2018.5.138 by Robert Collins
Merge bzr.dev.
278
        if repo._format.supports_tree_reference:
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
279
            subtrees = 'yes'
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
280
        else:
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
281
            subtrees = 'no'
4606.3.1 by Robert Collins
Make test_smart tests more stable when the default format changes.
282
        if repo._format.supports_external_lookups:
283
            external = 'yes'
284
        else:
285
            external = 'no'
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
286
        if (smart_dir.SmartServerRequestFindRepositoryV3 ==
4053.1.4 by Robert Collins
Move the fetch control attributes from Repository to RepositoryFormat.
287
            self._request_class):
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
288
            return smart_req.SuccessfulSmartServerResponse(
4606.3.1 by Robert Collins
Make test_smart tests more stable when the default format changes.
289
                ('ok', '', rich_root, subtrees, external,
4053.1.4 by Robert Collins
Move the fetch control attributes from Repository to RepositoryFormat.
290
                 repo._format.network_name()))
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
291
        elif (smart_dir.SmartServerRequestFindRepositoryV2 ==
3221.3.2 by Robert Collins
* New remote method ``RemoteBzrDir.find_repositoryV2`` adding support for
292
            self._request_class):
293
            # All tests so far are on formats, and for non-external
294
            # repositories.
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
295
            return smart_req.SuccessfulSmartServerResponse(
4606.3.1 by Robert Collins
Make test_smart tests more stable when the default format changes.
296
                ('ok', '', rich_root, subtrees, external))
3221.3.2 by Robert Collins
* New remote method ``RemoteBzrDir.find_repositoryV2`` adding support for
297
        else:
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
298
            return smart_req.SuccessfulSmartServerResponse(
299
                ('ok', '', rich_root, subtrees))
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
300
2018.5.34 by Robert Collins
Get test_remote.BasicRemoteObjectTests.test_open_remote_branch passing by implementing a remote method BzrDir.find_repository.
301
    def test_shared_repository(self):
302
        """When there is a shared repository, we get 'ok', 'relpath-to-repo'."""
303
        backing = self.get_transport()
3221.3.2 by Robert Collins
* New remote method ``RemoteBzrDir.find_repositoryV2`` adding support for
304
        request = self._request_class(backing)
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
305
        result = self._make_repository_and_result(shared=True)
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
306
        self.assertEqual(result, request.execute(''))
2018.5.34 by Robert Collins
Get test_remote.BasicRemoteObjectTests.test_open_remote_branch passing by implementing a remote method BzrDir.find_repository.
307
        self.make_bzrdir('subdir')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
308
        result2 = smart_req.SmartServerResponse(
309
            result.args[0:1] + ('..', ) + result.args[2:])
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
310
        self.assertEqual(result2,
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
311
            request.execute('subdir'))
2018.5.34 by Robert Collins
Get test_remote.BasicRemoteObjectTests.test_open_remote_branch passing by implementing a remote method BzrDir.find_repository.
312
        self.make_bzrdir('subdir/deeper')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
313
        result3 = smart_req.SmartServerResponse(
314
            result.args[0:1] + ('../..', ) + result.args[2:])
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
315
        self.assertEqual(result3,
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
316
            request.execute('subdir/deeper'))
2018.5.34 by Robert Collins
Get test_remote.BasicRemoteObjectTests.test_open_remote_branch passing by implementing a remote method BzrDir.find_repository.
317
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
318
    def test_rich_root_and_subtree_encoding(self):
319
        """Test for the format attributes for rich root and subtree support."""
320
        backing = self.get_transport()
3221.3.2 by Robert Collins
* New remote method ``RemoteBzrDir.find_repositoryV2`` adding support for
321
        request = self._request_class(backing)
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
322
        result = self._make_repository_and_result(
323
            format='dirstate-with-subtree')
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
324
        # check the test will be valid
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
325
        self.assertEqual('yes', result.args[2])
326
        self.assertEqual('yes', result.args[3])
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
327
        self.assertEqual(result, request.execute(''))
328
3221.3.2 by Robert Collins
* New remote method ``RemoteBzrDir.find_repositoryV2`` adding support for
329
    def test_supports_external_lookups_no_v2(self):
330
        """Test for the supports_external_lookups attribute."""
331
        backing = self.get_transport()
332
        request = self._request_class(backing)
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
333
        result = self._make_repository_and_result(
334
            format='dirstate-with-subtree')
3221.3.2 by Robert Collins
* New remote method ``RemoteBzrDir.find_repositoryV2`` adding support for
335
        # check the test will be valid
336
        self.assertEqual('no', result.args[4])
2692.1.24 by Andrew Bennetts
Merge from bzr.dev.
337
        self.assertEqual(result, request.execute(''))
338
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
339
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
340
class TestSmartServerBzrDirRequestGetConfigFile(
341
    tests.TestCaseWithMemoryTransport):
342
    """Tests for BzrDir.get_config_file."""
343
344
    def test_present(self):
345
        backing = self.get_transport()
346
        dir = self.make_bzrdir('.')
347
        dir.get_config().set_default_stack_on("/")
348
        local_result = dir._get_config()._get_config_file().read()
349
        request_class = smart_dir.SmartServerBzrDirRequestConfigFile
350
        request = request_class(backing)
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
351
        expected = smart_req.SuccessfulSmartServerResponse((), local_result)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
352
        self.assertEqual(expected, request.execute(''))
353
354
    def test_missing(self):
355
        backing = self.get_transport()
356
        dir = self.make_bzrdir('.')
357
        request_class = smart_dir.SmartServerBzrDirRequestConfigFile
358
        request = request_class(backing)
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
359
        expected = smart_req.SuccessfulSmartServerResponse((), '')
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
360
        self.assertEqual(expected, request.execute(''))
361
362
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
363
class TestSmartServerRequestInitializeBzrDir(tests.TestCaseWithMemoryTransport):
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
364
365
    def test_empty_dir(self):
366
        """Initializing an empty dir should succeed and do it."""
367
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
368
        request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
369
        self.assertEqual(smart_req.SmartServerResponse(('ok', )),
2692.1.20 by Andrew Bennetts
Tweak for consistency suggested by John's review.
370
            request.execute(''))
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
371
        made_dir = bzrdir.BzrDir.open_from_transport(backing)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
372
        # no branch, tree or repository is expected with the current
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
373
        # default formart.
374
        self.assertRaises(errors.NoWorkingTree, made_dir.open_workingtree)
375
        self.assertRaises(errors.NotBranchError, made_dir.open_branch)
376
        self.assertRaises(errors.NoRepositoryPresent, made_dir.open_repository)
377
378
    def test_missing_dir(self):
379
        """Initializing a missing directory should fail like the bzrdir api."""
380
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
381
        request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
382
        self.assertRaises(errors.NoSuchFile,
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
383
            request.execute, 'subdir')
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
384
385
    def test_initialized_dir(self):
386
        """Initializing an extant bzrdir should fail like the bzrdir api."""
387
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
388
        request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
389
        self.make_bzrdir('subdir')
390
        self.assertRaises(errors.FileExists,
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
391
            request.execute, 'subdir')
392
393
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
394
class TestSmartServerRequestBzrDirInitializeEx(
395
    tests.TestCaseWithMemoryTransport):
4436.1.1 by Andrew Bennetts
Rename BzrDirFormat.initialize_ex verb to BzrDirFormat.initialize_ex_1.16.
396
    """Basic tests for BzrDir.initialize_ex_1.16 in the smart server.
4294.2.7 by Robert Collins
Start building up a BzrDir.initialize_ex verb for the smart server.
397
4294.2.10 by Robert Collins
Review feedback.
398
    The main unit tests in test_bzrdir exercise the API comprehensively.
4294.2.7 by Robert Collins
Start building up a BzrDir.initialize_ex verb for the smart server.
399
    """
400
401
    def test_empty_dir(self):
402
        """Initializing an empty dir should succeed and do it."""
403
        backing = self.get_transport()
4294.2.8 by Robert Collins
Reduce round trips pushing new branches substantially.
404
        name = self.make_bzrdir('reference')._format.network_name()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
405
        request = smart_dir.SmartServerRequestBzrDirInitializeEx(backing)
406
        self.assertEqual(
407
            smart_req.SmartServerResponse(('', '', '', '', '', '', name,
408
                                           'False', '', '', '')),
4294.2.8 by Robert Collins
Reduce round trips pushing new branches substantially.
409
            request.execute(name, '', 'True', 'False', 'False', '', '', '', '',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
410
                            'False'))
4294.2.7 by Robert Collins
Start building up a BzrDir.initialize_ex verb for the smart server.
411
        made_dir = bzrdir.BzrDir.open_from_transport(backing)
412
        # no branch, tree or repository is expected with the current
4294.2.10 by Robert Collins
Review feedback.
413
        # default format.
4294.2.7 by Robert Collins
Start building up a BzrDir.initialize_ex verb for the smart server.
414
        self.assertRaises(errors.NoWorkingTree, made_dir.open_workingtree)
415
        self.assertRaises(errors.NotBranchError, made_dir.open_branch)
416
        self.assertRaises(errors.NoRepositoryPresent, made_dir.open_repository)
417
418
    def test_missing_dir(self):
419
        """Initializing a missing directory should fail like the bzrdir api."""
420
        backing = self.get_transport()
4294.2.8 by Robert Collins
Reduce round trips pushing new branches substantially.
421
        name = self.make_bzrdir('reference')._format.network_name()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
422
        request = smart_dir.SmartServerRequestBzrDirInitializeEx(backing)
4294.2.8 by Robert Collins
Reduce round trips pushing new branches substantially.
423
        self.assertRaises(errors.NoSuchFile, request.execute, name,
424
            'subdir/dir', 'False', 'False', 'False', '', '', '', '', 'False')
4294.2.7 by Robert Collins
Start building up a BzrDir.initialize_ex verb for the smart server.
425
426
    def test_initialized_dir(self):
4416.3.4 by Jonathan Lange
Fix a typo.
427
        """Initializing an extant directory should fail like the bzrdir api."""
4294.2.7 by Robert Collins
Start building up a BzrDir.initialize_ex verb for the smart server.
428
        backing = self.get_transport()
4294.2.8 by Robert Collins
Reduce round trips pushing new branches substantially.
429
        name = self.make_bzrdir('reference')._format.network_name()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
430
        request = smart_dir.SmartServerRequestBzrDirInitializeEx(backing)
4294.2.7 by Robert Collins
Start building up a BzrDir.initialize_ex verb for the smart server.
431
        self.make_bzrdir('subdir')
4294.2.8 by Robert Collins
Reduce round trips pushing new branches substantially.
432
        self.assertRaises(errors.FileExists, request.execute, name, 'subdir',
433
            'False', 'False', 'False', '', '', '', '', 'False')
4294.2.7 by Robert Collins
Start building up a BzrDir.initialize_ex verb for the smart server.
434
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.
435
436
class TestSmartServerRequestOpenBzrDir(tests.TestCaseWithMemoryTransport):
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
437
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.
438
    def test_no_directory(self):
439
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
440
        request = smart_dir.SmartServerRequestOpenBzrDir(backing)
441
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
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.
442
            request.execute('does-not-exist'))
443
444
    def test_empty_directory(self):
445
        backing = self.get_transport()
446
        backing.mkdir('empty')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
447
        request = smart_dir.SmartServerRequestOpenBzrDir(backing)
448
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
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.
449
            request.execute('empty'))
450
451
    def test_outside_root_client_path(self):
452
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
453
        request = smart_dir.SmartServerRequestOpenBzrDir(backing,
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.
454
            root_client_path='root')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
455
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
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.
456
            request.execute('not-root'))
457
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
458
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.
459
class TestSmartServerRequestOpenBzrDir_2_1(tests.TestCaseWithMemoryTransport):
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
460
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.
461
    def test_no_directory(self):
462
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
463
        request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
464
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
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.
465
            request.execute('does-not-exist'))
466
467
    def test_empty_directory(self):
468
        backing = self.get_transport()
469
        backing.mkdir('empty')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
470
        request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
471
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
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.
472
            request.execute('empty'))
473
474
    def test_present_without_workingtree(self):
475
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
476
        request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
4634.47.5 by Andrew Bennetts
Add tests, and fix BzrDirMeta1.has_workingtree which was failing if the local transport is decorated with a ChrootTransport or similar.
477
        self.make_bzrdir('.')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
478
        self.assertEqual(smart_req.SmartServerResponse(('yes', 'no')),
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.
479
            request.execute(''))
480
4634.47.6 by Andrew Bennetts
Give 'no' response for paths outside the root_client_path.
481
    def test_outside_root_client_path(self):
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.
482
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
483
        request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing,
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.
484
            root_client_path='root')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
485
        self.assertEqual(smart_req.SmartServerResponse(('no',)),
4634.47.6 by Andrew Bennetts
Give 'no' response for paths outside the root_client_path.
486
            request.execute('not-root'))
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.
487
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
488
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.
489
class TestSmartServerRequestOpenBzrDir_2_1_disk(TestCaseWithChrootedTransport):
490
491
    def test_present_with_workingtree(self):
5017.3.26 by Vincent Ladeuil
./bzr selftest -s bt.test_smart passing
492
        self.vfs_transport_factory = test_server.LocalURLServer
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.
493
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
494
        request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
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.
495
        bd = self.make_bzrdir('.')
496
        bd.create_repository()
497
        bd.create_branch()
498
        bd.create_workingtree()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
499
        self.assertEqual(smart_req.SmartServerResponse(('yes', 'yes')),
4634.47.5 by Andrew Bennetts
Add tests, and fix BzrDirMeta1.has_workingtree which was failing if the local transport is decorated with a ChrootTransport or similar.
500
            request.execute(''))
501
502
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
503
class TestSmartServerRequestOpenBranch(TestCaseWithChrootedTransport):
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
504
505
    def test_no_branch(self):
506
        """When there is no branch, ('nobranch', ) is returned."""
507
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
508
        request = smart_dir.SmartServerRequestOpenBranch(backing)
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
509
        self.make_bzrdir('.')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
510
        self.assertEqual(smart_req.SmartServerResponse(('nobranch', )),
2692.1.20 by Andrew Bennetts
Tweak for consistency suggested by John's review.
511
            request.execute(''))
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
512
513
    def test_branch(self):
514
        """When there is a branch, 'ok' is returned."""
515
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
516
        request = smart_dir.SmartServerRequestOpenBranch(backing)
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
517
        self.make_branch('.')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
518
        self.assertEqual(smart_req.SmartServerResponse(('ok', '')),
2692.1.20 by Andrew Bennetts
Tweak for consistency suggested by John's review.
519
            request.execute(''))
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
520
521
    def test_branch_reference(self):
522
        """When there is a branch reference, the reference URL is returned."""
5017.3.26 by Vincent Ladeuil
./bzr selftest -s bt.test_smart passing
523
        self.vfs_transport_factory = test_server.LocalURLServer
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
524
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
525
        request = smart_dir.SmartServerRequestOpenBranch(backing)
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
526
        branch = self.make_branch('branch')
527
        checkout = branch.create_checkout('reference',lightweight=True)
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
528
        reference_url = _mod_branch.BranchReferenceFormat().get_reference(
529
            checkout.bzrdir)
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
530
        self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
531
        self.assertEqual(smart_req.SmartServerResponse(('ok', reference_url)),
2692.1.20 by Andrew Bennetts
Tweak for consistency suggested by John's review.
532
            request.execute('reference'))
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
533
4734.4.5 by Brian de Alwis
Address comments from Aaron Bentley
534
    def test_notification_on_branch_from_repository(self):
4734.4.4 by Brian de Alwis
Added tests to ensure branching-from-repository error returns detail
535
        """When there is a repository, the error should return details."""
536
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
537
        request = smart_dir.SmartServerRequestOpenBranch(backing)
4734.4.4 by Brian de Alwis
Added tests to ensure branching-from-repository error returns detail
538
        repo = self.make_repository('.')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
539
        self.assertEqual(smart_req.SmartServerResponse(('nobranch',)),
4734.4.4 by Brian de Alwis
Added tests to ensure branching-from-repository error returns detail
540
            request.execute(''))
541
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
542
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.
543
class TestSmartServerRequestOpenBranchV2(TestCaseWithChrootedTransport):
544
545
    def test_no_branch(self):
546
        """When there is no branch, ('nobranch', ) is returned."""
547
        backing = self.get_transport()
548
        self.make_bzrdir('.')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
549
        request = smart_dir.SmartServerRequestOpenBranchV2(backing)
550
        self.assertEqual(smart_req.SmartServerResponse(('nobranch', )),
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.
551
            request.execute(''))
552
553
    def test_branch(self):
554
        """When there is a branch, 'ok' is returned."""
555
        backing = self.get_transport()
556
        expected = self.make_branch('.')._format.network_name()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
557
        request = smart_dir.SmartServerRequestOpenBranchV2(backing)
558
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(
559
                ('branch', expected)),
560
                         request.execute(''))
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.
561
562
    def test_branch_reference(self):
563
        """When there is a branch reference, the reference URL is returned."""
5017.3.26 by Vincent Ladeuil
./bzr selftest -s bt.test_smart passing
564
        self.vfs_transport_factory = test_server.LocalURLServer
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.
565
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
566
        request = smart_dir.SmartServerRequestOpenBranchV2(backing)
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.
567
        branch = self.make_branch('branch')
568
        checkout = branch.create_checkout('reference',lightweight=True)
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
569
        reference_url = _mod_branch.BranchReferenceFormat().get_reference(
570
            checkout.bzrdir)
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.
571
        self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
572
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(
573
                ('ref', reference_url)),
574
                         request.execute('reference'))
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
575
4160.2.1 by Andrew Bennetts
Failing test for BzrDir.open_branchV2 RPC not opening stacked-on branch.
576
    def test_stacked_branch(self):
577
        """Opening a stacked branch does not open the stacked-on branch."""
578
        trunk = self.make_branch('trunk')
4599.4.30 by Robert Collins
Remove hard coded format in test_smart's test_stacked_branch now the default format stacks.
579
        feature = self.make_branch('feature')
4160.2.1 by Andrew Bennetts
Failing test for BzrDir.open_branchV2 RPC not opening stacked-on branch.
580
        feature.set_stacked_on_url(trunk.base)
581
        opened_branches = []
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
582
        _mod_branch.Branch.hooks.install_named_hook(
583
            'open', opened_branches.append, None)
4160.2.1 by Andrew Bennetts
Failing test for BzrDir.open_branchV2 RPC not opening stacked-on branch.
584
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
585
        request = smart_dir.SmartServerRequestOpenBranchV2(backing)
4160.2.4 by Andrew Bennetts
Use BzrDir pre_open hook to jail request code from accessing transports other than the backing transport.
586
        request.setup_jail()
587
        try:
588
            response = request.execute('feature')
589
        finally:
590
            request.teardown_jail()
4160.2.1 by Andrew Bennetts
Failing test for BzrDir.open_branchV2 RPC not opening stacked-on branch.
591
        expected_format = feature._format.network_name()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
592
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(
593
                ('branch', expected_format)),
594
                         response)
4160.2.1 by Andrew Bennetts
Failing test for BzrDir.open_branchV2 RPC not opening stacked-on branch.
595
        self.assertLength(1, opened_branches)
596
4734.4.5 by Brian de Alwis
Address comments from Aaron Bentley
597
    def test_notification_on_branch_from_repository(self):
4734.4.4 by Brian de Alwis
Added tests to ensure branching-from-repository error returns detail
598
        """When there is a repository, the error should return details."""
599
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
600
        request = smart_dir.SmartServerRequestOpenBranchV2(backing)
4734.4.4 by Brian de Alwis
Added tests to ensure branching-from-repository error returns detail
601
        repo = self.make_repository('.')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
602
        self.assertEqual(smart_req.SmartServerResponse(('nobranch',)),
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).
603
            request.execute(''))
604
605
606
class TestSmartServerRequestOpenBranchV3(TestCaseWithChrootedTransport):
607
608
    def test_no_branch(self):
609
        """When there is no branch, ('nobranch', ) is returned."""
610
        backing = self.get_transport()
611
        self.make_bzrdir('.')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
612
        request = smart_dir.SmartServerRequestOpenBranchV3(backing)
613
        self.assertEqual(smart_req.SmartServerResponse(('nobranch',)),
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).
614
            request.execute(''))
615
616
    def test_branch(self):
617
        """When there is a branch, 'ok' is returned."""
618
        backing = self.get_transport()
619
        expected = self.make_branch('.')._format.network_name()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
620
        request = smart_dir.SmartServerRequestOpenBranchV3(backing)
621
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(
622
                ('branch', expected)),
623
                         request.execute(''))
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).
624
625
    def test_branch_reference(self):
626
        """When there is a branch reference, the reference URL is returned."""
5017.3.26 by Vincent Ladeuil
./bzr selftest -s bt.test_smart passing
627
        self.vfs_transport_factory = test_server.LocalURLServer
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).
628
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
629
        request = smart_dir.SmartServerRequestOpenBranchV3(backing)
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).
630
        branch = self.make_branch('branch')
631
        checkout = branch.create_checkout('reference',lightweight=True)
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
632
        reference_url = _mod_branch.BranchReferenceFormat().get_reference(
633
            checkout.bzrdir)
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
        self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
635
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(
636
                ('ref', reference_url)),
637
                         request.execute('reference'))
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).
638
639
    def test_stacked_branch(self):
640
        """Opening a stacked branch does not open the stacked-on branch."""
641
        trunk = self.make_branch('trunk')
642
        feature = self.make_branch('feature')
643
        feature.set_stacked_on_url(trunk.base)
644
        opened_branches = []
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
645
        _mod_branch.Branch.hooks.install_named_hook(
646
            'open', opened_branches.append, None)
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).
647
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
648
        request = smart_dir.SmartServerRequestOpenBranchV3(backing)
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).
649
        request.setup_jail()
650
        try:
651
            response = request.execute('feature')
652
        finally:
653
            request.teardown_jail()
654
        expected_format = feature._format.network_name()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
655
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(
656
                ('branch', expected_format)),
657
                         response)
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).
658
        self.assertLength(1, opened_branches)
659
660
    def test_notification_on_branch_from_repository(self):
661
        """When there is a repository, the error should return details."""
662
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
663
        request = smart_dir.SmartServerRequestOpenBranchV3(backing)
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).
664
        repo = self.make_repository('.')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
665
        self.assertEqual(smart_req.SmartServerResponse(
666
                ('nobranch', 'location is a repository')),
667
                         request.execute(''))
4734.4.4 by Brian de Alwis
Added tests to ensure branching-from-repository error returns detail
668
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.
669
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
670
class TestSmartServerRequestRevisionHistory(tests.TestCaseWithMemoryTransport):
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
671
672
    def test_empty(self):
673
        """For an empty branch, the body is empty."""
674
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
675
        request = smart_branch.SmartServerRequestRevisionHistory(backing)
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
676
        self.make_branch('.')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
677
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), ''),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
678
            request.execute(''))
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
679
680
    def test_not_empty(self):
681
        """For a non-empty branch, the body is empty."""
682
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
683
        request = smart_branch.SmartServerRequestRevisionHistory(backing)
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
684
        tree = self.make_branch_and_memory_tree('.')
685
        tree.lock_write()
686
        tree.add('')
687
        r1 = tree.commit('1st commit')
2018.5.148 by Andrew Bennetts
Fix all the DeprecationWarnings in test_smart caused by unicode revision IDs.
688
        r2 = tree.commit('2nd commit', rev_id=u'\xc8'.encode('utf-8'))
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
689
        tree.unlock()
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
690
        self.assertEqual(
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
691
            smart_req.SmartServerResponse(('ok', ), ('\x00'.join([r1, r2]))),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
692
            request.execute(''))
693
694
695
class TestSmartServerBranchRequest(tests.TestCaseWithMemoryTransport):
2018.5.49 by Wouter van Heyst
Refactor SmartServerBranchRequest out from SmartServerRequestRevisionHistory to
696
697
    def test_no_branch(self):
698
        """When there is a bzrdir and no branch, NotBranchError is raised."""
699
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
700
        request = smart_branch.SmartServerBranchRequest(backing)
2018.5.49 by Wouter van Heyst
Refactor SmartServerBranchRequest out from SmartServerRequestRevisionHistory to
701
        self.make_bzrdir('.')
702
        self.assertRaises(errors.NotBranchError,
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
703
            request.execute, '')
2018.5.49 by Wouter van Heyst
Refactor SmartServerBranchRequest out from SmartServerRequestRevisionHistory to
704
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
705
    def test_branch_reference(self):
706
        """When there is a branch reference, NotBranchError is raised."""
707
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
708
        request = smart_branch.SmartServerBranchRequest(backing)
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
709
        branch = self.make_branch('branch')
710
        checkout = branch.create_checkout('reference',lightweight=True)
711
        self.assertRaises(errors.NotBranchError,
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
712
            request.execute, 'checkout')
713
714
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
715
class TestSmartServerBranchRequestLastRevisionInfo(
716
    tests.TestCaseWithMemoryTransport):
2018.5.50 by Wouter van Heyst
Add SmartServerBranchRequestLastRevisionInfo method.
717
718
    def test_empty(self):
2018.5.170 by Andrew Bennetts
Use 'null:' instead of '' to mean NULL_REVISION on the wire.
719
        """For an empty branch, the result is ('ok', '0', 'null:')."""
2018.5.50 by Wouter van Heyst
Add SmartServerBranchRequestLastRevisionInfo method.
720
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
721
        request = smart_branch.SmartServerBranchRequestLastRevisionInfo(backing)
2018.5.50 by Wouter van Heyst
Add SmartServerBranchRequestLastRevisionInfo method.
722
        self.make_branch('.')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
723
        self.assertEqual(smart_req.SmartServerResponse(('ok', '0', 'null:')),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
724
            request.execute(''))
2018.5.50 by Wouter van Heyst
Add SmartServerBranchRequestLastRevisionInfo method.
725
726
    def test_not_empty(self):
727
        """For a non-empty branch, the result is ('ok', 'revno', 'revid')."""
728
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
729
        request = smart_branch.SmartServerBranchRequestLastRevisionInfo(backing)
2018.5.50 by Wouter van Heyst
Add SmartServerBranchRequestLastRevisionInfo method.
730
        tree = self.make_branch_and_memory_tree('.')
731
        tree.lock_write()
732
        tree.add('')
2018.5.148 by Andrew Bennetts
Fix all the DeprecationWarnings in test_smart caused by unicode revision IDs.
733
        rev_id_utf8 = u'\xc8'.encode('utf-8')
2018.5.50 by Wouter van Heyst
Add SmartServerBranchRequestLastRevisionInfo method.
734
        r1 = tree.commit('1st commit')
2018.5.148 by Andrew Bennetts
Fix all the DeprecationWarnings in test_smart caused by unicode revision IDs.
735
        r2 = tree.commit('2nd commit', rev_id=rev_id_utf8)
2018.5.50 by Wouter van Heyst
Add SmartServerBranchRequestLastRevisionInfo method.
736
        tree.unlock()
737
        self.assertEqual(
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
738
            smart_req.SmartServerResponse(('ok', '2', rev_id_utf8)),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
739
            request.execute(''))
740
741
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
742
class TestSmartServerBranchRequestGetConfigFile(
743
    tests.TestCaseWithMemoryTransport):
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
744
745
    def test_default(self):
746
        """With no file, we get empty content."""
747
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
748
        request = smart_branch.SmartServerBranchGetConfigFile(backing)
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
749
        branch = self.make_branch('.')
750
        # there should be no file by default
751
        content = ''
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
752
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), content),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
753
            request.execute(''))
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
754
755
    def test_with_content(self):
756
        # SmartServerBranchGetConfigFile should return the content from
757
        # branch.control_files.get('branch.conf') for now - in the future it may
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
758
        # perform more complex processing.
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
759
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
760
        request = smart_branch.SmartServerBranchGetConfigFile(backing)
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
761
        branch = self.make_branch('.')
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
762
        branch._transport.put_bytes('branch.conf', 'foo bar baz')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
763
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), 'foo bar baz'),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
764
            request.execute(''))
765
766
4226.2.1 by Robert Collins
Set branch config options via a smart method.
767
class TestLockedBranch(tests.TestCaseWithMemoryTransport):
768
769
    def get_lock_tokens(self, branch):
770
        branch_token = branch.lock_write()
771
        repo_token = branch.repository.lock_write()
772
        branch.repository.unlock()
773
        return branch_token, repo_token
774
775
776
class TestSmartServerBranchRequestSetConfigOption(TestLockedBranch):
777
778
    def test_value_name(self):
779
        branch = self.make_branch('.')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
780
        request = smart_branch.SmartServerBranchRequestSetConfigOption(
4226.2.1 by Robert Collins
Set branch config options via a smart method.
781
            branch.bzrdir.root_transport)
782
        branch_token, repo_token = self.get_lock_tokens(branch)
783
        config = branch._get_config()
784
        result = request.execute('', branch_token, repo_token, 'bar', 'foo',
785
            '')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
786
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), result)
4226.2.1 by Robert Collins
Set branch config options via a smart method.
787
        self.assertEqual('bar', config.get_option('foo'))
4327.1.10 by Vincent Ladeuil
Fix 10 more lock-related test failures.
788
        # Cleanup
789
        branch.unlock()
4226.2.1 by Robert Collins
Set branch config options via a smart method.
790
791
    def test_value_name_section(self):
792
        branch = self.make_branch('.')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
793
        request = smart_branch.SmartServerBranchRequestSetConfigOption(
4226.2.1 by Robert Collins
Set branch config options via a smart method.
794
            branch.bzrdir.root_transport)
795
        branch_token, repo_token = self.get_lock_tokens(branch)
796
        config = branch._get_config()
797
        result = request.execute('', branch_token, repo_token, 'bar', 'foo',
798
            'gam')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
799
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), result)
4226.2.1 by Robert Collins
Set branch config options via a smart method.
800
        self.assertEqual('bar', config.get_option('foo', 'gam'))
4327.1.10 by Vincent Ladeuil
Fix 10 more lock-related test failures.
801
        # Cleanup
802
        branch.unlock()
4226.2.1 by Robert Collins
Set branch config options via a smart method.
803
804
4556.2.2 by Andrew Bennetts
Handle failures more gracefully.
805
class TestSmartServerBranchRequestSetTagsBytes(TestLockedBranch):
806
    # Only called when the branch format and tags match [yay factory
807
    # methods] so only need to test straight forward cases.
808
809
    def test_set_bytes(self):
810
        base_branch = self.make_branch('base')
811
        tag_bytes = base_branch._get_tags_bytes()
812
        # get_lock_tokens takes out a lock.
813
        branch_token, repo_token = self.get_lock_tokens(base_branch)
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
814
        request = smart_branch.SmartServerBranchSetTagsBytes(
4556.2.2 by Andrew Bennetts
Handle failures more gracefully.
815
            self.get_transport())
816
        response = request.execute('base', branch_token, repo_token)
817
        self.assertEqual(None, response)
818
        response = request.do_chunk(tag_bytes)
819
        self.assertEqual(None, response)
820
        response = request.do_end()
821
        self.assertEquals(
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
822
            smart_req.SuccessfulSmartServerResponse(()), response)
4556.2.2 by Andrew Bennetts
Handle failures more gracefully.
823
        base_branch.unlock()
824
825
    def test_lock_failed(self):
826
        base_branch = self.make_branch('base')
827
        base_branch.lock_write()
828
        tag_bytes = base_branch._get_tags_bytes()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
829
        request = smart_branch.SmartServerBranchSetTagsBytes(
4556.2.2 by Andrew Bennetts
Handle failures more gracefully.
830
            self.get_transport())
831
        self.assertRaises(errors.TokenMismatch, request.execute,
832
            'base', 'wrong token', 'wrong token')
833
        # The request handler will keep processing the message parts, so even
834
        # if the request fails immediately do_chunk and do_end are still
835
        # called.
836
        request.do_chunk(tag_bytes)
837
        request.do_end()
838
        base_branch.unlock()
839
840
841
4226.2.1 by Robert Collins
Set branch config options via a smart method.
842
class SetLastRevisionTestBase(TestLockedBranch):
3441.5.30 by Andrew Bennetts
Improve tests for all Branch.set_last_revision* verbs.
843
    """Base test case for verbs that implement set_last_revision."""
844
845
    def setUp(self):
846
        tests.TestCaseWithMemoryTransport.setUp(self)
847
        backing_transport = self.get_transport()
848
        self.request = self.request_class(backing_transport)
849
        self.tree = self.make_branch_and_memory_tree('.')
850
851
    def lock_branch(self):
4226.2.1 by Robert Collins
Set branch config options via a smart method.
852
        return self.get_lock_tokens(self.tree.branch)
3441.5.30 by Andrew Bennetts
Improve tests for all Branch.set_last_revision* verbs.
853
854
    def unlock_branch(self):
855
        self.tree.branch.unlock()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
856
3441.5.30 by Andrew Bennetts
Improve tests for all Branch.set_last_revision* verbs.
857
    def set_last_revision(self, revision_id, revno):
858
        branch_token, repo_token = self.lock_branch()
859
        response = self._set_last_revision(
860
            revision_id, revno, branch_token, repo_token)
861
        self.unlock_branch()
862
        return response
863
864
    def assertRequestSucceeds(self, revision_id, revno):
865
        response = self.set_last_revision(revision_id, revno)
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
866
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
867
                         response)
3441.5.30 by Andrew Bennetts
Improve tests for all Branch.set_last_revision* verbs.
868
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
869
3441.5.30 by Andrew Bennetts
Improve tests for all Branch.set_last_revision* verbs.
870
class TestSetLastRevisionVerbMixin(object):
871
    """Mixin test case for verbs that implement set_last_revision."""
872
873
    def test_set_null_to_null(self):
874
        """An empty branch can have its last revision set to 'null:'."""
875
        self.assertRequestSucceeds('null:', 0)
876
877
    def test_NoSuchRevision(self):
878
        """If the revision_id is not present, the verb returns NoSuchRevision.
879
        """
880
        revision_id = 'non-existent revision'
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
881
        self.assertEqual(smart_req.FailedSmartServerResponse(('NoSuchRevision',
882
                                                              revision_id)),
883
                         self.set_last_revision(revision_id, 1))
3441.5.30 by Andrew Bennetts
Improve tests for all Branch.set_last_revision* verbs.
884
885
    def make_tree_with_two_commits(self):
886
        self.tree.lock_write()
887
        self.tree.add('')
888
        rev_id_utf8 = u'\xc8'.encode('utf-8')
889
        r1 = self.tree.commit('1st commit', rev_id=rev_id_utf8)
890
        r2 = self.tree.commit('2nd commit', rev_id='rev-2')
891
        self.tree.unlock()
892
893
    def test_branch_last_revision_info_is_updated(self):
894
        """A branch's tip can be set to a revision that is present in its
895
        repository.
896
        """
897
        # Make a branch with an empty revision history, but two revisions in
898
        # its repository.
899
        self.make_tree_with_two_commits()
900
        rev_id_utf8 = u'\xc8'.encode('utf-8')
901
        self.tree.branch.set_revision_history([])
902
        self.assertEqual(
903
            (0, 'null:'), self.tree.branch.last_revision_info())
904
        # We can update the branch to a revision that is present in the
905
        # repository.
906
        self.assertRequestSucceeds(rev_id_utf8, 1)
907
        self.assertEqual(
908
            (1, rev_id_utf8), self.tree.branch.last_revision_info())
909
910
    def test_branch_last_revision_info_rewind(self):
911
        """A branch's tip can be set to a revision that is an ancestor of the
912
        current tip.
913
        """
914
        self.make_tree_with_two_commits()
915
        rev_id_utf8 = u'\xc8'.encode('utf-8')
916
        self.assertEqual(
917
            (2, 'rev-2'), self.tree.branch.last_revision_info())
918
        self.assertRequestSucceeds(rev_id_utf8, 1)
919
        self.assertEqual(
920
            (1, rev_id_utf8), self.tree.branch.last_revision_info())
921
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
922
    def test_TipChangeRejected(self):
923
        """If a pre_change_branch_tip hook raises TipChangeRejected, the verb
924
        returns TipChangeRejected.
925
        """
926
        rejection_message = u'rejection message\N{INTERROBANG}'
927
        def hook_that_rejects(params):
928
            raise errors.TipChangeRejected(rejection_message)
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
929
        _mod_branch.Branch.hooks.install_named_hook(
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
930
            'pre_change_branch_tip', hook_that_rejects, None)
931
        self.assertEqual(
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
932
            smart_req.FailedSmartServerResponse(
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
933
                ('TipChangeRejected', rejection_message.encode('utf-8'))),
934
            self.set_last_revision('null:', 0))
935
3441.5.30 by Andrew Bennetts
Improve tests for all Branch.set_last_revision* verbs.
936
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
937
class TestSmartServerBranchRequestSetLastRevision(
3441.5.30 by Andrew Bennetts
Improve tests for all Branch.set_last_revision* verbs.
938
        SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
939
    """Tests for Branch.set_last_revision verb."""
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
940
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
941
    request_class = smart_branch.SmartServerBranchRequestSetLastRevision
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
942
3441.5.30 by Andrew Bennetts
Improve tests for all Branch.set_last_revision* verbs.
943
    def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
944
        return self.request.execute(
945
            '', branch_token, repo_token, revision_id)
946
947
948
class TestSmartServerBranchRequestSetLastRevisionInfo(
949
        SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
950
    """Tests for Branch.set_last_revision_info verb."""
951
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
952
    request_class = smart_branch.SmartServerBranchRequestSetLastRevisionInfo
3441.5.30 by Andrew Bennetts
Improve tests for all Branch.set_last_revision* verbs.
953
954
    def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
955
        return self.request.execute(
956
            '', branch_token, repo_token, revno, revision_id)
957
958
    def test_NoSuchRevision(self):
959
        """Branch.set_last_revision_info does not have to return
960
        NoSuchRevision if the revision_id is absent.
961
        """
962
        raise tests.TestNotApplicable()
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
963
964
3441.5.25 by Andrew Bennetts
Rename Branch.set_last_revision_descendant verb to Branch.set_last_revision_ex. It's a cop out, but at least it's not misleading.
965
class TestSmartServerBranchRequestSetLastRevisionEx(
3441.5.30 by Andrew Bennetts
Improve tests for all Branch.set_last_revision* verbs.
966
        SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
967
    """Tests for Branch.set_last_revision_ex verb."""
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
968
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
969
    request_class = smart_branch.SmartServerBranchRequestSetLastRevisionEx
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
970
3441.5.30 by Andrew Bennetts
Improve tests for all Branch.set_last_revision* verbs.
971
    def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
972
        return self.request.execute(
973
            '', branch_token, repo_token, revision_id, 0, 0)
974
975
    def assertRequestSucceeds(self, revision_id, revno):
976
        response = self.set_last_revision(revision_id, revno)
977
        self.assertEqual(
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
978
            smart_req.SuccessfulSmartServerResponse(('ok', revno, revision_id)),
3441.5.30 by Andrew Bennetts
Improve tests for all Branch.set_last_revision* verbs.
979
            response)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
980
3441.5.30 by Andrew Bennetts
Improve tests for all Branch.set_last_revision* verbs.
981
    def test_branch_last_revision_info_rewind(self):
982
        """A branch's tip can be set to a revision that is an ancestor of the
983
        current tip, but only if allow_overwrite_descendant is passed.
984
        """
985
        self.make_tree_with_two_commits()
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
986
        rev_id_utf8 = u'\xc8'.encode('utf-8')
3441.5.30 by Andrew Bennetts
Improve tests for all Branch.set_last_revision* verbs.
987
        self.assertEqual(
988
            (2, 'rev-2'), self.tree.branch.last_revision_info())
989
        # If allow_overwrite_descendant flag is 0, then trying to set the tip
990
        # to an older revision ID has no effect.
991
        branch_token, repo_token = self.lock_branch()
992
        response = self.request.execute(
993
            '', branch_token, repo_token, rev_id_utf8, 0, 0)
994
        self.assertEqual(
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
995
            smart_req.SuccessfulSmartServerResponse(('ok', 2, 'rev-2')),
3441.5.30 by Andrew Bennetts
Improve tests for all Branch.set_last_revision* verbs.
996
            response)
997
        self.assertEqual(
998
            (2, 'rev-2'), self.tree.branch.last_revision_info())
999
1000
        # If allow_overwrite_descendant flag is 1, then setting the tip to an
1001
        # ancestor works.
1002
        response = self.request.execute(
1003
            '', branch_token, repo_token, rev_id_utf8, 0, 1)
1004
        self.assertEqual(
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1005
            smart_req.SuccessfulSmartServerResponse(('ok', 1, rev_id_utf8)),
3441.5.30 by Andrew Bennetts
Improve tests for all Branch.set_last_revision* verbs.
1006
            response)
1007
        self.unlock_branch()
1008
        self.assertEqual(
1009
            (1, rev_id_utf8), self.tree.branch.last_revision_info())
1010
3441.5.31 by Andrew Bennetts
Add test for allow_diverged flag.
1011
    def make_branch_with_divergent_history(self):
1012
        """Make a branch with divergent history in its repo.
1013
1014
        The branch's tip will be 'child-2', and the repo will also contain
1015
        'child-1', which diverges from a common base revision.
3441.5.30 by Andrew Bennetts
Improve tests for all Branch.set_last_revision* verbs.
1016
        """
1017
        self.tree.lock_write()
1018
        self.tree.add('')
1019
        r1 = self.tree.commit('1st commit')
1020
        revno_1, revid_1 = self.tree.branch.last_revision_info()
1021
        r2 = self.tree.commit('2nd commit', rev_id='child-1')
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1022
        # Undo the second commit
3441.5.30 by Andrew Bennetts
Improve tests for all Branch.set_last_revision* verbs.
1023
        self.tree.branch.set_last_revision_info(revno_1, revid_1)
1024
        self.tree.set_parent_ids([revid_1])
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
1025
        # Make a new second commit, child-2.  child-2 has diverged from
1026
        # child-1.
3441.5.30 by Andrew Bennetts
Improve tests for all Branch.set_last_revision* verbs.
1027
        new_r2 = self.tree.commit('2nd commit', rev_id='child-2')
1028
        self.tree.unlock()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1029
3441.5.31 by Andrew Bennetts
Add test for allow_diverged flag.
1030
    def test_not_allow_diverged(self):
1031
        """If allow_diverged is not passed, then setting a divergent history
1032
        returns a Diverged error.
1033
        """
1034
        self.make_branch_with_divergent_history()
3297.4.3 by Andrew Bennetts
Add more tests, handle NoSuchRevision in case the remote branch's format can raise it.
1035
        self.assertEqual(
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1036
            smart_req.FailedSmartServerResponse(('Diverged',)),
3441.5.30 by Andrew Bennetts
Improve tests for all Branch.set_last_revision* verbs.
1037
            self.set_last_revision('child-1', 2))
1038
        # The branch tip was not changed.
1039
        self.assertEqual('child-2', self.tree.branch.last_revision())
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
1040
3441.5.31 by Andrew Bennetts
Add test for allow_diverged flag.
1041
    def test_allow_diverged(self):
1042
        """If allow_diverged is passed, then setting a divergent history
1043
        succeeds.
1044
        """
1045
        self.make_branch_with_divergent_history()
1046
        branch_token, repo_token = self.lock_branch()
1047
        response = self.request.execute(
1048
            '', branch_token, repo_token, 'child-1', 1, 0)
1049
        self.assertEqual(
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1050
            smart_req.SuccessfulSmartServerResponse(('ok', 2, 'child-1')),
3441.5.31 by Andrew Bennetts
Add test for allow_diverged flag.
1051
            response)
1052
        self.unlock_branch()
1053
        # The branch tip was changed.
1054
        self.assertEqual('child-1', self.tree.branch.last_revision())
1055
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
1056
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
1057
class TestSmartServerBranchRequestGetParent(tests.TestCaseWithMemoryTransport):
1058
1059
    def test_get_parent_none(self):
1060
        base_branch = self.make_branch('base')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1061
        request = smart_branch.SmartServerBranchGetParent(self.get_transport())
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
1062
        response = request.execute('base')
1063
        self.assertEquals(
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1064
            smart_req.SuccessfulSmartServerResponse(('',)), response)
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
1065
1066
    def test_get_parent_something(self):
1067
        base_branch = self.make_branch('base')
1068
        base_branch.set_parent(self.get_url('foo'))
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1069
        request = smart_branch.SmartServerBranchGetParent(self.get_transport())
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
1070
        response = request.execute('base')
1071
        self.assertEquals(
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1072
            smart_req.SuccessfulSmartServerResponse(("../foo",)),
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
1073
            response)
1074
1075
4288.1.7 by Robert Collins
Add new remote server verb Branch.set_parent_location, dropping roundtrips further on push operations.
1076
class TestSmartServerBranchRequestSetParent(tests.TestCaseWithMemoryTransport):
1077
1078
    def test_set_parent_none(self):
1079
        branch = self.make_branch('base', format="1.9")
4288.1.9 by Robert Collins
Fix up test usable of _set_parent_location on unlocked branches.
1080
        branch.lock_write()
4288.1.7 by Robert Collins
Add new remote server verb Branch.set_parent_location, dropping roundtrips further on push operations.
1081
        branch._set_parent_location('foo')
4288.1.9 by Robert Collins
Fix up test usable of _set_parent_location on unlocked branches.
1082
        branch.unlock()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1083
        request = smart_branch.SmartServerBranchRequestSetParentLocation(
4288.1.7 by Robert Collins
Add new remote server verb Branch.set_parent_location, dropping roundtrips further on push operations.
1084
            self.get_transport())
1085
        branch_token = branch.lock_write()
1086
        repo_token = branch.repository.lock_write()
1087
        try:
1088
            response = request.execute('base', branch_token, repo_token, '')
1089
        finally:
1090
            branch.repository.unlock()
1091
            branch.unlock()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1092
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), response)
4288.1.7 by Robert Collins
Add new remote server verb Branch.set_parent_location, dropping roundtrips further on push operations.
1093
        self.assertEqual(None, branch.get_parent())
1094
1095
    def test_set_parent_something(self):
1096
        branch = self.make_branch('base', format="1.9")
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1097
        request = smart_branch.SmartServerBranchRequestSetParentLocation(
4288.1.7 by Robert Collins
Add new remote server verb Branch.set_parent_location, dropping roundtrips further on push operations.
1098
            self.get_transport())
1099
        branch_token = branch.lock_write()
1100
        repo_token = branch.repository.lock_write()
1101
        try:
1102
            response = request.execute('base', branch_token, repo_token,
1103
            'http://bar/')
1104
        finally:
1105
            branch.repository.unlock()
1106
            branch.unlock()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1107
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), response)
4288.1.7 by Robert Collins
Add new remote server verb Branch.set_parent_location, dropping roundtrips further on push operations.
1108
        self.assertEqual('http://bar/', branch.get_parent())
1109
1110
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1111
class TestSmartServerBranchRequestGetTagsBytes(
1112
    tests.TestCaseWithMemoryTransport):
4556.2.2 by Andrew Bennetts
Handle failures more gracefully.
1113
    # Only called when the branch format and tags match [yay factory
1114
    # methods] so only need to test straight forward cases.
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.
1115
1116
    def test_get_bytes(self):
1117
        base_branch = self.make_branch('base')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1118
        request = smart_branch.SmartServerBranchGetTagsBytes(
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.
1119
            self.get_transport())
1120
        response = request.execute('base')
1121
        self.assertEquals(
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1122
            smart_req.SuccessfulSmartServerResponse(('',)), response)
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.
1123
1124
3691.2.5 by Martin Pool
Add Branch.get_stacked_on_url rpc and tests for same
1125
class TestSmartServerBranchRequestGetStackedOnURL(tests.TestCaseWithMemoryTransport):
1126
1127
    def test_get_stacked_on_url(self):
1128
        base_branch = self.make_branch('base', format='1.6')
1129
        stacked_branch = self.make_branch('stacked', format='1.6')
1130
        # typically should be relative
1131
        stacked_branch.set_stacked_on_url('../base')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1132
        request = smart_branch.SmartServerBranchRequestGetStackedOnURL(
3691.2.5 by Martin Pool
Add Branch.get_stacked_on_url rpc and tests for same
1133
            self.get_transport())
1134
        response = request.execute('stacked')
1135
        self.assertEquals(
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1136
            smart_req.SmartServerResponse(('ok', '../base')),
3691.2.5 by Martin Pool
Add Branch.get_stacked_on_url rpc and tests for same
1137
            response)
1138
1139
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1140
class TestSmartServerBranchRequestLockWrite(tests.TestCaseWithMemoryTransport):
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1141
1142
    def setUp(self):
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1143
        tests.TestCaseWithMemoryTransport.setUp(self)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1144
1145
    def test_lock_write_on_unlocked_branch(self):
1146
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1147
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
3015.2.12 by Robert Collins
Make test_smart use specific formats as needed to exercise locked and unlocked repositories.
1148
        branch = self.make_branch('.', format='knit')
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1149
        repository = branch.repository
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1150
        response = request.execute('')
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1151
        branch_nonce = branch.control_files._lock.peek().get('nonce')
1152
        repository_nonce = repository.control_files._lock.peek().get('nonce')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1153
        self.assertEqual(smart_req.SmartServerResponse(
1154
                ('ok', branch_nonce, repository_nonce)),
1155
                         response)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1156
        # The branch (and associated repository) is now locked.  Verify that
1157
        # with a new branch object.
1158
        new_branch = repository.bzrdir.open_branch()
1159
        self.assertRaises(errors.LockContention, new_branch.lock_write)
4327.1.10 by Vincent Ladeuil
Fix 10 more lock-related test failures.
1160
        # Cleanup
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1161
        request = smart_branch.SmartServerBranchRequestUnlock(backing)
4327.1.10 by Vincent Ladeuil
Fix 10 more lock-related test failures.
1162
        response = request.execute('', branch_nonce, repository_nonce)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1163
1164
    def test_lock_write_on_locked_branch(self):
1165
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1166
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1167
        branch = self.make_branch('.')
4327.1.10 by Vincent Ladeuil
Fix 10 more lock-related test failures.
1168
        branch_token = branch.lock_write()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1169
        branch.leave_lock_in_place()
1170
        branch.unlock()
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1171
        response = request.execute('')
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1172
        self.assertEqual(
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1173
            smart_req.SmartServerResponse(('LockContention',)), response)
4327.1.10 by Vincent Ladeuil
Fix 10 more lock-related test failures.
1174
        # Cleanup
1175
        branch.lock_write(branch_token)
1176
        branch.dont_leave_lock_in_place()
1177
        branch.unlock()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1178
1179
    def test_lock_write_with_tokens_on_locked_branch(self):
1180
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1181
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
3015.2.12 by Robert Collins
Make test_smart use specific formats as needed to exercise locked and unlocked repositories.
1182
        branch = self.make_branch('.', format='knit')
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
1183
        branch_token = branch.lock_write()
1184
        repo_token = branch.repository.lock_write()
1185
        branch.repository.unlock()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1186
        branch.leave_lock_in_place()
1187
        branch.repository.leave_lock_in_place()
1188
        branch.unlock()
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1189
        response = request.execute('',
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1190
                                   branch_token, repo_token)
1191
        self.assertEqual(
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1192
            smart_req.SmartServerResponse(('ok', branch_token, repo_token)),
1193
            response)
4327.1.10 by Vincent Ladeuil
Fix 10 more lock-related test failures.
1194
        # Cleanup
1195
        branch.repository.lock_write(repo_token)
1196
        branch.repository.dont_leave_lock_in_place()
1197
        branch.repository.unlock()
1198
        branch.lock_write(branch_token)
1199
        branch.dont_leave_lock_in_place()
1200
        branch.unlock()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1201
1202
    def test_lock_write_with_mismatched_tokens_on_locked_branch(self):
1203
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1204
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
3015.2.12 by Robert Collins
Make test_smart use specific formats as needed to exercise locked and unlocked repositories.
1205
        branch = self.make_branch('.', format='knit')
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
1206
        branch_token = branch.lock_write()
1207
        repo_token = branch.repository.lock_write()
1208
        branch.repository.unlock()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1209
        branch.leave_lock_in_place()
1210
        branch.repository.leave_lock_in_place()
1211
        branch.unlock()
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1212
        response = request.execute('',
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1213
                                   branch_token+'xxx', repo_token)
1214
        self.assertEqual(
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1215
            smart_req.SmartServerResponse(('TokenMismatch',)), response)
4327.1.10 by Vincent Ladeuil
Fix 10 more lock-related test failures.
1216
        # Cleanup
1217
        branch.repository.lock_write(repo_token)
1218
        branch.repository.dont_leave_lock_in_place()
1219
        branch.repository.unlock()
1220
        branch.lock_write(branch_token)
1221
        branch.dont_leave_lock_in_place()
1222
        branch.unlock()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1223
1224
    def test_lock_write_on_locked_repo(self):
1225
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1226
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
3015.2.12 by Robert Collins
Make test_smart use specific formats as needed to exercise locked and unlocked repositories.
1227
        branch = self.make_branch('.', format='knit')
4327.1.10 by Vincent Ladeuil
Fix 10 more lock-related test failures.
1228
        repo = branch.repository
1229
        repo_token = repo.lock_write()
1230
        repo.leave_lock_in_place()
1231
        repo.unlock()
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1232
        response = request.execute('')
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1233
        self.assertEqual(
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1234
            smart_req.SmartServerResponse(('LockContention',)), response)
4327.1.10 by Vincent Ladeuil
Fix 10 more lock-related test failures.
1235
        # Cleanup
1236
        repo.lock_write(repo_token)
1237
        repo.dont_leave_lock_in_place()
1238
        repo.unlock()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1239
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.
1240
    def test_lock_write_on_readonly_transport(self):
1241
        backing = self.get_readonly_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1242
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
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.
1243
        branch = self.make_branch('.')
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1244
        root = self.get_transport().clone('/')
1245
        path = urlutils.relative_url(root.base, self.get_transport().base)
1246
        response = request.execute(path)
2872.5.3 by Martin Pool
Pass back LockFailed from smart server lock methods
1247
        error_name, lock_str, why_str = response.args
1248
        self.assertFalse(response.is_successful())
1249
        self.assertEqual('LockFailed', error_name)
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.
1250
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1251
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1252
class TestSmartServerBranchRequestUnlock(tests.TestCaseWithMemoryTransport):
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1253
1254
    def setUp(self):
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1255
        tests.TestCaseWithMemoryTransport.setUp(self)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1256
1257
    def test_unlock_on_locked_branch_and_repo(self):
1258
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1259
        request = smart_branch.SmartServerBranchRequestUnlock(backing)
3015.2.12 by Robert Collins
Make test_smart use specific formats as needed to exercise locked and unlocked repositories.
1260
        branch = self.make_branch('.', format='knit')
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1261
        # Lock the branch
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
1262
        branch_token = branch.lock_write()
1263
        repo_token = branch.repository.lock_write()
1264
        branch.repository.unlock()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1265
        # Unlock the branch (and repo) object, leaving the physical locks
1266
        # in place.
1267
        branch.leave_lock_in_place()
1268
        branch.repository.leave_lock_in_place()
1269
        branch.unlock()
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1270
        response = request.execute('',
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1271
                                   branch_token, repo_token)
1272
        self.assertEqual(
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1273
            smart_req.SmartServerResponse(('ok',)), response)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1274
        # The branch is now unlocked.  Verify that with a new branch
1275
        # object.
1276
        new_branch = branch.bzrdir.open_branch()
1277
        new_branch.lock_write()
1278
        new_branch.unlock()
1279
1280
    def test_unlock_on_unlocked_branch_unlocked_repo(self):
1281
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1282
        request = smart_branch.SmartServerBranchRequestUnlock(backing)
3015.2.12 by Robert Collins
Make test_smart use specific formats as needed to exercise locked and unlocked repositories.
1283
        branch = self.make_branch('.', format='knit')
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1284
        response = request.execute(
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1285
            '', 'branch token', 'repo token')
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1286
        self.assertEqual(
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1287
            smart_req.SmartServerResponse(('TokenMismatch',)), response)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1288
1289
    def test_unlock_on_unlocked_branch_locked_repo(self):
1290
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1291
        request = smart_branch.SmartServerBranchRequestUnlock(backing)
3015.2.12 by Robert Collins
Make test_smart use specific formats as needed to exercise locked and unlocked repositories.
1292
        branch = self.make_branch('.', format='knit')
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1293
        # Lock the repository.
1294
        repo_token = branch.repository.lock_write()
1295
        branch.repository.leave_lock_in_place()
1296
        branch.repository.unlock()
1297
        # Issue branch lock_write request on the unlocked branch (with locked
1298
        # repo).
1299
        response = request.execute(
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1300
            '', 'branch token', repo_token)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1301
        self.assertEqual(
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1302
            smart_req.SmartServerResponse(('TokenMismatch',)), response)
4327.1.10 by Vincent Ladeuil
Fix 10 more lock-related test failures.
1303
        # Cleanup
1304
        branch.repository.lock_write(repo_token)
1305
        branch.repository.dont_leave_lock_in_place()
1306
        branch.repository.unlock()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1307
1308
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1309
class TestSmartServerRepositoryRequest(tests.TestCaseWithMemoryTransport):
2018.5.56 by Robert Collins
Factor out code we expect to be common in SmartServerRequestHasRevision to SmartServerRepositoryRequest (Robert Collins, Vincent Ladeuil).
1310
1311
    def test_no_repository(self):
1312
        """Raise NoRepositoryPresent when there is a bzrdir and no repo."""
1313
        # we test this using a shared repository above the named path,
1314
        # thus checking the right search logic is used - that is, that
1315
        # its the exact path being looked at and the server is not
1316
        # searching.
1317
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1318
        request = smart_repo.SmartServerRepositoryRequest(backing)
2018.5.56 by Robert Collins
Factor out code we expect to be common in SmartServerRequestHasRevision to SmartServerRepositoryRequest (Robert Collins, Vincent Ladeuil).
1319
        self.make_repository('.', shared=True)
1320
        self.make_bzrdir('subdir')
1321
        self.assertRaises(errors.NoRepositoryPresent,
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1322
            request.execute, 'subdir')
1323
1324
3441.5.4 by Andrew Bennetts
Fix test failures, and add some tests for the remote graph heads RPC.
1325
class TestSmartServerRepositoryGetParentMap(tests.TestCaseWithMemoryTransport):
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.
1326
3211.5.3 by Robert Collins
Adjust size of batch and change gzip comments to bzip2.
1327
    def test_trivial_bzipped(self):
1328
        # This tests that the wire encoding is actually bzipped
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.
1329
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1330
        request = smart_repo.SmartServerRepositoryGetParentMap(backing)
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.
1331
        tree = self.make_branch_and_memory_tree('.')
1332
1333
        self.assertEqual(None,
2692.1.24 by Andrew Bennetts
Merge from bzr.dev.
1334
            request.execute('', 'missing-id'))
4190.1.3 by Robert Collins
Allow optional inclusion of ghost data in server get_parent_map calls.
1335
        # Note that it returns a body that is bzipped.
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.
1336
        self.assertEqual(
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1337
            smart_req.SuccessfulSmartServerResponse(('ok', ), bz2.compress('')),
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.
1338
            request.do_body('\n\n0\n'))
1339
4190.1.3 by Robert Collins
Allow optional inclusion of ghost data in server get_parent_map calls.
1340
    def test_trivial_include_missing(self):
1341
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1342
        request = smart_repo.SmartServerRepositoryGetParentMap(backing)
4190.1.3 by Robert Collins
Allow optional inclusion of ghost data in server get_parent_map calls.
1343
        tree = self.make_branch_and_memory_tree('.')
1344
1345
        self.assertEqual(None,
1346
            request.execute('', 'missing-id', 'include-missing:'))
1347
        self.assertEqual(
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1348
            smart_req.SuccessfulSmartServerResponse(('ok', ),
4190.1.3 by Robert Collins
Allow optional inclusion of ghost data in server get_parent_map calls.
1349
                bz2.compress('missing:missing-id')),
1350
            request.do_body('\n\n0\n'))
1351
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.
1352
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1353
class TestSmartServerRepositoryGetRevisionGraph(
1354
    tests.TestCaseWithMemoryTransport):
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1355
1356
    def test_none_argument(self):
1357
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1358
        request = smart_repo.SmartServerRepositoryGetRevisionGraph(backing)
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1359
        tree = self.make_branch_and_memory_tree('.')
1360
        tree.lock_write()
1361
        tree.add('')
1362
        r1 = tree.commit('1st commit')
2018.5.148 by Andrew Bennetts
Fix all the DeprecationWarnings in test_smart caused by unicode revision IDs.
1363
        r2 = tree.commit('2nd commit', rev_id=u'\xc8'.encode('utf-8'))
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1364
        tree.unlock()
1365
1366
        # the lines of revision_id->revision_parent_list has no guaranteed
1367
        # order coming out of a dict, so sort both our test and response
1368
        lines = sorted([' '.join([r2, r1]), r1])
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1369
        response = request.execute('', '')
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1370
        response.body = '\n'.join(sorted(response.body.split('\n')))
1371
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
1372
        self.assertEqual(
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1373
            smart_req.SmartServerResponse(('ok', ), '\n'.join(lines)), response)
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1374
1375
    def test_specific_revision_argument(self):
1376
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1377
        request = smart_repo.SmartServerRepositoryGetRevisionGraph(backing)
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1378
        tree = self.make_branch_and_memory_tree('.')
1379
        tree.lock_write()
1380
        tree.add('')
2018.5.148 by Andrew Bennetts
Fix all the DeprecationWarnings in test_smart caused by unicode revision IDs.
1381
        rev_id_utf8 = u'\xc9'.encode('utf-8')
1382
        r1 = tree.commit('1st commit', rev_id=rev_id_utf8)
1383
        r2 = tree.commit('2nd commit', rev_id=u'\xc8'.encode('utf-8'))
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1384
        tree.unlock()
1385
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1386
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), rev_id_utf8),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1387
            request.execute('', rev_id_utf8))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1388
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1389
    def test_no_such_revision(self):
1390
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1391
        request = smart_repo.SmartServerRepositoryGetRevisionGraph(backing)
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1392
        tree = self.make_branch_and_memory_tree('.')
1393
        tree.lock_write()
1394
        tree.add('')
1395
        r1 = tree.commit('1st commit')
1396
        tree.unlock()
1397
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
1398
        # Note that it still returns body (of zero bytes).
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1399
        self.assertEqual(smart_req.SmartServerResponse(
1400
                ('nosuchrevision', 'missingrevision', ), ''),
1401
                         request.execute('', 'missingrevision'))
1402
1403
1404
class TestSmartServerRepositoryGetRevIdForRevno(
1405
    tests.TestCaseWithMemoryTransport):
4419.2.6 by Andrew Bennetts
Add tests for server-side logic, and fix the bugs exposed by those tests.
1406
1407
    def test_revno_found(self):
1408
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1409
        request = smart_repo.SmartServerRepositoryGetRevIdForRevno(backing)
4419.2.6 by Andrew Bennetts
Add tests for server-side logic, and fix the bugs exposed by those tests.
1410
        tree = self.make_branch_and_memory_tree('.')
1411
        tree.lock_write()
1412
        tree.add('')
1413
        rev1_id_utf8 = u'\xc8'.encode('utf-8')
1414
        rev2_id_utf8 = u'\xc9'.encode('utf-8')
1415
        tree.commit('1st commit', rev_id=rev1_id_utf8)
1416
        tree.commit('2nd commit', rev_id=rev2_id_utf8)
1417
        tree.unlock()
1418
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1419
        self.assertEqual(smart_req.SmartServerResponse(('ok', rev1_id_utf8)),
4419.2.6 by Andrew Bennetts
Add tests for server-side logic, and fix the bugs exposed by those tests.
1420
            request.execute('', 1, (2, rev2_id_utf8)))
1421
1422
    def test_known_revid_missing(self):
1423
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1424
        request = smart_repo.SmartServerRepositoryGetRevIdForRevno(backing)
4419.2.6 by Andrew Bennetts
Add tests for server-side logic, and fix the bugs exposed by those tests.
1425
        repo = self.make_repository('.')
1426
        self.assertEqual(
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1427
            smart_req.FailedSmartServerResponse(('nosuchrevision', 'ghost')),
4419.2.6 by Andrew Bennetts
Add tests for server-side logic, and fix the bugs exposed by those tests.
1428
            request.execute('', 1, (2, 'ghost')))
1429
1430
    def test_history_incomplete(self):
1431
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1432
        request = smart_repo.SmartServerRepositoryGetRevIdForRevno(backing)
4419.2.6 by Andrew Bennetts
Add tests for server-side logic, and fix the bugs exposed by those tests.
1433
        parent = self.make_branch_and_memory_tree('parent', format='1.9')
4526.9.21 by Robert Collins
Fix test_smart's test_history_incomplete to generate a good tree before committing.
1434
        parent.lock_write()
1435
        parent.add([''], ['TREE_ROOT'])
4419.2.6 by Andrew Bennetts
Add tests for server-side logic, and fix the bugs exposed by those tests.
1436
        r1 = parent.commit(message='first commit')
1437
        r2 = parent.commit(message='second commit')
4526.9.21 by Robert Collins
Fix test_smart's test_history_incomplete to generate a good tree before committing.
1438
        parent.unlock()
4419.2.6 by Andrew Bennetts
Add tests for server-side logic, and fix the bugs exposed by those tests.
1439
        local = self.make_branch_and_memory_tree('local', format='1.9')
1440
        local.branch.pull(parent.branch)
1441
        local.set_parent_ids([r2])
1442
        r3 = local.commit(message='local commit')
1443
        local.branch.create_clone_on_transport(
1444
            self.get_transport('stacked'), stacked_on=self.get_url('parent'))
1445
        self.assertEqual(
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1446
            smart_req.SmartServerResponse(('history-incomplete', 2, r2)),
4419.2.6 by Andrew Bennetts
Add tests for server-side logic, and fix the bugs exposed by those tests.
1447
            request.execute('stacked', 1, (3, r3)))
1448
4476.3.68 by Andrew Bennetts
Review comments from John.
1449
4070.9.14 by Andrew Bennetts
Tweaks requested by Robert's review.
1450
class TestSmartServerRepositoryGetStream(tests.TestCaseWithMemoryTransport):
1451
1452
    def make_two_commit_repo(self):
1453
        tree = self.make_branch_and_memory_tree('.')
1454
        tree.lock_write()
1455
        tree.add('')
1456
        r1 = tree.commit('1st commit')
1457
        r2 = tree.commit('2nd commit', rev_id=u'\xc8'.encode('utf-8'))
1458
        tree.unlock()
1459
        repo = tree.branch.repository
1460
        return repo, r1, r2
1461
1462
    def test_ancestry_of(self):
1463
        """The search argument may be a 'ancestry-of' some heads'."""
1464
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1465
        request = smart_repo.SmartServerRepositoryGetStream(backing)
4070.9.14 by Andrew Bennetts
Tweaks requested by Robert's review.
1466
        repo, r1, r2 = self.make_two_commit_repo()
1467
        fetch_spec = ['ancestry-of', r2]
1468
        lines = '\n'.join(fetch_spec)
1469
        request.execute('', repo._format.network_name())
1470
        response = request.do_body(lines)
1471
        self.assertEqual(('ok',), response.args)
1472
        stream_bytes = ''.join(response.body_stream)
1473
        self.assertStartsWith(stream_bytes, 'Bazaar pack format 1')
1474
1475
    def test_search(self):
1476
        """The search argument may be a 'search' of some explicit keys."""
1477
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1478
        request = smart_repo.SmartServerRepositoryGetStream(backing)
4070.9.14 by Andrew Bennetts
Tweaks requested by Robert's review.
1479
        repo, r1, r2 = self.make_two_commit_repo()
1480
        fetch_spec = ['search', '%s %s' % (r1, r2), 'null:', '2']
1481
        lines = '\n'.join(fetch_spec)
1482
        request.execute('', repo._format.network_name())
1483
        response = request.do_body(lines)
1484
        self.assertEqual(('ok',), response.args)
1485
        stream_bytes = ''.join(response.body_stream)
1486
        self.assertStartsWith(stream_bytes, 'Bazaar pack format 1')
1487
1488
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1489
class TestSmartServerRequestHasRevision(tests.TestCaseWithMemoryTransport):
2018.5.56 by Robert Collins
Factor out code we expect to be common in SmartServerRequestHasRevision to SmartServerRepositoryRequest (Robert Collins, Vincent Ladeuil).
1490
1491
    def test_missing_revision(self):
1492
        """For a missing revision, ('no', ) is returned."""
1493
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1494
        request = smart_repo.SmartServerRequestHasRevision(backing)
2018.5.56 by Robert Collins
Factor out code we expect to be common in SmartServerRequestHasRevision to SmartServerRepositoryRequest (Robert Collins, Vincent Ladeuil).
1495
        self.make_repository('.')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1496
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1497
            request.execute('', 'revid'))
2018.5.56 by Robert Collins
Factor out code we expect to be common in SmartServerRequestHasRevision to SmartServerRepositoryRequest (Robert Collins, Vincent Ladeuil).
1498
1499
    def test_present_revision(self):
2018.5.158 by Andrew Bennetts
Return 'yes'/'no' rather than 'ok'/'no' from the Repository.has_revision smart command.
1500
        """For a present revision, ('yes', ) is returned."""
2018.5.56 by Robert Collins
Factor out code we expect to be common in SmartServerRequestHasRevision to SmartServerRepositoryRequest (Robert Collins, Vincent Ladeuil).
1501
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1502
        request = smart_repo.SmartServerRequestHasRevision(backing)
2018.5.56 by Robert Collins
Factor out code we expect to be common in SmartServerRequestHasRevision to SmartServerRepositoryRequest (Robert Collins, Vincent Ladeuil).
1503
        tree = self.make_branch_and_memory_tree('.')
1504
        tree.lock_write()
1505
        tree.add('')
2018.5.148 by Andrew Bennetts
Fix all the DeprecationWarnings in test_smart caused by unicode revision IDs.
1506
        rev_id_utf8 = u'\xc8abc'.encode('utf-8')
1507
        r1 = tree.commit('a commit', rev_id=rev_id_utf8)
2018.5.56 by Robert Collins
Factor out code we expect to be common in SmartServerRequestHasRevision to SmartServerRepositoryRequest (Robert Collins, Vincent Ladeuil).
1508
        tree.unlock()
2018.5.148 by Andrew Bennetts
Fix all the DeprecationWarnings in test_smart caused by unicode revision IDs.
1509
        self.assertTrue(tree.branch.repository.has_revision(rev_id_utf8))
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1510
        self.assertEqual(smart_req.SmartServerResponse(('yes', )),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1511
            request.execute('', rev_id_utf8))
1512
1513
1514
class TestSmartServerRepositoryGatherStats(tests.TestCaseWithMemoryTransport):
2018.10.2 by v.ladeuil+lp at free
gather_stats server side and request registration
1515
1516
    def test_empty_revid(self):
1517
        """With an empty revid, we get only size an number and revisions"""
1518
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1519
        request = smart_repo.SmartServerRepositoryGatherStats(backing)
2018.10.2 by v.ladeuil+lp at free
gather_stats server side and request registration
1520
        repository = self.make_repository('.')
1521
        stats = repository.gather_stats()
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1522
        expected_body = 'revisions: 0\n'
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1523
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), expected_body),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1524
                         request.execute('', '', 'no'))
2018.10.2 by v.ladeuil+lp at free
gather_stats server side and request registration
1525
1526
    def test_revid_with_committers(self):
1527
        """For a revid we get more infos."""
1528
        backing = self.get_transport()
2018.5.148 by Andrew Bennetts
Fix all the DeprecationWarnings in test_smart caused by unicode revision IDs.
1529
        rev_id_utf8 = u'\xc8abc'.encode('utf-8')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1530
        request = smart_repo.SmartServerRepositoryGatherStats(backing)
2018.10.2 by v.ladeuil+lp at free
gather_stats server side and request registration
1531
        tree = self.make_branch_and_memory_tree('.')
1532
        tree.lock_write()
1533
        tree.add('')
1534
        # Let's build a predictable result
1535
        tree.commit('a commit', timestamp=123456.2, timezone=3600)
2018.5.148 by Andrew Bennetts
Fix all the DeprecationWarnings in test_smart caused by unicode revision IDs.
1536
        tree.commit('a commit', timestamp=654321.4, timezone=0,
1537
                    rev_id=rev_id_utf8)
2018.10.2 by v.ladeuil+lp at free
gather_stats server side and request registration
1538
        tree.unlock()
1539
1540
        stats = tree.branch.repository.gather_stats()
1541
        expected_body = ('firstrev: 123456.200 3600\n'
1542
                         'latestrev: 654321.400 0\n'
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1543
                         'revisions: 2\n')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1544
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), expected_body),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1545
                         request.execute('',
2018.5.148 by Andrew Bennetts
Fix all the DeprecationWarnings in test_smart caused by unicode revision IDs.
1546
                                         rev_id_utf8, 'no'))
2018.10.2 by v.ladeuil+lp at free
gather_stats server side and request registration
1547
1548
    def test_not_empty_repository_with_committers(self):
1549
        """For a revid and requesting committers we get the whole thing."""
1550
        backing = self.get_transport()
2018.5.148 by Andrew Bennetts
Fix all the DeprecationWarnings in test_smart caused by unicode revision IDs.
1551
        rev_id_utf8 = u'\xc8abc'.encode('utf-8')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1552
        request = smart_repo.SmartServerRepositoryGatherStats(backing)
2018.10.2 by v.ladeuil+lp at free
gather_stats server side and request registration
1553
        tree = self.make_branch_and_memory_tree('.')
1554
        tree.lock_write()
1555
        tree.add('')
1556
        # Let's build a predictable result
1557
        tree.commit('a commit', timestamp=123456.2, timezone=3600,
1558
                    committer='foo')
1559
        tree.commit('a commit', timestamp=654321.4, timezone=0,
2018.5.148 by Andrew Bennetts
Fix all the DeprecationWarnings in test_smart caused by unicode revision IDs.
1560
                    committer='bar', rev_id=rev_id_utf8)
2018.10.2 by v.ladeuil+lp at free
gather_stats server side and request registration
1561
        tree.unlock()
1562
        stats = tree.branch.repository.gather_stats()
1563
1564
        expected_body = ('committers: 2\n'
1565
                         'firstrev: 123456.200 3600\n'
1566
                         'latestrev: 654321.400 0\n'
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1567
                         'revisions: 2\n')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1568
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), expected_body),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1569
                         request.execute('',
2018.5.148 by Andrew Bennetts
Fix all the DeprecationWarnings in test_smart caused by unicode revision IDs.
1570
                                         rev_id_utf8, 'yes'))
2018.10.2 by v.ladeuil+lp at free
gather_stats server side and request registration
1571
1572
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1573
class TestSmartServerRepositoryIsShared(tests.TestCaseWithMemoryTransport):
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1574
1575
    def test_is_shared(self):
1576
        """For a shared repository, ('yes', ) is returned."""
1577
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1578
        request = smart_repo.SmartServerRepositoryIsShared(backing)
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1579
        self.make_repository('.', shared=True)
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1580
        self.assertEqual(smart_req.SmartServerResponse(('yes', )),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1581
            request.execute('', ))
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1582
1583
    def test_is_not_shared(self):
2018.5.58 by Wouter van Heyst
Small test fixes to reflect naming and documentation
1584
        """For a shared repository, ('no', ) is returned."""
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1585
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1586
        request = smart_repo.SmartServerRepositoryIsShared(backing)
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1587
        self.make_repository('.', shared=False)
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1588
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1589
            request.execute('', ))
1590
1591
1592
class TestSmartServerRepositoryLockWrite(tests.TestCaseWithMemoryTransport):
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1593
1594
    def test_lock_write_on_unlocked_repo(self):
1595
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1596
        request = smart_repo.SmartServerRepositoryLockWrite(backing)
3015.2.12 by Robert Collins
Make test_smart use specific formats as needed to exercise locked and unlocked repositories.
1597
        repository = self.make_repository('.', format='knit')
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1598
        response = request.execute('')
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1599
        nonce = repository.control_files._lock.peek().get('nonce')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1600
        self.assertEqual(smart_req.SmartServerResponse(('ok', nonce)), response)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1601
        # The repository is now locked.  Verify that with a new repository
1602
        # object.
1603
        new_repo = repository.bzrdir.open_repository()
1604
        self.assertRaises(errors.LockContention, new_repo.lock_write)
4327.1.10 by Vincent Ladeuil
Fix 10 more lock-related test failures.
1605
        # Cleanup
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1606
        request = smart_repo.SmartServerRepositoryUnlock(backing)
4327.1.10 by Vincent Ladeuil
Fix 10 more lock-related test failures.
1607
        response = request.execute('', nonce)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1608
1609
    def test_lock_write_on_locked_repo(self):
1610
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1611
        request = smart_repo.SmartServerRepositoryLockWrite(backing)
3015.2.12 by Robert Collins
Make test_smart use specific formats as needed to exercise locked and unlocked repositories.
1612
        repository = self.make_repository('.', format='knit')
4327.1.10 by Vincent Ladeuil
Fix 10 more lock-related test failures.
1613
        repo_token = repository.lock_write()
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1614
        repository.leave_lock_in_place()
1615
        repository.unlock()
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1616
        response = request.execute('')
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1617
        self.assertEqual(
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1618
            smart_req.SmartServerResponse(('LockContention',)), response)
4327.1.10 by Vincent Ladeuil
Fix 10 more lock-related test failures.
1619
        # Cleanup
1620
        repository.lock_write(repo_token)
1621
        repository.dont_leave_lock_in_place()
1622
        repository.unlock()
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1623
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.
1624
    def test_lock_write_on_readonly_transport(self):
1625
        backing = self.get_readonly_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1626
        request = smart_repo.SmartServerRepositoryLockWrite(backing)
3015.2.12 by Robert Collins
Make test_smart use specific formats as needed to exercise locked and unlocked repositories.
1627
        repository = self.make_repository('.', format='knit')
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.
1628
        response = request.execute('')
2872.5.3 by Martin Pool
Pass back LockFailed from smart server lock methods
1629
        self.assertFalse(response.is_successful())
1630
        self.assertEqual('LockFailed', response.args[0])
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.
1631
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1632
4144.3.1 by Andrew Bennetts
Add Repository.insert_stream_locked server-side implementation, plus tests for server-side _translate_error.
1633
class TestInsertStreamBase(tests.TestCaseWithMemoryTransport):
1634
1635
    def make_empty_byte_stream(self, repo):
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1636
        byte_stream = smart_repo._stream_to_byte_stream([], repo._format)
4144.3.1 by Andrew Bennetts
Add Repository.insert_stream_locked server-side implementation, plus tests for server-side _translate_error.
1637
        return ''.join(byte_stream)
1638
1639
1640
class TestSmartServerRepositoryInsertStream(TestInsertStreamBase):
1641
1642
    def test_insert_stream_empty(self):
1643
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1644
        request = smart_repo.SmartServerRepositoryInsertStream(backing)
4144.3.1 by Andrew Bennetts
Add Repository.insert_stream_locked server-side implementation, plus tests for server-side _translate_error.
1645
        repository = self.make_repository('.')
1646
        response = request.execute('', '')
1647
        self.assertEqual(None, response)
1648
        response = request.do_chunk(self.make_empty_byte_stream(repository))
1649
        self.assertEqual(None, response)
1650
        response = request.do_end()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1651
        self.assertEqual(smart_req.SmartServerResponse(('ok', )), response)
1652
4144.3.1 by Andrew Bennetts
Add Repository.insert_stream_locked server-side implementation, plus tests for server-side _translate_error.
1653
1654
class TestSmartServerRepositoryInsertStreamLocked(TestInsertStreamBase):
1655
1656
    def test_insert_stream_empty(self):
1657
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1658
        request = smart_repo.SmartServerRepositoryInsertStreamLocked(
4144.3.1 by Andrew Bennetts
Add Repository.insert_stream_locked server-side implementation, plus tests for server-side _translate_error.
1659
            backing)
1660
        repository = self.make_repository('.', format='knit')
1661
        lock_token = repository.lock_write()
1662
        response = request.execute('', '', lock_token)
1663
        self.assertEqual(None, response)
1664
        response = request.do_chunk(self.make_empty_byte_stream(repository))
1665
        self.assertEqual(None, response)
1666
        response = request.do_end()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1667
        self.assertEqual(smart_req.SmartServerResponse(('ok', )), response)
4144.3.1 by Andrew Bennetts
Add Repository.insert_stream_locked server-side implementation, plus tests for server-side _translate_error.
1668
        repository.unlock()
1669
1670
    def test_insert_stream_with_wrong_lock_token(self):
1671
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1672
        request = smart_repo.SmartServerRepositoryInsertStreamLocked(
4144.3.1 by Andrew Bennetts
Add Repository.insert_stream_locked server-side implementation, plus tests for server-side _translate_error.
1673
            backing)
1674
        repository = self.make_repository('.', format='knit')
1675
        lock_token = repository.lock_write()
1676
        self.assertRaises(
1677
            errors.TokenMismatch, request.execute, '', '', 'wrong-token')
1678
        repository.unlock()
1679
1680
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1681
class TestSmartServerRepositoryUnlock(tests.TestCaseWithMemoryTransport):
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1682
1683
    def setUp(self):
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1684
        tests.TestCaseWithMemoryTransport.setUp(self)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1685
1686
    def test_unlock_on_locked_repo(self):
1687
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1688
        request = smart_repo.SmartServerRepositoryUnlock(backing)
3015.2.12 by Robert Collins
Make test_smart use specific formats as needed to exercise locked and unlocked repositories.
1689
        repository = self.make_repository('.', format='knit')
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1690
        token = repository.lock_write()
1691
        repository.leave_lock_in_place()
1692
        repository.unlock()
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1693
        response = request.execute('', token)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1694
        self.assertEqual(
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1695
            smart_req.SmartServerResponse(('ok',)), response)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1696
        # The repository is now unlocked.  Verify that with a new repository
1697
        # object.
1698
        new_repo = repository.bzrdir.open_repository()
1699
        new_repo.lock_write()
1700
        new_repo.unlock()
1701
1702
    def test_unlock_on_unlocked_repo(self):
1703
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1704
        request = smart_repo.SmartServerRepositoryUnlock(backing)
3015.2.12 by Robert Collins
Make test_smart use specific formats as needed to exercise locked and unlocked repositories.
1705
        repository = self.make_repository('.', format='knit')
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1706
        response = request.execute('', 'some token')
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1707
        self.assertEqual(
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1708
            smart_req.SmartServerResponse(('TokenMismatch',)), response)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1709
1710
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1711
class TestSmartServerIsReadonly(tests.TestCaseWithMemoryTransport):
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.
1712
1713
    def test_is_readonly_no(self):
1714
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1715
        request = smart_req.SmartServerIsReadonly(backing)
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.
1716
        response = request.execute()
1717
        self.assertEqual(
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1718
            smart_req.SmartServerResponse(('no',)), response)
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.
1719
1720
    def test_is_readonly_yes(self):
1721
        backing = self.get_readonly_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1722
        request = smart_req.SmartServerIsReadonly(backing)
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.
1723
        response = request.execute()
1724
        self.assertEqual(
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1725
            smart_req.SmartServerResponse(('yes',)), response)
1726
1727
1728
class TestSmartServerRepositorySetMakeWorkingTrees(
1729
    tests.TestCaseWithMemoryTransport):
4017.3.4 by Robert Collins
Create a verb for Repository.set_make_working_trees.
1730
1731
    def test_set_false(self):
1732
        backing = self.get_transport()
1733
        repo = self.make_repository('.', shared=True)
1734
        repo.set_make_working_trees(True)
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1735
        request_class = smart_repo.SmartServerRepositorySetMakeWorkingTrees
4017.3.4 by Robert Collins
Create a verb for Repository.set_make_working_trees.
1736
        request = request_class(backing)
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1737
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
4017.3.4 by Robert Collins
Create a verb for Repository.set_make_working_trees.
1738
            request.execute('', 'False'))
1739
        repo = repo.bzrdir.open_repository()
1740
        self.assertFalse(repo.make_working_trees())
1741
1742
    def test_set_true(self):
1743
        backing = self.get_transport()
1744
        repo = self.make_repository('.', shared=True)
1745
        repo.set_make_working_trees(False)
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1746
        request_class = smart_repo.SmartServerRepositorySetMakeWorkingTrees
4017.3.4 by Robert Collins
Create a verb for Repository.set_make_working_trees.
1747
        request = request_class(backing)
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1748
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
4017.3.4 by Robert Collins
Create a verb for Repository.set_make_working_trees.
1749
            request.execute('', 'True'))
1750
        repo = repo.bzrdir.open_repository()
1751
        self.assertTrue(repo.make_working_trees())
1752
1753
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
1754
class TestSmartServerPackRepositoryAutopack(tests.TestCaseWithTransport):
1755
1756
    def make_repo_needing_autopacking(self, path='.'):
1757
        # Make a repo in need of autopacking.
1758
        tree = self.make_branch_and_tree('.', format='pack-0.92')
1759
        repo = tree.branch.repository
1760
        # monkey-patch the pack collection to disable autopacking
1761
        repo._pack_collection._max_pack_count = lambda count: count
1762
        for x in range(10):
1763
            tree.commit('commit %s' % x)
1764
        self.assertEqual(10, len(repo._pack_collection.names()))
1765
        del repo._pack_collection._max_pack_count
1766
        return repo
1767
1768
    def test_autopack_needed(self):
1769
        repo = self.make_repo_needing_autopacking()
4145.1.6 by Robert Collins
More test fallout, but all caught now.
1770
        repo.lock_write()
1771
        self.addCleanup(repo.unlock)
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
1772
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1773
        request = smart_packrepo.SmartServerPackRepositoryAutopack(
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
1774
            backing)
1775
        response = request.execute('')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1776
        self.assertEqual(smart_req.SmartServerResponse(('ok',)), response)
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
1777
        repo._pack_collection.reload_pack_names()
1778
        self.assertEqual(1, len(repo._pack_collection.names()))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1779
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
1780
    def test_autopack_not_needed(self):
1781
        tree = self.make_branch_and_tree('.', format='pack-0.92')
1782
        repo = tree.branch.repository
4145.1.6 by Robert Collins
More test fallout, but all caught now.
1783
        repo.lock_write()
1784
        self.addCleanup(repo.unlock)
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
1785
        for x in range(9):
1786
            tree.commit('commit %s' % x)
1787
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1788
        request = smart_packrepo.SmartServerPackRepositoryAutopack(
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
1789
            backing)
1790
        response = request.execute('')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1791
        self.assertEqual(smart_req.SmartServerResponse(('ok',)), response)
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
1792
        repo._pack_collection.reload_pack_names()
1793
        self.assertEqual(9, len(repo._pack_collection.names()))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1794
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
1795
    def test_autopack_on_nonpack_format(self):
3801.1.20 by Andrew Bennetts
Return ('ok',) rather than an error the autopack RPC is used on a non-pack repo.
1796
        """A request to autopack a non-pack repo is a no-op."""
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
1797
        repo = self.make_repository('.', format='knit')
1798
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1799
        request = smart_packrepo.SmartServerPackRepositoryAutopack(
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
1800
            backing)
1801
        response = request.execute('')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1802
        self.assertEqual(smart_req.SmartServerResponse(('ok',)), response)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1803
3801.1.4 by Andrew Bennetts
Add tests for autopack RPC.
1804
4760.2.5 by Andrew Bennetts
Add some more tests.
1805
class TestSmartServerVfsGet(tests.TestCaseWithMemoryTransport):
1806
1807
    def test_unicode_path(self):
1808
        """VFS requests expect unicode paths to be escaped."""
1809
        filename = u'foo\N{INTERROBANG}'
1810
        filename_escaped = urlutils.escape(filename)
1811
        backing = self.get_transport()
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1812
        request = vfs.GetRequest(backing)
4760.2.5 by Andrew Bennetts
Add some more tests.
1813
        backing.put_bytes_non_atomic(filename_escaped, 'contents')
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1814
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), 'contents'),
4760.2.5 by Andrew Bennetts
Add some more tests.
1815
            request.execute(filename_escaped))
1816
1817
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
1818
class TestHandlers(tests.TestCase):
1819
    """Tests for the request.request_handlers object."""
1820
3526.3.1 by Andrew Bennetts
Remove registrations of defunct HPSS verbs.
1821
    def test_all_registrations_exist(self):
1822
        """All registered request_handlers can be found."""
1823
        # If there's a typo in a register_lazy call, this loop will fail with
1824
        # an AttributeError.
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1825
        for key, item in smart_req.request_handlers.iteritems():
3526.3.1 by Andrew Bennetts
Remove registrations of defunct HPSS verbs.
1826
            pass
1827
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1828
    def assertHandlerEqual(self, verb, handler):
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1829
        self.assertEqual(smart_req.request_handlers.get(verb), handler)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1830
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
1831
    def test_registered_methods(self):
1832
        """Test that known methods are registered to the correct object."""
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1833
        self.assertHandlerEqual('Branch.get_config_file',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1834
            smart_branch.SmartServerBranchGetConfigFile)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1835
        self.assertHandlerEqual('Branch.get_parent',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1836
            smart_branch.SmartServerBranchGetParent)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1837
        self.assertHandlerEqual('Branch.get_tags_bytes',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1838
            smart_branch.SmartServerBranchGetTagsBytes)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1839
        self.assertHandlerEqual('Branch.lock_write',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1840
            smart_branch.SmartServerBranchRequestLockWrite)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1841
        self.assertHandlerEqual('Branch.last_revision_info',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1842
            smart_branch.SmartServerBranchRequestLastRevisionInfo)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1843
        self.assertHandlerEqual('Branch.revision_history',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1844
            smart_branch.SmartServerRequestRevisionHistory)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1845
        self.assertHandlerEqual('Branch.set_config_option',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1846
            smart_branch.SmartServerBranchRequestSetConfigOption)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1847
        self.assertHandlerEqual('Branch.set_last_revision',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1848
            smart_branch.SmartServerBranchRequestSetLastRevision)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1849
        self.assertHandlerEqual('Branch.set_last_revision_info',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1850
            smart_branch.SmartServerBranchRequestSetLastRevisionInfo)
4288.1.7 by Robert Collins
Add new remote server verb Branch.set_parent_location, dropping roundtrips further on push operations.
1851
        self.assertHandlerEqual('Branch.set_last_revision_ex',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1852
            smart_branch.SmartServerBranchRequestSetLastRevisionEx)
4288.1.7 by Robert Collins
Add new remote server verb Branch.set_parent_location, dropping roundtrips further on push operations.
1853
        self.assertHandlerEqual('Branch.set_parent_location',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1854
            smart_branch.SmartServerBranchRequestSetParentLocation)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1855
        self.assertHandlerEqual('Branch.unlock',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1856
            smart_branch.SmartServerBranchRequestUnlock)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1857
        self.assertHandlerEqual('BzrDir.find_repository',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1858
            smart_dir.SmartServerRequestFindRepositoryV1)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1859
        self.assertHandlerEqual('BzrDir.find_repositoryV2',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1860
            smart_dir.SmartServerRequestFindRepositoryV2)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1861
        self.assertHandlerEqual('BzrDirFormat.initialize',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1862
            smart_dir.SmartServerRequestInitializeBzrDir)
4436.1.1 by Andrew Bennetts
Rename BzrDirFormat.initialize_ex verb to BzrDirFormat.initialize_ex_1.16.
1863
        self.assertHandlerEqual('BzrDirFormat.initialize_ex_1.16',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1864
            smart_dir.SmartServerRequestBzrDirInitializeEx)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1865
        self.assertHandlerEqual('BzrDir.cloning_metadir',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1866
            smart_dir.SmartServerBzrDirRequestCloningMetaDir)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1867
        self.assertHandlerEqual('BzrDir.get_config_file',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1868
            smart_dir.SmartServerBzrDirRequestConfigFile)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1869
        self.assertHandlerEqual('BzrDir.open_branch',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1870
            smart_dir.SmartServerRequestOpenBranch)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1871
        self.assertHandlerEqual('BzrDir.open_branchV2',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1872
            smart_dir.SmartServerRequestOpenBranchV2)
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).
1873
        self.assertHandlerEqual('BzrDir.open_branchV3',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1874
            smart_dir.SmartServerRequestOpenBranchV3)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1875
        self.assertHandlerEqual('PackRepository.autopack',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1876
            smart_packrepo.SmartServerPackRepositoryAutopack)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1877
        self.assertHandlerEqual('Repository.gather_stats',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1878
            smart_repo.SmartServerRepositoryGatherStats)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1879
        self.assertHandlerEqual('Repository.get_parent_map',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1880
            smart_repo.SmartServerRepositoryGetParentMap)
4419.2.6 by Andrew Bennetts
Add tests for server-side logic, and fix the bugs exposed by those tests.
1881
        self.assertHandlerEqual('Repository.get_rev_id_for_revno',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1882
            smart_repo.SmartServerRepositoryGetRevIdForRevno)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1883
        self.assertHandlerEqual('Repository.get_revision_graph',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1884
            smart_repo.SmartServerRepositoryGetRevisionGraph)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1885
        self.assertHandlerEqual('Repository.get_stream',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1886
            smart_repo.SmartServerRepositoryGetStream)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1887
        self.assertHandlerEqual('Repository.has_revision',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1888
            smart_repo.SmartServerRequestHasRevision)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1889
        self.assertHandlerEqual('Repository.insert_stream',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1890
            smart_repo.SmartServerRepositoryInsertStream)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1891
        self.assertHandlerEqual('Repository.insert_stream_locked',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1892
            smart_repo.SmartServerRepositoryInsertStreamLocked)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1893
        self.assertHandlerEqual('Repository.is_shared',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1894
            smart_repo.SmartServerRepositoryIsShared)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1895
        self.assertHandlerEqual('Repository.lock_write',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1896
            smart_repo.SmartServerRepositoryLockWrite)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1897
        self.assertHandlerEqual('Repository.tarball',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1898
            smart_repo.SmartServerRepositoryTarball)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1899
        self.assertHandlerEqual('Repository.unlock',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1900
            smart_repo.SmartServerRepositoryUnlock)
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
1901
        self.assertHandlerEqual('Transport.is_readonly',
5010.2.8 by Vincent Ladeuil
Fix test_smart.py imports.
1902
            smart_req.SmartServerIsReadonly)