/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2018.18.1 by Martin Pool
Add stub Repository.tarball smart method
1
# Copyright (C) 2006, 2007 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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
17
"""Tests for the smart wire/domain protocol.
18
19
This module contains tests for the domain-level smart requests and responses,
3015.2.12 by Robert Collins
Make test_smart use specific formats as needed to exercise locked and unlocked repositories.
20
such as the 'Branch.lock_write' request. Many of these use specific disk
21
formats to exercise calls that only make sense for formats with specific
22
properties.
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
23
24
Tests for low-level protocol encoding are found in test_smart_transport.
25
"""
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
26
3211.5.2 by Robert Collins
Change RemoteRepository.get_parent_map to use bz2 not gzip for compression.
27
import bz2
2692.1.18 by Andrew Bennetts
Merge from bzr.dev.
28
from cStringIO import StringIO
2018.18.2 by Martin Pool
smart method Repository.tarball actually returns the tarball
29
import tarfile
30
2692.1.2 by Andrew Bennetts
Merge from bzr.dev.
31
from bzrlib import (
32
    bzrdir,
33
    errors,
34
    pack,
35
    smart,
36
    tests,
37
    urlutils,
38
    )
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
39
from bzrlib.branch import BranchReferenceFormat
2692.1.22 by Andrew Bennetts
Reinstate imports needed to run test_smart alone.
40
import bzrlib.smart.branch
41
import bzrlib.smart.bzrdir
42
import bzrlib.smart.repository
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
43
from bzrlib.smart.request import (
44
    FailedSmartServerResponse,
45
    SmartServerRequest,
46
    SmartServerResponse,
47
    SuccessfulSmartServerResponse,
48
    )
3221.3.2 by Robert Collins
* New remote method ``RemoteBzrDir.find_repositoryV2`` adding support for
49
from bzrlib.tests import (
50
    iter_suite_tests,
51
    split_suite_by_re,
52
    TestScenarioApplier,
53
    )
2692.1.3 by Andrew Bennetts
Fix imports so that tests in test_smart.py can be run alone.
54
from bzrlib.transport import chroot, get_transport
2535.3.15 by Andrew Bennetts
Add KnitVersionedFile.get_stream_as_bytes, start smart implementation of RemoteRepository.get_data_stream.
55
from bzrlib.util import bencode
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
56
57
3221.3.2 by Robert Collins
* New remote method ``RemoteBzrDir.find_repositoryV2`` adding support for
58
def load_tests(standard_tests, module, loader):
59
    """Multiply tests version and protocol consistency."""
60
    # FindRepository tests.
61
    bzrdir_mod = bzrlib.smart.bzrdir
62
    applier = TestScenarioApplier()
63
    applier.scenarios = [
64
        ("find_repository", {
65
            "_request_class":bzrdir_mod.SmartServerRequestFindRepositoryV1}),
66
        ("find_repositoryV2", {
67
            "_request_class":bzrdir_mod.SmartServerRequestFindRepositoryV2}),
68
        ]
69
    to_adapt, result = split_suite_by_re(standard_tests,
70
        "TestSmartServerRequestFindRepository")
71
    v2_only, v1_and_2 = split_suite_by_re(to_adapt,
72
        "_v2")
73
    for test in iter_suite_tests(v1_and_2):
74
        result.addTests(applier.adapt(test))
75
    del applier.scenarios[0]
76
    for test in iter_suite_tests(v2_only):
77
        result.addTests(applier.adapt(test))
78
    return result
79
80
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
81
class TestCaseWithChrootedTransport(tests.TestCaseWithTransport):
82
83
    def setUp(self):
84
        tests.TestCaseWithTransport.setUp(self)
85
        self._chroot_server = None
86
87
    def get_transport(self, relpath=None):
88
        if self._chroot_server is None:
89
            backing_transport = tests.TestCaseWithTransport.get_transport(self)
90
            self._chroot_server = chroot.ChrootServer(backing_transport)
91
            self._chroot_server.setUp()
92
            self.addCleanup(self._chroot_server.tearDown)
93
        t = get_transport(self._chroot_server.get_url())
94
        if relpath is not None:
95
            t = t.clone(relpath)
96
        return t
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
97
98
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
99
class TestCaseWithSmartMedium(tests.TestCaseWithTransport):
100
101
    def setUp(self):
102
        super(TestCaseWithSmartMedium, self).setUp()
103
        # We're allowed to set  the transport class here, so that we don't use
104
        # the default or a parameterized class, but rather use the
105
        # TestCaseWithTransport infrastructure to set up a smart server and
106
        # transport.
3245.4.28 by Andrew Bennetts
Remove another XXX, and include test ID in smart server thread names.
107
        self.transport_server = self.make_transport_server
108
109
    def make_transport_server(self):
110
        return smart.server.SmartTCPServer_for_testing('-' + self.id())
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
111
112
    def get_smart_medium(self):
113
        """Get a smart medium to use in tests."""
114
        return self.get_transport().get_smart_medium()
115
116
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
117
class TestSmartServerResponse(tests.TestCase):
118
119
    def test__eq__(self):
120
        self.assertEqual(SmartServerResponse(('ok', )),
121
            SmartServerResponse(('ok', )))
122
        self.assertEqual(SmartServerResponse(('ok', ), 'body'),
123
            SmartServerResponse(('ok', ), 'body'))
124
        self.assertNotEqual(SmartServerResponse(('ok', )),
125
            SmartServerResponse(('notok', )))
126
        self.assertNotEqual(SmartServerResponse(('ok', ), 'body'),
127
            SmartServerResponse(('ok', )))
2018.5.41 by Robert Collins
Fix SmartServerResponse.__eq__ to handle None.
128
        self.assertNotEqual(None,
129
            SmartServerResponse(('ok', )))
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
130
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
131
    def test__str__(self):
132
        """SmartServerResponses can be stringified."""
133
        self.assertEqual(
134
            "<SmartServerResponse status=OK args=('args',) body='body'>",
135
            str(SuccessfulSmartServerResponse(('args',), 'body')))
136
        self.assertEqual(
137
            "<SmartServerResponse status=ERR args=('args',) body='body'>",
138
            str(FailedSmartServerResponse(('args',), 'body')))
139
140
141
class TestSmartServerRequest(tests.TestCaseWithMemoryTransport):
142
143
    def test_translate_client_path(self):
144
        transport = self.get_transport()
145
        request = SmartServerRequest(transport, 'foo/')
146
        self.assertEqual('./', request.translate_client_path('foo/'))
147
        self.assertRaises(
148
            errors.InvalidURLJoin, request.translate_client_path, 'foo/..')
149
        self.assertRaises(
150
            errors.PathNotChild, request.translate_client_path, '/')
151
        self.assertRaises(
152
            errors.PathNotChild, request.translate_client_path, 'bar/')
153
        self.assertEqual('./baz', request.translate_client_path('foo/baz'))
154
155
    def test_transport_from_client_path(self):
156
        transport = self.get_transport()
157
        request = SmartServerRequest(transport, 'foo/')
158
        self.assertEqual(
159
            transport.base,
160
            request.transport_from_client_path('foo/').base)
161
162
163
class TestSmartServerRequestFindRepository(tests.TestCaseWithMemoryTransport):
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
164
    """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.
165
166
    def test_no_repository(self):
167
        """When there is no repository to be found, ('norepository', ) is returned."""
168
        backing = self.get_transport()
3221.3.2 by Robert Collins
* New remote method ``RemoteBzrDir.find_repositoryV2`` adding support for
169
        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.
170
        self.make_bzrdir('.')
171
        self.assertEqual(SmartServerResponse(('norepository', )),
2692.1.19 by Andrew Bennetts
Tweak for consistency suggested by John's review.
172
            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.
173
174
    def test_nonshared_repository(self):
175
        # nonshared repositorys only allow 'find' to return a handle when the 
176
        # path the repository is being searched on is the same as that that 
177
        # the repository is at.
178
        backing = self.get_transport()
3221.3.2 by Robert Collins
* New remote method ``RemoteBzrDir.find_repositoryV2`` adding support for
179
        request = self._request_class(backing)
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
180
        result = self._make_repository_and_result()
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
181
        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.
182
        self.make_bzrdir('subdir')
183
        self.assertEqual(SmartServerResponse(('norepository', )),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
184
            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.
185
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
186
    def _make_repository_and_result(self, shared=False, format=None):
187
        """Convenience function to setup a repository.
