~bzr-pqm/bzr/bzr.dev

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