188
189
        :result: The SmartServerResponse to expect when opening it.
190
        """
191
        repo = self.make_repository('.', shared=shared, format=format)
192
        if repo.supports_rich_root():
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
193
            rich_root = 'yes'
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
194
        else:
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
195
            rich_root = 'no'
2018.5.138 by Robert Collins
Merge bzr.dev.
196
        if repo._format.supports_tree_reference:
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
197
            subtrees = 'yes'
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
198
        else:
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
199
            subtrees = 'no'
3221.3.2 by Robert Collins
* New remote method ``RemoteBzrDir.find_repositoryV2`` adding support for
200
        if (smart.bzrdir.SmartServerRequestFindRepositoryV2 ==
201
            self._request_class):
202
            # All tests so far are on formats, and for non-external
203
            # repositories.
204
            return SuccessfulSmartServerResponse(
205
                ('ok', '', rich_root, subtrees, 'no'))
206
        else:
207
            return SuccessfulSmartServerResponse(('ok', '', rich_root, subtrees))
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
208
2018.5.34 by Robert Collins
Get test_remote.BasicRemoteObjectTests.test_open_remote_branch passing by implementing a remote method BzrDir.find_repository.
209
    def test_shared_repository(self):
210
        """When there is a shared repository, we get 'ok', 'relpath-to-repo'."""
211
        backing = self.get_transport()
3221.3.2 by Robert Collins
* New remote method ``RemoteBzrDir.find_repositoryV2`` adding support for
212
        request = self._request_class(backing)
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
213
        result = self._make_repository_and_result(shared=True)
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
214
        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.
215
        self.make_bzrdir('subdir')
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
216
        result2 = SmartServerResponse(result.args[0:1] + ('..', ) + result.args[2:])
217
        self.assertEqual(result2,
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
218
            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.
219
        self.make_bzrdir('subdir/deeper')
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
220
        result3 = SmartServerResponse(result.args[0:1] + ('../..', ) + result.args[2:])
221
        self.assertEqual(result3,
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
222
            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.
223
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
224
    def test_rich_root_and_subtree_encoding(self):
225
        """Test for the format attributes for rich root and subtree support."""
226
        backing = self.get_transport()
3221.3.2 by Robert Collins
* New remote method ``RemoteBzrDir.find_repositoryV2`` adding support for
227
        request = self._request_class(backing)
2018.5.118 by Robert Collins
Fix RemoteRepositoryFormat to have appropriate rich_root_data and support_tree_reference.
228
        result = self._make_repository_and_result(format='dirstate-with-subtree')
229
        # check the test will be valid
2018.5.166 by Andrew Bennetts
Small changes in response to Aaron's review.
230
        self.assertEqual('yes', result.args[2])
231
        self.assertEqual('yes', result.args[3])
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
232
        self.assertEqual(result, request.execute(''))
233
3221.3.2 by Robert Collins
* New remote method ``RemoteBzrDir.find_repositoryV2`` adding support for
234
    def test_supports_external_lookups_no_v2(self):
235
        """Test for the supports_external_lookups attribute."""
236
        backing = self.get_transport()
237
        request = self._request_class(backing)
238
        result = self._make_repository_and_result(format='dirstate-with-subtree')
239
        # check the test will be valid
240
        self.assertEqual('no', result.args[4])
2692.1.24 by Andrew Bennetts
Merge from bzr.dev.
241
        self.assertEqual(result, request.execute(''))
242
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
243
244
class TestSmartServerRequestInitializeBzrDir(tests.TestCaseWithMemoryTransport):
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
245
246
    def test_empty_dir(self):
247
        """Initializing an empty dir should succeed and do it."""
248
        backing = self.get_transport()
249
        request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
250
        self.assertEqual(SmartServerResponse(('ok', )),
2692.1.20 by Andrew Bennetts
Tweak for consistency suggested by John's review.
251
            request.execute(''))
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
252
        made_dir = bzrdir.BzrDir.open_from_transport(backing)
253
        # no branch, tree or repository is expected with the current 
254
        # default formart.
255
        self.assertRaises(errors.NoWorkingTree, made_dir.open_workingtree)
256
        self.assertRaises(errors.NotBranchError, made_dir.open_branch)
257
        self.assertRaises(errors.NoRepositoryPresent, made_dir.open_repository)
258
259
    def test_missing_dir(self):
260
        """Initializing a missing directory should fail like the bzrdir api."""
261
        backing = self.get_transport()
262
        request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
263
        self.assertRaises(errors.NoSuchFile,
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
264
            request.execute, 'subdir')
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
265
266
    def test_initialized_dir(self):
267
        """Initializing an extant bzrdir should fail like the bzrdir api."""
268
        backing = self.get_transport()
269
        request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
270
        self.make_bzrdir('subdir')
271
        self.assertRaises(errors.FileExists,
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
272
            request.execute, 'subdir')
273
274
275
class TestSmartServerRequestOpenBranch(TestCaseWithChrootedTransport):
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
276
277
    def test_no_branch(self):
278
        """When there is no branch, ('nobranch', ) is returned."""
279
        backing = self.get_transport()
280
        request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
281
        self.make_bzrdir('.')
282
        self.assertEqual(SmartServerResponse(('nobranch', )),
2692.1.20 by Andrew Bennetts
Tweak for consistency suggested by John's review.
283
            request.execute(''))
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
284
285
    def test_branch(self):
286
        """When there is a branch, 'ok' is returned."""
287
        backing = self.get_transport()
288
        request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
289
        self.make_branch('.')
290
        self.assertEqual(SmartServerResponse(('ok', '')),
2692.1.20 by Andrew Bennetts
Tweak for consistency suggested by John's review.
291
            request.execute(''))
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
292
293
    def test_branch_reference(self):
294
        """When there is a branch reference, the reference URL is returned."""
295
        backing = self.get_transport()
296
        request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
297
        branch = self.make_branch('branch')
298
        checkout = branch.create_checkout('reference',lightweight=True)
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
299
        reference_url = BranchReferenceFormat().get_reference(checkout.bzrdir)
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
300
        self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
301
        self.assertEqual(SmartServerResponse(('ok', reference_url)),
2692.1.20 by Andrew Bennetts
Tweak for consistency suggested by John's review.
302
            request.execute('reference'))
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
303
304
305
class TestSmartServerRequestRevisionHistory(tests.TestCaseWithMemoryTransport):
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
306
307
    def test_empty(self):
308
        """For an empty branch, the body is empty."""
309
        backing = self.get_transport()
310
        request = smart.branch.SmartServerRequestRevisionHistory(backing)
311
        self.make_branch('.')
312
        self.assertEqual(SmartServerResponse(('ok', ), ''),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
313
            request.execute(''))
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
314
315
    def test_not_empty(self):
316
        """For a non-empty branch, the body is empty."""
317
        backing = self.get_transport()
318
        request = smart.branch.SmartServerRequestRevisionHistory(backing)
319
        tree = self.make_branch_and_memory_tree('.')
320
        tree.lock_write()
321
        tree.add('')
322
        r1 = tree.commit('1st commit')
2018.5.148 by Andrew Bennetts
Fix all the DeprecationWarnings in test_smart caused by unicode revision IDs.
323
        r2 = tree.commit('2nd commit', rev_id=u'\xc8'.encode('utf-8'))
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
324
        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.
325
        self.assertEqual(
326
            SmartServerResponse(('ok', ), ('\x00'.join([r1, r2]))),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
327
            request.execute(''))
328
329
330
class TestSmartServerBranchRequest(tests.TestCaseWithMemoryTransport):
2018.5.49 by Wouter van Heyst
Refactor SmartServerBranchRequest out from SmartServerRequestRevisionHistory to
331
332
    def test_no_branch(self):
333
        """When there is a bzrdir and no branch, NotBranchError is raised."""
334
        backing = self.get_transport()
335
        request = smart.branch.SmartServerBranchRequest(backing)
336
        self.make_bzrdir('.')
337
        self.assertRaises(errors.NotBranchError,
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
338
            request.execute, '')
2018.5.49 by Wouter van Heyst
Refactor SmartServerBranchRequest out from SmartServerRequestRevisionHistory to
339
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
340
    def test_branch_reference(self):
341
        """When there is a branch reference, NotBranchError is raised."""
342
        backing = self.get_transport()
2018.5.49 by Wouter van Heyst
Refactor SmartServerBranchRequest out from SmartServerRequestRevisionHistory to
343
        request = smart.branch.SmartServerBranchRequest(backing)
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
344
        branch = self.make_branch('branch')
345
        checkout = branch.create_checkout('reference',lightweight=True)
346
        self.assertRaises(errors.NotBranchError,
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
347
            request.execute, 'checkout')
348
349
350
class TestSmartServerBranchRequestLastRevisionInfo(tests.TestCaseWithMemoryTransport):
2018.5.50 by Wouter van Heyst
Add SmartServerBranchRequestLastRevisionInfo method.
351
352
    def test_empty(self):
2018.5.170 by Andrew Bennetts
Use 'null:' instead of '' to mean NULL_REVISION on the wire.
353
        """For an empty branch, the result is ('ok', '0', 'null:')."""
2018.5.50 by Wouter van Heyst
Add SmartServerBranchRequestLastRevisionInfo method.
354
        backing = self.get_transport()
355
        request = smart.branch.SmartServerBranchRequestLastRevisionInfo(backing)
356
        self.make_branch('.')
2018.5.170 by Andrew Bennetts
Use 'null:' instead of '' to mean NULL_REVISION on the wire.
357
        self.assertEqual(SmartServerResponse(('ok', '0', 'null:')),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
358
            request.execute(''))
2018.5.50 by Wouter van Heyst
Add SmartServerBranchRequestLastRevisionInfo method.
359
360
    def test_not_empty(self):
361
        """For a non-empty branch, the result is ('ok', 'revno', 'revid')."""
362
        backing = self.get_transport()
363
        request = smart.branch.SmartServerBranchRequestLastRevisionInfo(backing)
364
        tree = self.make_branch_and_memory_tree('.')
365
        tree.lock_write()
366
        tree.add('')
2018.5.148 by Andrew Bennetts
Fix all the DeprecationWarnings in test_smart caused by unicode revision IDs.
367
        rev_id_utf8 = u'\xc8'.encode('utf-8')
2018.5.50 by Wouter van Heyst
Add SmartServerBranchRequestLastRevisionInfo method.
368
        r1 = tree.commit('1st commit')
2018.5.148 by Andrew Bennetts
Fix all the DeprecationWarnings in test_smart caused by unicode revision IDs.
369
        r2 = tree.commit('2nd commit', rev_id=rev_id_utf8)
2018.5.50 by Wouter van Heyst
Add SmartServerBranchRequestLastRevisionInfo method.
370
        tree.unlock()
371
        self.assertEqual(
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
372
            SmartServerResponse(('ok', '2', rev_id_utf8)),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
373
            request.execute(''))
374
375
376
class TestSmartServerBranchRequestGetConfigFile(tests.TestCaseWithMemoryTransport):
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
377
378
    def test_default(self):
379
        """With no file, we get empty content."""
380
        backing = self.get_transport()
381
        request = smart.branch.SmartServerBranchGetConfigFile(backing)
382
        branch = self.make_branch('.')
383
        # there should be no file by default
384
        content = ''
385
        self.assertEqual(SmartServerResponse(('ok', ), content),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
386
            request.execute(''))
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
387
388
    def test_with_content(self):
389
        # SmartServerBranchGetConfigFile should return the content from
390
        # branch.control_files.get('branch.conf') for now - in the future it may
391
        # perform more complex processing. 
392
        backing = self.get_transport()
393
        request = smart.branch.SmartServerBranchGetConfigFile(backing)
394
        branch = self.make_branch('.')
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
395
        branch._transport.put_bytes('branch.conf', 'foo bar baz')
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
396
        self.assertEqual(SmartServerResponse(('ok', ), 'foo bar baz'),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
397
            request.execute(''))
398
399
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
400
class TestSmartServerBranchRequestSetLastRevision(
3441.5.23 by Andrew Bennetts
Fix test failures.
401
    tests.TestCaseWithMemoryTransport):
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
402
403
    request_class = smart.branch.SmartServerBranchRequestSetLastRevision
404
3441.5.23 by Andrew Bennetts
Fix test failures.
405
    def test_not_present_revision_id(self):
406
        backing = self.get_transport()
407
        request = self.request_class(backing)
408
        b = self.make_branch('.')
409
        branch_token = b.lock_write()
410
        repo_token = b.repository.lock_write()
411
        b.repository.unlock()
412
        try:
413
            revision_id = 'non-existent revision'
414
            self.assertEqual(
415
                SmartServerResponse(('NoSuchRevision', revision_id)),
416
                request.execute(
417
                    '', branch_token, repo_token,
418
                    revision_id))
419
        finally:
420
            b.unlock()
421
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
422
    def test_revision_id_present2(self):
423
        backing = self.get_transport()
424
        request = self.request_class(backing)
425
        tree = self.make_branch_and_memory_tree('.')
426
        tree.lock_write()
427
        tree.add('')
428
        rev_id_utf8 = u'\xc8'.encode('utf-8')
429
        r1 = tree.commit('1st commit', rev_id=rev_id_utf8)
430
        r2 = tree.commit('2nd commit')
431
        tree.unlock()
432
        tree.branch.set_revision_history([])
433
        branch_token = tree.branch.lock_write()
434
        repo_token = tree.branch.repository.lock_write()
435
        tree.branch.repository.unlock()
436
        try:
437
            self.assertEqual(
438
                SuccessfulSmartServerResponse(('ok',)),
439
                request.execute(
440
                    '', branch_token, repo_token,
441
                    rev_id_utf8))
442
            self.assertEqual([rev_id_utf8], tree.branch.revision_history())
443
        finally:
444
            tree.branch.unlock()
445
446
447
    def test_revision_id_previous(self):
448
        backing = self.get_transport()
449
        request = self.request_class(backing)
450
        tree = self.make_branch_and_memory_tree('.')
451
        tree.lock_write()
452
        tree.add('')
453
        rev_id_utf8 = u'\xc8'.encode('utf-8')
454
        r1 = tree.commit('1st commit', rev_id=rev_id_utf8)
455
        r2 = tree.commit('2nd commit')
456
        tree.unlock()
457
        branch_token = tree.branch.lock_write()
458
        repo_token = tree.branch.repository.lock_write()
459
        tree.branch.repository.unlock()
460
        try:
461
            self.assertEqual(
462
                SuccessfulSmartServerResponse(('ok',)),
463
                request.execute(
464
                    '', branch_token, repo_token,
465
                    rev_id_utf8))
466
            self.assertEqual([rev_id_utf8], tree.branch.revision_history())
467
        finally:
468
            tree.branch.unlock()
469
470
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.
471
class TestSmartServerBranchRequestSetLastRevisionEx(
3441.5.23 by Andrew Bennetts
Fix test failures.
472
    tests.TestCaseWithMemoryTransport):
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
473
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.
474
    request_class = smart.branch.SmartServerBranchRequestSetLastRevisionEx
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
475
476
    def test_empty(self):
477
        backing = self.get_transport()
478
        request = self.request_class(backing)
479
        b = self.make_branch('.')
480
        branch_token = b.lock_write()
481
        repo_token = b.repository.lock_write()
482
        b.repository.unlock()
483
        try:
3441.5.23 by Andrew Bennetts
Fix test failures.
484
            self.assertEqual(SuccessfulSmartServerResponse(('ok', 0, 'null:')),
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
485
                request.execute(
3441.5.23 by Andrew Bennetts
Fix test failures.
486
                    '', branch_token, repo_token, 'null:', 0, 0))
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
487
        finally:
488
            b.unlock()
489
3441.5.23 by Andrew Bennetts
Fix test failures.
490
    def test_not_present_revision_id(self):
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
491
        backing = self.get_transport()
492
        request = self.request_class(backing)
493
        b = self.make_branch('.')
494
        branch_token = b.lock_write()
495
        repo_token = b.repository.lock_write()
496
        b.repository.unlock()
497
        try:
3441.5.23 by Andrew Bennetts
Fix test failures.
498
            revision_id = 'non-existent revision'
499
            self.assertEqual(
500
                SmartServerResponse(('NoSuchRevision', revision_id)),
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
501
                request.execute(
3441.5.23 by Andrew Bennetts
Fix test failures.
502
                    '', branch_token, repo_token, revision_id, 0, 0))
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
503
        finally:
504
            b.unlock()
505
    def test_revision_id_present2(self):
506
        backing = self.get_transport()
507
        request = self.request_class(backing)
508
        tree = self.make_branch_and_memory_tree('.')
509
        tree.lock_write()
510
        tree.add('')
511
        rev_id_utf8 = u'\xc8'.encode('utf-8')
512
        r1 = tree.commit('1st commit', rev_id=rev_id_utf8)
513
        r2 = tree.commit('2nd commit')
514
        tree.unlock()
515
        tree.branch.set_revision_history([])
516
        branch_token = tree.branch.lock_write()
517
        repo_token = tree.branch.repository.lock_write()
518
        tree.branch.repository.unlock()
519
        try:
520
            self.assertEqual(
3441.5.23 by Andrew Bennetts
Fix test failures.
521
                SuccessfulSmartServerResponse(('ok', 1, rev_id_utf8)),
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
522
                request.execute(
3441.5.23 by Andrew Bennetts
Fix test failures.
523
                    '', branch_token, repo_token, rev_id_utf8, 0, 0))
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
524
            self.assertEqual([rev_id_utf8], tree.branch.revision_history())
525
        finally:
526
            tree.branch.unlock()
527
528
    def test_branch_diverged(self):
529
        backing = self.get_transport()
530
        request = self.request_class(backing)
531
        tree = self.make_branch_and_memory_tree('.')
532
        tree.lock_write()
533
        tree.add('')
534
        r1 = tree.commit('1st commit')
535
        revno_1, revid_1 = tree.branch.last_revision_info()
536
        r2 = tree.commit('2nd commit', rev_id='child-1')
537
        # Undo the second commit
538
        tree.branch.set_last_revision_info(revno_1, revid_1)
539
        tree.set_parent_ids([revid_1])
540
        # Make a new second commit, child-2.  child-2 has diverged from
541
        # child-1.
542
        new_r2 = tree.commit('2nd commit', rev_id='child-2')
543
        tree.unlock()
544
        branch_token = tree.branch.lock_write()
545
        repo_token = tree.branch.repository.lock_write()
546
        tree.branch.repository.unlock()
547
        try:
548
            self.assertEqual(
3441.5.23 by Andrew Bennetts
Fix test failures.
549
                FailedSmartServerResponse(('Diverged',)),
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
550
                request.execute(
3441.5.23 by Andrew Bennetts
Fix test failures.
551
                    '', branch_token, repo_token, 'child-1', 0, 0))
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
552
            self.assertEqual('child-2', tree.branch.last_revision())
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
553
        finally:
554
            tree.branch.unlock()
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
555
556
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
557
class TestSmartServerBranchRequestSetLastRevisionInfo(tests.TestCaseWithTransport):
558
3297.4.3 by Andrew Bennetts
Add more tests, handle NoSuchRevision in case the remote branch's format can raise it.
559
    def lock_branch(self, branch):
560
        branch_token = branch.lock_write()
561
        repo_token = branch.repository.lock_write()
562
        branch.repository.unlock()
563
        self.addCleanup(branch.unlock)
564
        return branch_token, repo_token
565
566
    def make_locked_branch(self, format=None):
567
        branch = self.make_branch('.', format=format)
568
        branch_token, repo_token = self.lock_branch(branch)
569
        return branch, branch_token, repo_token
570
571
    def test_empty(self):
572
        """An empty branch can have its last revision set to 'null:'."""
573
        b, branch_token, repo_token = self.make_locked_branch()
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
574
        backing = self.get_transport()
3297.4.3 by Andrew Bennetts
Add more tests, handle NoSuchRevision in case the remote branch's format can raise it.
575
        request = smart.branch.SmartServerBranchRequestSetLastRevisionInfo(
576
            backing)
577
        response = request.execute('', branch_token, repo_token, '0', 'null:')
578
        self.assertEqual(SmartServerResponse(('ok',)), response)
579
580
    def assertBranchLastRevisionInfo(self, expected_info, branch_relpath):
581
        branch = bzrdir.BzrDir.open(branch_relpath).open_branch()
582
        self.assertEqual(expected_info, branch.last_revision_info())
583
584
    def test_branch_revision_info_is_updated(self):
585
        """This method really does update the branch last revision info."""
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
586
        tree = self.make_branch_and_memory_tree('.')
587
        tree.lock_write()
588
        tree.add('')
3297.4.3 by Andrew Bennetts
Add more tests, handle NoSuchRevision in case the remote branch's format can raise it.
589
        tree.commit('First commit', rev_id='revision-1')
590
        tree.commit('Second commit', rev_id='revision-2')
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
591
        tree.unlock()
3297.4.3 by Andrew Bennetts
Add more tests, handle NoSuchRevision in case the remote branch's format can raise it.
592
        branch = tree.branch
593
594
        branch_token, repo_token = self.lock_branch(branch)
595
        backing = self.get_transport()
596
        request = smart.branch.SmartServerBranchRequestSetLastRevisionInfo(
597
            backing)
598
        self.assertBranchLastRevisionInfo((2, 'revision-2'), '.')
599
        response = request.execute(
600
            '', branch_token, repo_token, '1', 'revision-1')
601
        self.assertEqual(SmartServerResponse(('ok',)), response)
602
        self.assertBranchLastRevisionInfo((1, 'revision-1'), '.')
603
604
    def test_not_present_revid(self):
605
        """Some branch formats will check that the revision is present in the
606
        repository.  When that check fails, a NoSuchRevision error is returned
607
        to the client.
608
        """
609
        # Make a knit format branch, because that format checks the values
610
        # given to set_last_revision_info.
611
        b, branch_token, repo_token = self.make_locked_branch(format='knit')
612
        backing = self.get_transport()
613
        request = smart.branch.SmartServerBranchRequestSetLastRevisionInfo(
614
            backing)
615
        response = request.execute(
616
            '', branch_token, repo_token, '1', 'not-present')
617
        self.assertEqual(
618
            SmartServerResponse(('NoSuchRevision', 'not-present')), response)
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
619
620
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
621
class TestSmartServerBranchRequestLockWrite(tests.TestCaseWithMemoryTransport):
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
622
623
    def setUp(self):
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
624
        tests.TestCaseWithMemoryTransport.setUp(self)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
625
626
    def test_lock_write_on_unlocked_branch(self):
627
        backing = self.get_transport()
628
        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.
629
        branch = self.make_branch('.', format='knit')
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
630
        repository = branch.repository
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
631
        response = request.execute('')
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
632
        branch_nonce = branch.control_files._lock.peek().get('nonce')
633
        repository_nonce = repository.control_files._lock.peek().get('nonce')
634
        self.assertEqual(
635
            SmartServerResponse(('ok', branch_nonce, repository_nonce)),
636
            response)
637
        # The branch (and associated repository) is now locked.  Verify that
638
        # with a new branch object.
639
        new_branch = repository.bzrdir.open_branch()
640
        self.assertRaises(errors.LockContention, new_branch.lock_write)
641
642
    def test_lock_write_on_locked_branch(self):
643
        backing = self.get_transport()
644
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
645
        branch = self.make_branch('.')
646
        branch.lock_write()
647
        branch.leave_lock_in_place()
648
        branch.unlock()
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
649
        response = request.execute('')
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
650
        self.assertEqual(
651
            SmartServerResponse(('LockContention',)), response)
652
653
    def test_lock_write_with_tokens_on_locked_branch(self):
654
        backing = self.get_transport()
655
        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.
656
        branch = self.make_branch('.', format='knit')
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
657
        branch_token = branch.lock_write()
658
        repo_token = branch.repository.lock_write()
659
        branch.repository.unlock()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
660
        branch.leave_lock_in_place()
661
        branch.repository.leave_lock_in_place()
662
        branch.unlock()
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
663
        response = request.execute('',
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
664
                                   branch_token, repo_token)
665
        self.assertEqual(
666
            SmartServerResponse(('ok', branch_token, repo_token)), response)
667
668
    def test_lock_write_with_mismatched_tokens_on_locked_branch(self):
669
        backing = self.get_transport()
670
        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.
671
        branch = self.make_branch('.', format='knit')
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
672
        branch_token = branch.lock_write()
673
        repo_token = branch.repository.lock_write()
674
        branch.repository.unlock()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
675
        branch.leave_lock_in_place()
676
        branch.repository.leave_lock_in_place()
677
        branch.unlock()
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
678
        response = request.execute('',
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
679
                                   branch_token+'xxx', repo_token)
680
        self.assertEqual(
681
            SmartServerResponse(('TokenMismatch',)), response)
682
683
    def test_lock_write_on_locked_repo(self):
684
        backing = self.get_transport()
685
        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.
686
        branch = self.make_branch('.', format='knit')
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
687
        branch.repository.lock_write()
688
        branch.repository.leave_lock_in_place()
689
        branch.repository.unlock()
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
690
        response = request.execute('')
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
691
        self.assertEqual(
692
            SmartServerResponse(('LockContention',)), response)
693
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.
694
    def test_lock_write_on_readonly_transport(self):
695
        backing = self.get_readonly_transport()
696
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
697
        branch = self.make_branch('.')
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
698
        root = self.get_transport().clone('/')
699
        path = urlutils.relative_url(root.base, self.get_transport().base)
700
        response = request.execute(path)
2872.5.3 by Martin Pool
Pass back LockFailed from smart server lock methods
701
        error_name, lock_str, why_str = response.args
702
        self.assertFalse(response.is_successful())
703
        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.
704
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
705
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
706
class TestSmartServerBranchRequestUnlock(tests.TestCaseWithMemoryTransport):
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
707
708
    def setUp(self):
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
709
        tests.TestCaseWithMemoryTransport.setUp(self)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
710
711
    def test_unlock_on_locked_branch_and_repo(self):
712
        backing = self.get_transport()
713
        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.
714
        branch = self.make_branch('.', format='knit')
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
715
        # Lock the branch
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
716
        branch_token = branch.lock_write()
717
        repo_token = branch.repository.lock_write()
718
        branch.repository.unlock()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
719
        # Unlock the branch (and repo) object, leaving the physical locks
720
        # in place.
721
        branch.leave_lock_in_place()
722
        branch.repository.leave_lock_in_place()
723
        branch.unlock()
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
724
        response = request.execute('',
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
725
                                   branch_token, repo_token)
726
        self.assertEqual(
727
            SmartServerResponse(('ok',)), response)
728
        # The branch is now unlocked.  Verify that with a new branch
729
        # object.
730
        new_branch = branch.bzrdir.open_branch()
731
        new_branch.lock_write()
732
        new_branch.unlock()
733
734
    def test_unlock_on_unlocked_branch_unlocked_repo(self):
735
        backing = self.get_transport()
736
        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.
737
        branch = self.make_branch('.', format='knit')
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
738
        response = request.execute(
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
739
            '', 'branch token', 'repo token')
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
740
        self.assertEqual(
741
            SmartServerResponse(('TokenMismatch',)), response)
742
743
    def test_unlock_on_unlocked_branch_locked_repo(self):
744
        backing = self.get_transport()
745
        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.
746
        branch = self.make_branch('.', format='knit')
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
747
        # Lock the repository.
748
        repo_token = branch.repository.lock_write()
749
        branch.repository.leave_lock_in_place()
750
        branch.repository.unlock()
751
        # Issue branch lock_write request on the unlocked branch (with locked
752
        # repo).
753
        response = request.execute(
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
754
            '', 'branch token', repo_token)
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
755
        self.assertEqual(
756
            SmartServerResponse(('TokenMismatch',)), response)
757
758
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
759
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).
760
761
    def test_no_repository(self):
762
        """Raise NoRepositoryPresent when there is a bzrdir and no repo."""
763
        # we test this using a shared repository above the named path,
764
        # thus checking the right search logic is used - that is, that
765
        # its the exact path being looked at and the server is not
766
        # searching.
767
        backing = self.get_transport()
2018.5.58 by Wouter van Heyst
Small test fixes to reflect naming and documentation
768
        request = smart.repository.SmartServerRepositoryRequest(backing)
2018.5.56 by Robert Collins
Factor out code we expect to be common in SmartServerRequestHasRevision to SmartServerRepositoryRequest (Robert Collins, Vincent Ladeuil).
769
        self.make_repository('.', shared=True)
770
        self.make_bzrdir('subdir')
771
        self.assertRaises(errors.NoRepositoryPresent,
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
772
            request.execute, 'subdir')
773
774
3441.5.4 by Andrew Bennetts
Fix test failures, and add some tests for the remote graph heads RPC.
775
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.
776
3211.5.3 by Robert Collins
Adjust size of batch and change gzip comments to bzip2.
777
    def test_trivial_bzipped(self):
778
        # 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.
779
        backing = self.get_transport()
780
        request = smart.repository.SmartServerRepositoryGetParentMap(backing)
781
        tree = self.make_branch_and_memory_tree('.')
782
783
        self.assertEqual(None,
2692.1.24 by Andrew Bennetts
Merge from bzr.dev.
784
            request.execute('', 'missing-id'))
3211.5.3 by Robert Collins
Adjust size of batch and change gzip comments to bzip2.
785
        # Note that it returns a body (of '' 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.
786
        self.assertEqual(
3211.5.2 by Robert Collins
Change RemoteRepository.get_parent_map to use bz2 not gzip for compression.
787
            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.
788
            request.do_body('\n\n0\n'))
789
790
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
791
class TestSmartServerRepositoryGetRevisionGraph(tests.TestCaseWithMemoryTransport):
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
792
793
    def test_none_argument(self):
794
        backing = self.get_transport()
795
        request = smart.repository.SmartServerRepositoryGetRevisionGraph(backing)
796
        tree = self.make_branch_and_memory_tree('.')
797
        tree.lock_write()
798
        tree.add('')
799
        r1 = tree.commit('1st commit')
2018.5.148 by Andrew Bennetts
Fix all the DeprecationWarnings in test_smart caused by unicode revision IDs.
800
        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)
801
        tree.unlock()
802
803
        # the lines of revision_id->revision_parent_list has no guaranteed
804
        # order coming out of a dict, so sort both our test and response
805
        lines = sorted([' '.join([r2, r1]), r1])
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
806
        response = request.execute('', '')
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
807
        response.body = '\n'.join(sorted(response.body.split('\n')))
808
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
809
        self.assertEqual(
810
            SmartServerResponse(('ok', ), '\n'.join(lines)), response)
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
811
812
    def test_specific_revision_argument(self):
813
        backing = self.get_transport()
814
        request = smart.repository.SmartServerRepositoryGetRevisionGraph(backing)
815
        tree = self.make_branch_and_memory_tree('.')
816
        tree.lock_write()
817
        tree.add('')
2018.5.148 by Andrew Bennetts
Fix all the DeprecationWarnings in test_smart caused by unicode revision IDs.
818
        rev_id_utf8 = u'\xc9'.encode('utf-8')
819
        r1 = tree.commit('1st commit', rev_id=rev_id_utf8)
820
        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)
821
        tree.unlock()
822
2018.5.148 by Andrew Bennetts
Fix all the DeprecationWarnings in test_smart caused by unicode revision IDs.
823
        self.assertEqual(SmartServerResponse(('ok', ), rev_id_utf8),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
824
            request.execute('', rev_id_utf8))
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
825
    
826
    def test_no_such_revision(self):
827
        backing = self.get_transport()
828
        request = smart.repository.SmartServerRepositoryGetRevisionGraph(backing)
829
        tree = self.make_branch_and_memory_tree('.')
830
        tree.lock_write()
831
        tree.add('')
832
        r1 = tree.commit('1st commit')
833
        tree.unlock()
834
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
835
        # Note that it still returns body (of zero bytes).
836
        self.assertEqual(
837
            SmartServerResponse(('nosuchrevision', 'missingrevision', ), ''),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
838
            request.execute('', 'missingrevision'))
839
840
841
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).
842
843
    def test_missing_revision(self):
844
        """For a missing revision, ('no', ) is returned."""
845
        backing = self.get_transport()
846
        request = smart.repository.SmartServerRequestHasRevision(backing)
847
        self.make_repository('.')
848
        self.assertEqual(SmartServerResponse(('no', )),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
849
            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).
850
851
    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.
852
        """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).
853
        backing = self.get_transport()
854
        request = smart.repository.SmartServerRequestHasRevision(backing)
855
        tree = self.make_branch_and_memory_tree('.')
856
        tree.lock_write()
857
        tree.add('')
2018.5.148 by Andrew Bennetts
Fix all the DeprecationWarnings in test_smart caused by unicode revision IDs.
858
        rev_id_utf8 = u'\xc8abc'.encode('utf-8')
859
        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).
860
        tree.unlock()
2018.5.148 by Andrew Bennetts
Fix all the DeprecationWarnings in test_smart caused by unicode revision IDs.
861
        self.assertTrue(tree.branch.repository.has_revision(rev_id_utf8))
2018.5.158 by Andrew Bennetts
Return 'yes'/'no' rather than 'ok'/'no' from the Repository.has_revision smart command.
862
        self.assertEqual(SmartServerResponse(('yes', )),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
863
            request.execute('', rev_id_utf8))
864
865
866
class TestSmartServerRepositoryGatherStats(tests.TestCaseWithMemoryTransport):
2018.10.2 by v.ladeuil+lp at free
gather_stats server side and request registration
867
868
    def test_empty_revid(self):
869
        """With an empty revid, we get only size an number and revisions"""
870
        backing = self.get_transport()
871
        request = smart.repository.SmartServerRepositoryGatherStats(backing)
872
        repository = self.make_repository('.')
873
        stats = repository.gather_stats()
874
        size = stats['size']
875
        expected_body = 'revisions: 0\nsize: %d\n' % size
876
        self.assertEqual(SmartServerResponse(('ok', ), expected_body),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
877
                         request.execute('', '', 'no'))
2018.10.2 by v.ladeuil+lp at free
gather_stats server side and request registration
878
879
    def test_revid_with_committers(self):
880
        """For a revid we get more infos."""
881
        backing = self.get_transport()
2018.5.148 by Andrew Bennetts
Fix all the DeprecationWarnings in test_smart caused by unicode revision IDs.
882
        rev_id_utf8 = u'\xc8abc'.encode('utf-8')
2018.10.2 by v.ladeuil+lp at free
gather_stats server side and request registration
883
        request = smart.repository.SmartServerRepositoryGatherStats(backing)
884
        tree = self.make_branch_and_memory_tree('.')
885
        tree.lock_write()
886
        tree.add('')
887
        # Let's build a predictable result
888
        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.
889
        tree.commit('a commit', timestamp=654321.4, timezone=0,
890
                    rev_id=rev_id_utf8)
2018.10.2 by v.ladeuil+lp at free
gather_stats server side and request registration
891
        tree.unlock()
892
893
        stats = tree.branch.repository.gather_stats()
894
        size = stats['size']
895
        expected_body = ('firstrev: 123456.200 3600\n'
896
                         'latestrev: 654321.400 0\n'
897
                         'revisions: 2\n'
898
                         'size: %d\n' % size)
899
        self.assertEqual(SmartServerResponse(('ok', ), expected_body),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
900
                         request.execute('',
2018.5.148 by Andrew Bennetts
Fix all the DeprecationWarnings in test_smart caused by unicode revision IDs.
901
                                         rev_id_utf8, 'no'))
2018.10.2 by v.ladeuil+lp at free
gather_stats server side and request registration
902
903
    def test_not_empty_repository_with_committers(self):
904
        """For a revid and requesting committers we get the whole thing."""
905
        backing = self.get_transport()
2018.5.148 by Andrew Bennetts
Fix all the DeprecationWarnings in test_smart caused by unicode revision IDs.
906
        rev_id_utf8 = u'\xc8abc'.encode('utf-8')
2018.10.2 by v.ladeuil+lp at free
gather_stats server side and request registration
907
        request = smart.repository.SmartServerRepositoryGatherStats(backing)
908
        tree = self.make_branch_and_memory_tree('.')
909
        tree.lock_write()
910
        tree.add('')
911
        # Let's build a predictable result
912
        tree.commit('a commit', timestamp=123456.2, timezone=3600,
913
                    committer='foo')
914
        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.
915
                    committer='bar', rev_id=rev_id_utf8)
2018.10.2 by v.ladeuil+lp at free
gather_stats server side and request registration
916
        tree.unlock()
917
        stats = tree.branch.repository.gather_stats()
918
919
        size = stats['size']
920
        expected_body = ('committers: 2\n'
921
                         'firstrev: 123456.200 3600\n'
922
                         'latestrev: 654321.400 0\n'
923
                         'revisions: 2\n'
924
                         'size: %d\n' % size)
925
        self.assertEqual(SmartServerResponse(('ok', ), expected_body),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
926
                         request.execute('',
2018.5.148 by Andrew Bennetts
Fix all the DeprecationWarnings in test_smart caused by unicode revision IDs.
927
                                         rev_id_utf8, 'yes'))
2018.10.2 by v.ladeuil+lp at free
gather_stats server side and request registration
928
929
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
930
class TestSmartServerRepositoryIsShared(tests.TestCaseWithMemoryTransport):
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
931
932
    def test_is_shared(self):
933
        """For a shared repository, ('yes', ) is returned."""
934
        backing = self.get_transport()
935
        request = smart.repository.SmartServerRepositoryIsShared(backing)
936
        self.make_repository('.', shared=True)
937
        self.assertEqual(SmartServerResponse(('yes', )),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
938
            request.execute('', ))
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
939
940
    def test_is_not_shared(self):
2018.5.58 by Wouter van Heyst
Small test fixes to reflect naming and documentation
941
        """For a shared repository, ('no', ) is returned."""
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
942
        backing = self.get_transport()
943
        request = smart.repository.SmartServerRepositoryIsShared(backing)
944
        self.make_repository('.', shared=False)
945
        self.assertEqual(SmartServerResponse(('no', )),
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
946
            request.execute('', ))
947
948
949
class TestSmartServerRepositoryLockWrite(tests.TestCaseWithMemoryTransport):
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
950
951
    def setUp(self):
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
952
        tests.TestCaseWithMemoryTransport.setUp(self)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
953
954
    def test_lock_write_on_unlocked_repo(self):
955
        backing = self.get_transport()
956
        request = smart.repository.SmartServerRepositoryLockWrite(backing)
3015.2.12 by Robert Collins
Make test_smart use specific formats as needed to exercise locked and unlocked repositories.
957
        repository = self.make_repository('.', format='knit')
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
958
        response = request.execute('')
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
959
        nonce = repository.control_files._lock.peek().get('nonce')
960
        self.assertEqual(SmartServerResponse(('ok', nonce)), response)
961
        # The repository is now locked.  Verify that with a new repository
962
        # object.
963
        new_repo = repository.bzrdir.open_repository()
964
        self.assertRaises(errors.LockContention, new_repo.lock_write)
965
966
    def test_lock_write_on_locked_repo(self):
967
        backing = self.get_transport()
968
        request = smart.repository.SmartServerRepositoryLockWrite(backing)
3015.2.12 by Robert Collins
Make test_smart use specific formats as needed to exercise locked and unlocked repositories.
969
        repository = self.make_repository('.', format='knit')
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
970
        repository.lock_write()
971
        repository.leave_lock_in_place()
972
        repository.unlock()
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
973
        response = request.execute('')
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
974
        self.assertEqual(
975
            SmartServerResponse(('LockContention',)), response)
976
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.
977
    def test_lock_write_on_readonly_transport(self):
978
        backing = self.get_readonly_transport()
979
        request = smart.repository.SmartServerRepositoryLockWrite(backing)
3015.2.12 by Robert Collins
Make test_smart use specific formats as needed to exercise locked and unlocked repositories.
980
        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.
981
        response = request.execute('')
2872.5.3 by Martin Pool
Pass back LockFailed from smart server lock methods
982
        self.assertFalse(response.is_successful())
983
        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.
984
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
985
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
986
class TestSmartServerRepositoryUnlock(tests.TestCaseWithMemoryTransport):
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
987
988
    def setUp(self):
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
989
        tests.TestCaseWithMemoryTransport.setUp(self)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
990
991
    def test_unlock_on_locked_repo(self):
992
        backing = self.get_transport()
993
        request = smart.repository.SmartServerRepositoryUnlock(backing)
3015.2.12 by Robert Collins
Make test_smart use specific formats as needed to exercise locked and unlocked repositories.
994
        repository = self.make_repository('.', format='knit')
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
995
        token = repository.lock_write()
996
        repository.leave_lock_in_place()
997
        repository.unlock()
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
998
        response = request.execute('', token)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
999
        self.assertEqual(
1000
            SmartServerResponse(('ok',)), response)
1001
        # The repository is now unlocked.  Verify that with a new repository
1002
        # object.
1003
        new_repo = repository.bzrdir.open_repository()
1004
        new_repo.lock_write()
1005
        new_repo.unlock()
1006
1007
    def test_unlock_on_unlocked_repo(self):
1008
        backing = self.get_transport()
1009
        request = smart.repository.SmartServerRepositoryUnlock(backing)
3015.2.12 by Robert Collins
Make test_smart use specific formats as needed to exercise locked and unlocked repositories.
1010
        repository = self.make_repository('.', format='knit')
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1011
        response = request.execute('', 'some token')
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1012
        self.assertEqual(
1013
            SmartServerResponse(('TokenMismatch',)), response)
1014
1015
2018.18.1 by Martin Pool
Add stub Repository.tarball smart method
1016
class TestSmartServerRepositoryTarball(tests.TestCaseWithTransport):
1017
1018
    def test_repository_tarball(self):
1019
        backing = self.get_transport()
1020
        request = smart.repository.SmartServerRepositoryTarball(backing)
1021
        repository = self.make_repository('.')
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
1022
        # make some extraneous junk in the repository directory which should
1023
        # not be copied
1024
        self.build_tree(['.bzr/repository/extra-junk'])
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1025
        response = request.execute('', 'bz2')
2018.18.1 by Martin Pool
Add stub Repository.tarball smart method
1026
        self.assertEqual(('ok',), response.args)
1027
        # body should be a tbz2
2018.18.2 by Martin Pool
smart method Repository.tarball actually returns the tarball
1028
        body_file = StringIO(response.body)
1029
        body_tar = tarfile.open('body_tar.tbz2', fileobj=body_file,
2018.18.25 by Martin Pool
Repository.tarball fixes for python2.4
1030
            mode='r|bz2')
2018.18.2 by Martin Pool
smart method Repository.tarball actually returns the tarball
1031
        # let's make sure there are some key repository components inside it.
1032
        # the tarfile returns directories with trailing slashes...
1033
        names = set([n.rstrip('/') for n in body_tar.getnames()])
2018.18.11 by Martin Pool
merge hpss changes
1034
        self.assertTrue('.bzr/repository/lock' in names)
1035
        self.assertTrue('.bzr/repository/format' in names)
1036
        self.assertTrue('.bzr/repository/extra-junk' not in names,
2018.18.9 by Martin Pool
remote Repository.tarball builds a temporary directory and tars that
1037
            "extraneous file present in tar file")
2018.18.1 by Martin Pool
Add stub Repository.tarball smart method
1038
1039
2692.1.2 by Andrew Bennetts
Merge from bzr.dev.
1040
class TestSmartServerRepositoryStreamKnitData(tests.TestCaseWithMemoryTransport):
2535.3.14 by Andrew Bennetts
Move serialising repo data stream to bytes into smart protocol.
1041
1042
    def test_fetch_revisions(self):
1043
        backing = self.get_transport()
2535.3.49 by Andrew Bennetts
Rename 'Repository.fetch_revisions' smart request to 'Repository.stream_knit_data_for_revisions'.
1044
        request = smart.repository.SmartServerRepositoryStreamKnitDataForRevisions(backing)
2535.3.14 by Andrew Bennetts
Move serialising repo data stream to bytes into smart protocol.
1045
        tree = self.make_branch_and_memory_tree('.')
1046
        tree.lock_write()
1047
        tree.add('')
1048
        rev_id1_utf8 = u'\xc8'.encode('utf-8')
1049
        rev_id2_utf8 = u'\xc9'.encode('utf-8')
1050
        r1 = tree.commit('1st commit', rev_id=rev_id1_utf8)
1051
        r1 = tree.commit('2nd commit', rev_id=rev_id2_utf8)
1052
        tree.unlock()
1053
2692.1.2 by Andrew Bennetts
Merge from bzr.dev.
1054
        response = request.execute('', rev_id2_utf8)
2535.3.14 by Andrew Bennetts
Move serialising repo data stream to bytes into smart protocol.
1055
        self.assertEqual(('ok',), response.args)
2535.4.29 by Andrew Bennetts
Add a new smart method, Repository.stream_revisions_chunked, rather than changing the behaviour of an existing method.
1056
        unpacker = pack.ContainerReader(StringIO(response.body))
1057
        names = []
1058
        for [name], read_bytes in unpacker.iter_records():
1059
            names.append(name)
1060
            bytes = read_bytes(None)
1061
            # The bytes should be a valid bencoded string.
1062
            bencode.bdecode(bytes)
1063
            # XXX: assert that the bencoded knit records have the right
1064
            # contents?
1065
        
1066
    def test_no_such_revision_error(self):
1067
        backing = self.get_transport()
1068
        request = smart.repository.SmartServerRepositoryStreamKnitDataForRevisions(backing)
1069
        repo = self.make_repository('.')
1070
        rev_id1_utf8 = u'\xc8'.encode('utf-8')
2692.1.2 by Andrew Bennetts
Merge from bzr.dev.
1071
        response = request.execute('', rev_id1_utf8)
2535.4.29 by Andrew Bennetts
Add a new smart method, Repository.stream_revisions_chunked, rather than changing the behaviour of an existing method.
1072
        self.assertEqual(
1073
            SmartServerResponse(('NoSuchRevision', rev_id1_utf8)),
1074
            response)
1075
1076
2692.1.18 by Andrew Bennetts
Merge from bzr.dev.
1077
class TestSmartServerRepositoryStreamRevisionsChunked(tests.TestCaseWithMemoryTransport):
2535.4.29 by Andrew Bennetts
Add a new smart method, Repository.stream_revisions_chunked, rather than changing the behaviour of an existing method.
1078
1079
    def test_fetch_revisions(self):
1080
        backing = self.get_transport()
1081
        request = smart.repository.SmartServerRepositoryStreamRevisionsChunked(
1082
            backing)
1083
        tree = self.make_branch_and_memory_tree('.')
1084
        tree.lock_write()
1085
        tree.add('')
1086
        rev_id1_utf8 = u'\xc8'.encode('utf-8')
1087
        rev_id2_utf8 = u'\xc9'.encode('utf-8')
3184.1.10 by Robert Collins
Change the smart server verb for Repository.stream_revisions_chunked to use SearchResults as the request mechanism for downloads.
1088
        tree.commit('1st commit', rev_id=rev_id1_utf8)
1089
        tree.commit('2nd commit', rev_id=rev_id2_utf8)
2535.4.29 by Andrew Bennetts
Add a new smart method, Repository.stream_revisions_chunked, rather than changing the behaviour of an existing method.
1090
        tree.unlock()
1091
2692.1.24 by Andrew Bennetts
Merge from bzr.dev.
1092
        response = request.execute('')
3184.1.10 by Robert Collins
Change the smart server verb for Repository.stream_revisions_chunked to use SearchResults as the request mechanism for downloads.
1093
        self.assertEqual(None, response)
1094
        response = request.do_body("%s\n%s\n1" % (rev_id2_utf8, rev_id1_utf8))
2535.4.29 by Andrew Bennetts
Add a new smart method, Repository.stream_revisions_chunked, rather than changing the behaviour of an existing method.
1095
        self.assertEqual(('ok',), response.args)
2535.4.22 by Andrew Bennetts
Merge from streamable-containers.
1096
        parser = pack.ContainerPushParser()
2535.3.14 by Andrew Bennetts
Move serialising repo data stream to bytes into smart protocol.
1097
        names = []
2535.4.22 by Andrew Bennetts
Merge from streamable-containers.
1098
        for stream_bytes in response.body_stream:
1099
            parser.accept_bytes(stream_bytes)
1100
            for [name], record_bytes in parser.read_pending_records():
1101
                names.append(name)
1102
                # The bytes should be a valid bencoded string.
1103
                bencode.bdecode(record_bytes)
1104
                # XXX: assert that the bencoded knit records have the right
1105
                # contents?
2535.3.14 by Andrew Bennetts
Move serialising repo data stream to bytes into smart protocol.
1106
        
2535.3.40 by Andrew Bennetts
Tidy up more XXXs.
1107
    def test_no_such_revision_error(self):
1108
        backing = self.get_transport()
2535.4.29 by Andrew Bennetts
Add a new smart method, Repository.stream_revisions_chunked, rather than changing the behaviour of an existing method.
1109
        request = smart.repository.SmartServerRepositoryStreamRevisionsChunked(
1110
            backing)
2535.3.40 by Andrew Bennetts
Tidy up more XXXs.
1111
        repo = self.make_repository('.')
1112
        rev_id1_utf8 = u'\xc8'.encode('utf-8')
2692.1.24 by Andrew Bennetts
Merge from bzr.dev.
1113
        response = request.execute('')
3184.1.10 by Robert Collins
Change the smart server verb for Repository.stream_revisions_chunked to use SearchResults as the request mechanism for downloads.
1114
        self.assertEqual(None, response)
1115
        response = request.do_body("%s\n\n1" % (rev_id1_utf8,))
1116
        self.assertEqual(
1117
            FailedSmartServerResponse(('NoSuchRevision', )),
1118
            response)
1119
2535.3.12 by Andrew Bennetts
Add a first cut of a get_data_stream method to Repository.
1120
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
1121
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.
1122
1123
    def test_is_readonly_no(self):
1124
        backing = self.get_transport()
1125
        request = smart.request.SmartServerIsReadonly(backing)
1126
        response = request.execute()
1127
        self.assertEqual(
1128
            SmartServerResponse(('no',)), response)
1129
1130
    def test_is_readonly_yes(self):
1131
        backing = self.get_readonly_transport()
1132
        request = smart.request.SmartServerIsReadonly(backing)
1133
        response = request.execute()
1134
        self.assertEqual(
1135
            SmartServerResponse(('yes',)), response)
1136
1137
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
1138
class TestHandlers(tests.TestCase):
1139
    """Tests for the request.request_handlers object."""
1140
1141
    def test_registered_methods(self):
1142
        """Test that known methods are registered to the correct object."""
1143
        self.assertEqual(
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
1144
            smart.request.request_handlers.get('Branch.get_config_file'),
1145
            smart.branch.SmartServerBranchGetConfigFile)
1146
        self.assertEqual(
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1147
            smart.request.request_handlers.get('Branch.lock_write'),
1148
            smart.branch.SmartServerBranchRequestLockWrite)
1149
        self.assertEqual(
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
1150
            smart.request.request_handlers.get('Branch.last_revision_info'),
1151
            smart.branch.SmartServerBranchRequestLastRevisionInfo)
1152
        self.assertEqual(
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
1153
            smart.request.request_handlers.get('Branch.revision_history'),
1154
            smart.branch.SmartServerRequestRevisionHistory)
1155
        self.assertEqual(
2018.5.77 by Wouter van Heyst
Fix typo in request_handlers registration of Branch.set_last_revision, and test that registration
1156
            smart.request.request_handlers.get('Branch.set_last_revision'),
1157
            smart.branch.SmartServerBranchRequestSetLastRevision)
1158
        self.assertEqual(
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
1159
            smart.request.request_handlers.get('Branch.set_last_revision_info'),
1160
            smart.branch.SmartServerBranchRequestSetLastRevisionInfo)
1161
        self.assertEqual(
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
1162
            smart.request.request_handlers.get('Branch.unlock'),
1163
            smart.branch.SmartServerBranchRequestUnlock)
1164
        self.assertEqual(
2018.5.34 by Robert Collins
Get test_remote.BasicRemoteObjectTests.test_open_remote_branch passing by implementing a remote method BzrDir.find_repository.
1165
            smart.request.request_handlers.get('BzrDir.find_repository'),
3221.3.2 by Robert Collins
* New remote method ``RemoteBzrDir.find_repositoryV2`` adding support for
1166
            smart.bzrdir.SmartServerRequestFindRepositoryV1)
1167
        self.assertEqual(
1168
            smart.request.request_handlers.get('BzrDir.find_repositoryV2'),
1169
            smart.bzrdir.SmartServerRequestFindRepositoryV2)
2018.5.34 by Robert Collins
Get test_remote.BasicRemoteObjectTests.test_open_remote_branch passing by implementing a remote method BzrDir.find_repository.
1170
        self.assertEqual(
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
1171
            smart.request.request_handlers.get('BzrDirFormat.initialize'),
1172
            smart.bzrdir.SmartServerRequestInitializeBzrDir)
1173
        self.assertEqual(
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
1174
            smart.request.request_handlers.get('BzrDir.open_branch'),
1175
            smart.bzrdir.SmartServerRequestOpenBranch)
2018.5.40 by Robert Collins
Implement a remote Repository.has_revision method.
1176
        self.assertEqual(
2018.10.2 by v.ladeuil+lp at free
gather_stats server side and request registration
1177
            smart.request.request_handlers.get('Repository.gather_stats'),
1178
            smart.repository.SmartServerRepositoryGatherStats)
1179
        self.assertEqual(
3172.5.6 by Robert Collins
Create new smart server verb Repository.get_parent_map.
1180
            smart.request.request_handlers.get('Repository.get_parent_map'),
1181
            smart.repository.SmartServerRepositoryGetParentMap)
1182
        self.assertEqual(
2535.3.69 by Andrew Bennetts
Add check for Repository.stream_knit_data_for_revisions to TestHandlers.test_registered_methods.
1183
            smart.request.request_handlers.get(
1184
                'Repository.get_revision_graph'),
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
1185
            smart.repository.SmartServerRepositoryGetRevisionGraph)
1186
        self.assertEqual(
2018.5.40 by Robert Collins
Implement a remote Repository.has_revision method.
1187
            smart.request.request_handlers.get('Repository.has_revision'),
1188
            smart.repository.SmartServerRequestHasRevision)
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
1189
        self.assertEqual(
1190
            smart.request.request_handlers.get('Repository.is_shared'),
1191
            smart.repository.SmartServerRepositoryIsShared)
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1192
        self.assertEqual(
1193
            smart.request.request_handlers.get('Repository.lock_write'),
1194
            smart.repository.SmartServerRepositoryLockWrite)
1195
        self.assertEqual(
2535.3.69 by Andrew Bennetts
Add check for Repository.stream_knit_data_for_revisions to TestHandlers.test_registered_methods.
1196
            smart.request.request_handlers.get('Repository.tarball'),
1197
            smart.repository.SmartServerRepositoryTarball)
1198
        self.assertEqual(
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
1199
            smart.request.request_handlers.get('Repository.unlock'),
1200
            smart.repository.SmartServerRepositoryUnlock)
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.
1201
        self.assertEqual(
1202
            smart.request.request_handlers.get('Transport.is_readonly'),
1203
            smart.request.SmartServerIsReadonly)