~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-07-19 16:09:34 UTC
  • mfrom: (2520.4.135 bzr.mpbundle)
  • Revision ID: pqm@pqm.ubuntu.com-20070719160934-d51fyijw69oto88p
Add new bundle and merge-directive formats

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006-2011 Canonical Ltd
 
1
# Copyright (C) 2006, 2007 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
 
 
17
 
"""Tests for the smart wire/domain protocol.
18
 
 
19
 
This module contains tests for the domain-level smart requests and responses,
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.
23
 
 
24
 
Tests for low-level protocol encoding are found in test_smart_transport.
25
 
"""
26
 
 
27
 
import bz2
28
 
import zlib
29
 
 
30
 
from bzrlib import (
31
 
    branch as _mod_branch,
32
 
    bzrdir,
33
 
    errors,
34
 
    gpg,
35
 
    inventory_delta,
36
 
    tests,
37
 
    transport,
38
 
    urlutils,
39
 
    versionedfile,
40
 
    )
41
 
from bzrlib.smart import (
42
 
    branch as smart_branch,
43
 
    bzrdir as smart_dir,
44
 
    repository as smart_repo,
45
 
    packrepository as smart_packrepo,
46
 
    request as smart_req,
47
 
    server,
48
 
    vfs,
49
 
    )
50
 
from bzrlib.testament import Testament
51
 
from bzrlib.tests import test_server
52
 
from bzrlib.transport import (
53
 
    chroot,
54
 
    memory,
55
 
    )
56
 
 
57
 
 
58
 
def load_tests(standard_tests, module, loader):
59
 
    """Multiply tests version and protocol consistency."""
60
 
    # FindRepository tests.
61
 
    scenarios = [
62
 
        ("find_repository", {
63
 
            "_request_class": smart_dir.SmartServerRequestFindRepositoryV1}),
64
 
        ("find_repositoryV2", {
65
 
            "_request_class": smart_dir.SmartServerRequestFindRepositoryV2}),
66
 
        ("find_repositoryV3", {
67
 
            "_request_class": smart_dir.SmartServerRequestFindRepositoryV3}),
68
 
        ]
69
 
    to_adapt, result = tests.split_suite_by_re(standard_tests,
70
 
        "TestSmartServerRequestFindRepository")
71
 
    v2_only, v1_and_2 = tests.split_suite_by_re(to_adapt,
72
 
        "_v2")
73
 
    tests.multiply_tests(v1_and_2, scenarios, result)
74
 
    # The first scenario is only applicable to v1 protocols, it is deleted
75
 
    # since.
76
 
    tests.multiply_tests(v2_only, scenarios[1:], result)
77
 
    return result
78
 
 
79
 
 
80
 
class TestCaseWithChrootedTransport(tests.TestCaseWithTransport):
81
 
 
82
 
    def setUp(self):
83
 
        self.vfs_transport_factory = memory.MemoryServer
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.start_server(self._chroot_server)
92
 
        t = transport.get_transport_from_url(self._chroot_server.get_url())
93
 
        if relpath is not None:
94
 
            t = t.clone(relpath)
95
 
        return t
96
 
 
97
 
 
98
 
class TestCaseWithSmartMedium(tests.TestCaseWithMemoryTransport):
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
"""Tests for the smart wire/domain protococl."""
 
18
 
 
19
from StringIO import StringIO
 
20
import tempfile
 
21
import tarfile
 
22
 
 
23
from bzrlib import bzrdir, errors, smart, tests
 
24
from bzrlib.smart.request import SmartServerResponse
 
25
import bzrlib.smart.bzrdir
 
26
import bzrlib.smart.branch
 
27
import bzrlib.smart.repository
 
28
 
 
29
 
 
30
class TestCaseWithSmartMedium(tests.TestCaseWithTransport):
99
31
 
100
32
    def setUp(self):
101
33
        super(TestCaseWithSmartMedium, self).setUp()
103
35
        # the default or a parameterized class, but rather use the
104
36
        # TestCaseWithTransport infrastructure to set up a smart server and
105
37
        # transport.
106
 
        self.overrideAttr(self, "transport_server", self.make_transport_server)
107
 
 
108
 
    def make_transport_server(self):
109
 
        return test_server.SmartTCPServer_for_testing('-' + self.id())
 
38
        self.transport_server = smart.server.SmartTCPServer_for_testing
110
39
 
111
40
    def get_smart_medium(self):
112
41
        """Get a smart medium to use in tests."""
113
42
        return self.get_transport().get_smart_medium()
114
43
 
115
44
 
116
 
class TestByteStreamToStream(tests.TestCase):
117
 
 
118
 
    def test_repeated_substreams_same_kind_are_one_stream(self):
119
 
        # Make a stream - an iterable of bytestrings.
120
 
        stream = [('text', [versionedfile.FulltextContentFactory(('k1',), None,
121
 
            None, 'foo')]),('text', [
122
 
            versionedfile.FulltextContentFactory(('k2',), None, None, 'bar')])]
123
 
        fmt = bzrdir.format_registry.get('pack-0.92')().repository_format
124
 
        bytes = smart_repo._stream_to_byte_stream(stream, fmt)
125
 
        streams = []
126
 
        # Iterate the resulting iterable; checking that we get only one stream
127
 
        # out.
128
 
        fmt, stream = smart_repo._byte_stream_to_stream(bytes)
129
 
        for kind, substream in stream:
130
 
            streams.append((kind, list(substream)))
131
 
        self.assertLength(1, streams)
132
 
        self.assertLength(2, streams[0][1])
133
 
 
134
 
 
135
45
class TestSmartServerResponse(tests.TestCase):
136
46
 
137
47
    def test__eq__(self):
138
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', )),
139
 
            smart_req.SmartServerResponse(('ok', )))
140
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), 'body'),
141
 
            smart_req.SmartServerResponse(('ok', ), 'body'))
142
 
        self.assertNotEqual(smart_req.SmartServerResponse(('ok', )),
143
 
            smart_req.SmartServerResponse(('notok', )))
144
 
        self.assertNotEqual(smart_req.SmartServerResponse(('ok', ), 'body'),
145
 
            smart_req.SmartServerResponse(('ok', )))
 
48
        self.assertEqual(SmartServerResponse(('ok', )),
 
49
            SmartServerResponse(('ok', )))
 
50
        self.assertEqual(SmartServerResponse(('ok', ), 'body'),
 
51
            SmartServerResponse(('ok', ), 'body'))
 
52
        self.assertNotEqual(SmartServerResponse(('ok', )),
 
53
            SmartServerResponse(('notok', )))
 
54
        self.assertNotEqual(SmartServerResponse(('ok', ), 'body'),
 
55
            SmartServerResponse(('ok', )))
146
56
        self.assertNotEqual(None,
147
 
            smart_req.SmartServerResponse(('ok', )))
148
 
 
149
 
    def test__str__(self):
150
 
        """SmartServerResponses can be stringified."""
151
 
        self.assertEqual(
152
 
            "<SuccessfulSmartServerResponse args=('args',) body='body'>",
153
 
            str(smart_req.SuccessfulSmartServerResponse(('args',), 'body')))
154
 
        self.assertEqual(
155
 
            "<FailedSmartServerResponse args=('args',) body='body'>",
156
 
            str(smart_req.FailedSmartServerResponse(('args',), 'body')))
157
 
 
158
 
 
159
 
class TestSmartServerRequest(tests.TestCaseWithMemoryTransport):
160
 
 
161
 
    def test_translate_client_path(self):
162
 
        transport = self.get_transport()
163
 
        request = smart_req.SmartServerRequest(transport, 'foo/')
164
 
        self.assertEqual('./', request.translate_client_path('foo/'))
165
 
        self.assertRaises(
166
 
            errors.InvalidURLJoin, request.translate_client_path, 'foo/..')
167
 
        self.assertRaises(
168
 
            errors.PathNotChild, request.translate_client_path, '/')
169
 
        self.assertRaises(
170
 
            errors.PathNotChild, request.translate_client_path, 'bar/')
171
 
        self.assertEqual('./baz', request.translate_client_path('foo/baz'))
172
 
        e_acute = u'\N{LATIN SMALL LETTER E WITH ACUTE}'.encode('utf-8')
173
 
        self.assertEqual('./' + urlutils.escape(e_acute),
174
 
                         request.translate_client_path('foo/' + e_acute))
175
 
 
176
 
    def test_translate_client_path_vfs(self):
177
 
        """VfsRequests receive escaped paths rather than raw UTF-8."""
178
 
        transport = self.get_transport()
179
 
        request = vfs.VfsRequest(transport, 'foo/')
180
 
        e_acute = u'\N{LATIN SMALL LETTER E WITH ACUTE}'.encode('utf-8')
181
 
        escaped = urlutils.escape('foo/' + e_acute)
182
 
        self.assertEqual('./' + urlutils.escape(e_acute),
183
 
                         request.translate_client_path(escaped))
184
 
 
185
 
    def test_transport_from_client_path(self):
186
 
        transport = self.get_transport()
187
 
        request = smart_req.SmartServerRequest(transport, 'foo/')
188
 
        self.assertEqual(
189
 
            transport.base,
190
 
            request.transport_from_client_path('foo/').base)
191
 
 
192
 
 
193
 
class TestSmartServerBzrDirRequestCloningMetaDir(
194
 
    tests.TestCaseWithMemoryTransport):
195
 
    """Tests for BzrDir.cloning_metadir."""
196
 
 
197
 
    def test_cloning_metadir(self):
198
 
        """When there is a bzrdir present, the call succeeds."""
199
 
        backing = self.get_transport()
200
 
        dir = self.make_bzrdir('.')
201
 
        local_result = dir.cloning_metadir()
202
 
        request_class = smart_dir.SmartServerBzrDirRequestCloningMetaDir
203
 
        request = request_class(backing)
204
 
        expected = smart_req.SuccessfulSmartServerResponse(
205
 
            (local_result.network_name(),
206
 
            local_result.repository_format.network_name(),
207
 
            ('branch', local_result.get_branch_format().network_name())))
208
 
        self.assertEqual(expected, request.execute('', 'False'))
209
 
 
210
 
    def test_cloning_metadir_reference(self):
211
 
        """The request fails when bzrdir contains a branch reference."""
212
 
        backing = self.get_transport()
213
 
        referenced_branch = self.make_branch('referenced')
214
 
        dir = self.make_bzrdir('.')
215
 
        local_result = dir.cloning_metadir()
216
 
        reference = _mod_branch.BranchReferenceFormat().initialize(
217
 
            dir, target_branch=referenced_branch)
218
 
        reference_url = _mod_branch.BranchReferenceFormat().get_reference(dir)
219
 
        # The server shouldn't try to follow the branch reference, so it's fine
220
 
        # if the referenced branch isn't reachable.
221
 
        backing.rename('referenced', 'moved')
222
 
        request_class = smart_dir.SmartServerBzrDirRequestCloningMetaDir
223
 
        request = request_class(backing)
224
 
        expected = smart_req.FailedSmartServerResponse(('BranchReference',))
225
 
        self.assertEqual(expected, request.execute('', 'False'))
226
 
 
227
 
 
228
 
class TestSmartServerBzrDirRequestCloningMetaDir(
229
 
    tests.TestCaseWithMemoryTransport):
230
 
    """Tests for BzrDir.checkout_metadir."""
231
 
 
232
 
    def test_checkout_metadir(self):
233
 
        backing = self.get_transport()
234
 
        request = smart_dir.SmartServerBzrDirRequestCheckoutMetaDir(
235
 
            backing)
236
 
        branch = self.make_branch('.', format='2a')
237
 
        response = request.execute('')
238
 
        self.assertEqual(
239
 
            smart_req.SmartServerResponse(
240
 
                ('Bazaar-NG meta directory, format 1\n',
241
 
                 'Bazaar repository format 2a (needs bzr 1.16 or later)\n',
242
 
                 'Bazaar Branch Format 7 (needs bzr 1.6)\n')),
243
 
            response)
244
 
 
245
 
 
246
 
class TestSmartServerBzrDirRequestDestroyBranch(
247
 
    tests.TestCaseWithMemoryTransport):
248
 
    """Tests for BzrDir.destroy_branch."""
249
 
 
250
 
    def test_destroy_branch_default(self):
251
 
        """The default branch can be removed."""
252
 
        backing = self.get_transport()
253
 
        dir = self.make_branch('.').bzrdir
254
 
        request_class = smart_dir.SmartServerBzrDirRequestDestroyBranch
255
 
        request = request_class(backing)
256
 
        expected = smart_req.SuccessfulSmartServerResponse(('ok',))
257
 
        self.assertEqual(expected, request.execute('', None))
258
 
 
259
 
    def test_destroy_branch_named(self):
260
 
        """A named branch can be removed."""
261
 
        backing = self.get_transport()
262
 
        dir = self.make_repository('.', format="development-colo").bzrdir
263
 
        dir.create_branch(name="branchname")
264
 
        request_class = smart_dir.SmartServerBzrDirRequestDestroyBranch
265
 
        request = request_class(backing)
266
 
        expected = smart_req.SuccessfulSmartServerResponse(('ok',))
267
 
        self.assertEqual(expected, request.execute('', "branchname"))
268
 
 
269
 
    def test_destroy_branch_missing(self):
270
 
        """An error is raised if the branch didn't exist."""
271
 
        backing = self.get_transport()
272
 
        dir = self.make_bzrdir('.', format="development-colo")
273
 
        request_class = smart_dir.SmartServerBzrDirRequestDestroyBranch
274
 
        request = request_class(backing)
275
 
        expected = smart_req.FailedSmartServerResponse(('nobranch',), None)
276
 
        self.assertEqual(expected, request.execute('', "branchname"))
277
 
 
278
 
 
279
 
class TestSmartServerBzrDirRequestHasWorkingTree(
280
 
    tests.TestCaseWithTransport):
281
 
    """Tests for BzrDir.has_workingtree."""
282
 
 
283
 
    def test_has_workingtree_yes(self):
284
 
        """A working tree is present."""
285
 
        backing = self.get_transport()
286
 
        dir = self.make_branch_and_tree('.').bzrdir
287
 
        request_class = smart_dir.SmartServerBzrDirRequestHasWorkingTree
288
 
        request = request_class(backing)
289
 
        expected = smart_req.SuccessfulSmartServerResponse(('yes',))
290
 
        self.assertEqual(expected, request.execute(''))
291
 
 
292
 
    def test_has_workingtree_no(self):
293
 
        """A working tree is missing."""
294
 
        backing = self.get_transport()
295
 
        dir = self.make_bzrdir('.')
296
 
        request_class = smart_dir.SmartServerBzrDirRequestHasWorkingTree
297
 
        request = request_class(backing)
298
 
        expected = smart_req.SuccessfulSmartServerResponse(('no',))
299
 
        self.assertEqual(expected, request.execute(''))
300
 
 
301
 
 
302
 
class TestSmartServerBzrDirRequestDestroyRepository(
303
 
    tests.TestCaseWithMemoryTransport):
304
 
    """Tests for BzrDir.destroy_repository."""
305
 
 
306
 
    def test_destroy_repository_default(self):
307
 
        """The repository can be removed."""
308
 
        backing = self.get_transport()
309
 
        dir = self.make_repository('.').bzrdir
310
 
        request_class = smart_dir.SmartServerBzrDirRequestDestroyRepository
311
 
        request = request_class(backing)
312
 
        expected = smart_req.SuccessfulSmartServerResponse(('ok',))
313
 
        self.assertEqual(expected, request.execute(''))
314
 
 
315
 
    def test_destroy_repository_missing(self):
316
 
        """An error is raised if the repository didn't exist."""
317
 
        backing = self.get_transport()
318
 
        dir = self.make_bzrdir('.')
319
 
        request_class = smart_dir.SmartServerBzrDirRequestDestroyRepository
320
 
        request = request_class(backing)
321
 
        expected = smart_req.FailedSmartServerResponse(
322
 
            ('norepository',), None)
323
 
        self.assertEqual(expected, request.execute(''))
324
 
 
325
 
 
326
 
class TestSmartServerRequestCreateRepository(tests.TestCaseWithMemoryTransport):
327
 
    """Tests for BzrDir.create_repository."""
328
 
 
329
 
    def test_makes_repository(self):
330
 
        """When there is a bzrdir present, the call succeeds."""
331
 
        backing = self.get_transport()
332
 
        self.make_bzrdir('.')
333
 
        request_class = smart_dir.SmartServerRequestCreateRepository
334
 
        request = request_class(backing)
335
 
        reference_bzrdir_format = bzrdir.format_registry.get('pack-0.92')()
336
 
        reference_format = reference_bzrdir_format.repository_format
337
 
        network_name = reference_format.network_name()
338
 
        expected = smart_req.SuccessfulSmartServerResponse(
339
 
            ('ok', 'no', 'no', 'no', network_name))
340
 
        self.assertEqual(expected, request.execute('', network_name, 'True'))
341
 
 
342
 
 
343
 
class TestSmartServerRequestFindRepository(tests.TestCaseWithMemoryTransport):
 
57
            SmartServerResponse(('ok', )))
 
58
 
 
59
 
 
60
class TestSmartServerRequestFindRepository(tests.TestCaseWithTransport):
344
61
    """Tests for BzrDir.find_repository."""
345
62
 
346
63
    def test_no_repository(self):
347
64
        """When there is no repository to be found, ('norepository', ) is returned."""
348
65
        backing = self.get_transport()
349
 
        request = self._request_class(backing)
 
66
        request = smart.bzrdir.SmartServerRequestFindRepository(backing)
350
67
        self.make_bzrdir('.')
351
 
        self.assertEqual(smart_req.SmartServerResponse(('norepository', )),
352
 
            request.execute(''))
 
68
        self.assertEqual(SmartServerResponse(('norepository', )),
 
69
            request.execute(backing.local_abspath('')))
353
70
 
354
71
    def test_nonshared_repository(self):
355
 
        # nonshared repositorys only allow 'find' to return a handle when the
356
 
        # path the repository is being searched on is the same as that that
 
72
        # nonshared repositorys only allow 'find' to return a handle when the 
 
73
        # path the repository is being searched on is the same as that that 
357
74
        # the repository is at.
358
75
        backing = self.get_transport()
359
 
        request = self._request_class(backing)
 
76
        request = smart.bzrdir.SmartServerRequestFindRepository(backing)
360
77
        result = self._make_repository_and_result()
361
 
        self.assertEqual(result, request.execute(''))
 
78
        self.assertEqual(result, request.execute(backing.local_abspath('')))
362
79
        self.make_bzrdir('subdir')
363
 
        self.assertEqual(smart_req.SmartServerResponse(('norepository', )),
364
 
            request.execute('subdir'))
 
80
        self.assertEqual(SmartServerResponse(('norepository', )),
 
81
            request.execute(backing.local_abspath('subdir')))
365
82
 
366
83
    def _make_repository_and_result(self, shared=False, format=None):
367
84
        """Convenience function to setup a repository.
377
94
            subtrees = 'yes'
378
95
        else:
379
96
            subtrees = 'no'
380
 
        if repo._format.supports_external_lookups:
381
 
            external = 'yes'
382
 
        else:
383
 
            external = 'no'
384
 
        if (smart_dir.SmartServerRequestFindRepositoryV3 ==
385
 
            self._request_class):
386
 
            return smart_req.SuccessfulSmartServerResponse(
387
 
                ('ok', '', rich_root, subtrees, external,
388
 
                 repo._format.network_name()))
389
 
        elif (smart_dir.SmartServerRequestFindRepositoryV2 ==
390
 
            self._request_class):
391
 
            # All tests so far are on formats, and for non-external
392
 
            # repositories.
393
 
            return smart_req.SuccessfulSmartServerResponse(
394
 
                ('ok', '', rich_root, subtrees, external))
395
 
        else:
396
 
            return smart_req.SuccessfulSmartServerResponse(
397
 
                ('ok', '', rich_root, subtrees))
 
97
        return SmartServerResponse(('ok', '', rich_root, subtrees))
398
98
 
399
99
    def test_shared_repository(self):
400
100
        """When there is a shared repository, we get 'ok', 'relpath-to-repo'."""
401
101
        backing = self.get_transport()
402
 
        request = self._request_class(backing)
 
102
        request = smart.bzrdir.SmartServerRequestFindRepository(backing)
403
103
        result = self._make_repository_and_result(shared=True)
404
 
        self.assertEqual(result, request.execute(''))
 
104
        self.assertEqual(result, request.execute(backing.local_abspath('')))
405
105
        self.make_bzrdir('subdir')
406
 
        result2 = smart_req.SmartServerResponse(
407
 
            result.args[0:1] + ('..', ) + result.args[2:])
 
106
        result2 = SmartServerResponse(result.args[0:1] + ('..', ) + result.args[2:])
408
107
        self.assertEqual(result2,
409
 
            request.execute('subdir'))
 
108
            request.execute(backing.local_abspath('subdir')))
410
109
        self.make_bzrdir('subdir/deeper')
411
 
        result3 = smart_req.SmartServerResponse(
412
 
            result.args[0:1] + ('../..', ) + result.args[2:])
 
110
        result3 = SmartServerResponse(result.args[0:1] + ('../..', ) + result.args[2:])
413
111
        self.assertEqual(result3,
414
 
            request.execute('subdir/deeper'))
 
112
            request.execute(backing.local_abspath('subdir/deeper')))
415
113
 
416
114
    def test_rich_root_and_subtree_encoding(self):
417
115
        """Test for the format attributes for rich root and subtree support."""
418
116
        backing = self.get_transport()
419
 
        request = self._request_class(backing)
420
 
        result = self._make_repository_and_result(
421
 
            format='dirstate-with-subtree')
 
117
        request = smart.bzrdir.SmartServerRequestFindRepository(backing)
 
118
        result = self._make_repository_and_result(format='dirstate-with-subtree')
422
119
        # check the test will be valid
423
120
        self.assertEqual('yes', result.args[2])
424
121
        self.assertEqual('yes', result.args[3])
425
 
        self.assertEqual(result, request.execute(''))
426
 
 
427
 
    def test_supports_external_lookups_no_v2(self):
428
 
        """Test for the supports_external_lookups attribute."""
429
 
        backing = self.get_transport()
430
 
        request = self._request_class(backing)
431
 
        result = self._make_repository_and_result(
432
 
            format='dirstate-with-subtree')
433
 
        # check the test will be valid
434
 
        self.assertEqual('no', result.args[4])
435
 
        self.assertEqual(result, request.execute(''))
436
 
 
437
 
 
438
 
class TestSmartServerBzrDirRequestGetConfigFile(
439
 
    tests.TestCaseWithMemoryTransport):
440
 
    """Tests for BzrDir.get_config_file."""
441
 
 
442
 
    def test_present(self):
443
 
        backing = self.get_transport()
444
 
        dir = self.make_bzrdir('.')
445
 
        dir.get_config().set_default_stack_on("/")
446
 
        local_result = dir._get_config()._get_config_file().read()
447
 
        request_class = smart_dir.SmartServerBzrDirRequestConfigFile
448
 
        request = request_class(backing)
449
 
        expected = smart_req.SuccessfulSmartServerResponse((), local_result)
450
 
        self.assertEqual(expected, request.execute(''))
451
 
 
452
 
    def test_missing(self):
453
 
        backing = self.get_transport()
454
 
        dir = self.make_bzrdir('.')
455
 
        request_class = smart_dir.SmartServerBzrDirRequestConfigFile
456
 
        request = request_class(backing)
457
 
        expected = smart_req.SuccessfulSmartServerResponse((), '')
458
 
        self.assertEqual(expected, request.execute(''))
459
 
 
460
 
 
461
 
class TestSmartServerRequestInitializeBzrDir(tests.TestCaseWithMemoryTransport):
 
122
        self.assertEqual(result, request.execute(backing.local_abspath('')))
 
123
 
 
124
 
 
125
class TestSmartServerRequestInitializeBzrDir(tests.TestCaseWithTransport):
462
126
 
463
127
    def test_empty_dir(self):
464
128
        """Initializing an empty dir should succeed and do it."""
465
129
        backing = self.get_transport()
466
 
        request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
467
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', )),
468
 
            request.execute(''))
 
130
        request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
 
131
        self.assertEqual(SmartServerResponse(('ok', )),
 
132
            request.execute(backing.local_abspath('.')))
469
133
        made_dir = bzrdir.BzrDir.open_from_transport(backing)
470
 
        # no branch, tree or repository is expected with the current
 
134
        # no branch, tree or repository is expected with the current 
471
135
        # default formart.
472
136
        self.assertRaises(errors.NoWorkingTree, made_dir.open_workingtree)
473
137
        self.assertRaises(errors.NotBranchError, made_dir.open_branch)
476
140
    def test_missing_dir(self):
477
141
        """Initializing a missing directory should fail like the bzrdir api."""
478
142
        backing = self.get_transport()
479
 
        request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
 
143
        request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
480
144
        self.assertRaises(errors.NoSuchFile,
481
 
            request.execute, 'subdir')
 
145
            request.execute, backing.local_abspath('subdir'))
482
146
 
483
147
    def test_initialized_dir(self):
484
148
        """Initializing an extant bzrdir should fail like the bzrdir api."""
485
149
        backing = self.get_transport()
486
 
        request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
 
150
        request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
487
151
        self.make_bzrdir('subdir')
488
152
        self.assertRaises(errors.FileExists,
489
 
            request.execute, 'subdir')
490
 
 
491
 
 
492
 
class TestSmartServerRequestBzrDirInitializeEx(
493
 
    tests.TestCaseWithMemoryTransport):
494
 
    """Basic tests for BzrDir.initialize_ex_1.16 in the smart server.
495
 
 
496
 
    The main unit tests in test_bzrdir exercise the API comprehensively.
497
 
    """
498
 
 
499
 
    def test_empty_dir(self):
500
 
        """Initializing an empty dir should succeed and do it."""
501
 
        backing = self.get_transport()
502
 
        name = self.make_bzrdir('reference')._format.network_name()
503
 
        request = smart_dir.SmartServerRequestBzrDirInitializeEx(backing)
504
 
        self.assertEqual(
505
 
            smart_req.SmartServerResponse(('', '', '', '', '', '', name,
506
 
                                           'False', '', '', '')),
507
 
            request.execute(name, '', 'True', 'False', 'False', '', '', '', '',
508
 
                            'False'))
509
 
        made_dir = bzrdir.BzrDir.open_from_transport(backing)
510
 
        # no branch, tree or repository is expected with the current
511
 
        # default format.
512
 
        self.assertRaises(errors.NoWorkingTree, made_dir.open_workingtree)
513
 
        self.assertRaises(errors.NotBranchError, made_dir.open_branch)
514
 
        self.assertRaises(errors.NoRepositoryPresent, made_dir.open_repository)
515
 
 
516
 
    def test_missing_dir(self):
517
 
        """Initializing a missing directory should fail like the bzrdir api."""
518
 
        backing = self.get_transport()
519
 
        name = self.make_bzrdir('reference')._format.network_name()
520
 
        request = smart_dir.SmartServerRequestBzrDirInitializeEx(backing)
521
 
        self.assertRaises(errors.NoSuchFile, request.execute, name,
522
 
            'subdir/dir', 'False', 'False', 'False', '', '', '', '', 'False')
523
 
 
524
 
    def test_initialized_dir(self):
525
 
        """Initializing an extant directory should fail like the bzrdir api."""
526
 
        backing = self.get_transport()
527
 
        name = self.make_bzrdir('reference')._format.network_name()
528
 
        request = smart_dir.SmartServerRequestBzrDirInitializeEx(backing)
529
 
        self.make_bzrdir('subdir')
530
 
        self.assertRaises(errors.FileExists, request.execute, name, 'subdir',
531
 
            'False', 'False', 'False', '', '', '', '', 'False')
532
 
 
533
 
 
534
 
class TestSmartServerRequestOpenBzrDir(tests.TestCaseWithMemoryTransport):
535
 
 
536
 
    def test_no_directory(self):
537
 
        backing = self.get_transport()
538
 
        request = smart_dir.SmartServerRequestOpenBzrDir(backing)
539
 
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
540
 
            request.execute('does-not-exist'))
541
 
 
542
 
    def test_empty_directory(self):
543
 
        backing = self.get_transport()
544
 
        backing.mkdir('empty')
545
 
        request = smart_dir.SmartServerRequestOpenBzrDir(backing)
546
 
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
547
 
            request.execute('empty'))
548
 
 
549
 
    def test_outside_root_client_path(self):
550
 
        backing = self.get_transport()
551
 
        request = smart_dir.SmartServerRequestOpenBzrDir(backing,
552
 
            root_client_path='root')
553
 
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
554
 
            request.execute('not-root'))
555
 
 
556
 
 
557
 
class TestSmartServerRequestOpenBzrDir_2_1(tests.TestCaseWithMemoryTransport):
558
 
 
559
 
    def test_no_directory(self):
560
 
        backing = self.get_transport()
561
 
        request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
562
 
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
563
 
            request.execute('does-not-exist'))
564
 
 
565
 
    def test_empty_directory(self):
566
 
        backing = self.get_transport()
567
 
        backing.mkdir('empty')
568
 
        request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
569
 
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
570
 
            request.execute('empty'))
571
 
 
572
 
    def test_present_without_workingtree(self):
573
 
        backing = self.get_transport()
574
 
        request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
575
 
        self.make_bzrdir('.')
576
 
        self.assertEqual(smart_req.SmartServerResponse(('yes', 'no')),
577
 
            request.execute(''))
578
 
 
579
 
    def test_outside_root_client_path(self):
580
 
        backing = self.get_transport()
581
 
        request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing,
582
 
            root_client_path='root')
583
 
        self.assertEqual(smart_req.SmartServerResponse(('no',)),
584
 
            request.execute('not-root'))
585
 
 
586
 
 
587
 
class TestSmartServerRequestOpenBzrDir_2_1_disk(TestCaseWithChrootedTransport):
588
 
 
589
 
    def test_present_with_workingtree(self):
590
 
        self.vfs_transport_factory = test_server.LocalURLServer
591
 
        backing = self.get_transport()
592
 
        request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
593
 
        bd = self.make_bzrdir('.')
594
 
        bd.create_repository()
595
 
        bd.create_branch()
596
 
        bd.create_workingtree()
597
 
        self.assertEqual(smart_req.SmartServerResponse(('yes', 'yes')),
598
 
            request.execute(''))
599
 
 
600
 
 
601
 
class TestSmartServerRequestOpenBranch(TestCaseWithChrootedTransport):
 
153
            request.execute, backing.local_abspath('subdir'))
 
154
 
 
155
 
 
156
class TestSmartServerRequestOpenBranch(tests.TestCaseWithTransport):
602
157
 
603
158
    def test_no_branch(self):
604
159
        """When there is no branch, ('nobranch', ) is returned."""
605
160
        backing = self.get_transport()
606
 
        request = smart_dir.SmartServerRequestOpenBranch(backing)
 
161
        request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
607
162
        self.make_bzrdir('.')
608
 
        self.assertEqual(smart_req.SmartServerResponse(('nobranch', )),
609
 
            request.execute(''))
 
163
        self.assertEqual(SmartServerResponse(('nobranch', )),
 
164
            request.execute(backing.local_abspath('')))
610
165
 
611
166
    def test_branch(self):
612
167
        """When there is a branch, 'ok' is returned."""
613
168
        backing = self.get_transport()
614
 
        request = smart_dir.SmartServerRequestOpenBranch(backing)
 
169
        request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
615
170
        self.make_branch('.')
616
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', '')),
617
 
            request.execute(''))
618
 
 
619
 
    def test_branch_reference(self):
620
 
        """When there is a branch reference, the reference URL is returned."""
621
 
        self.vfs_transport_factory = test_server.LocalURLServer
622
 
        backing = self.get_transport()
623
 
        request = smart_dir.SmartServerRequestOpenBranch(backing)
624
 
        branch = self.make_branch('branch')
625
 
        checkout = branch.create_checkout('reference',lightweight=True)
626
 
        reference_url = _mod_branch.BranchReferenceFormat().get_reference(
627
 
            checkout.bzrdir)
628
 
        self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
629
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', reference_url)),
630
 
            request.execute('reference'))
631
 
 
632
 
    def test_notification_on_branch_from_repository(self):
633
 
        """When there is a repository, the error should return details."""
634
 
        backing = self.get_transport()
635
 
        request = smart_dir.SmartServerRequestOpenBranch(backing)
636
 
        repo = self.make_repository('.')
637
 
        self.assertEqual(smart_req.SmartServerResponse(('nobranch',)),
638
 
            request.execute(''))
639
 
 
640
 
 
641
 
class TestSmartServerRequestOpenBranchV2(TestCaseWithChrootedTransport):
642
 
 
643
 
    def test_no_branch(self):
644
 
        """When there is no branch, ('nobranch', ) is returned."""
645
 
        backing = self.get_transport()
646
 
        self.make_bzrdir('.')
647
 
        request = smart_dir.SmartServerRequestOpenBranchV2(backing)
648
 
        self.assertEqual(smart_req.SmartServerResponse(('nobranch', )),
649
 
            request.execute(''))
650
 
 
651
 
    def test_branch(self):
652
 
        """When there is a branch, 'ok' is returned."""
653
 
        backing = self.get_transport()
654
 
        expected = self.make_branch('.')._format.network_name()
655
 
        request = smart_dir.SmartServerRequestOpenBranchV2(backing)
656
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(
657
 
                ('branch', expected)),
658
 
                         request.execute(''))
659
 
 
660
 
    def test_branch_reference(self):
661
 
        """When there is a branch reference, the reference URL is returned."""
662
 
        self.vfs_transport_factory = test_server.LocalURLServer
663
 
        backing = self.get_transport()
664
 
        request = smart_dir.SmartServerRequestOpenBranchV2(backing)
665
 
        branch = self.make_branch('branch')
666
 
        checkout = branch.create_checkout('reference',lightweight=True)
667
 
        reference_url = _mod_branch.BranchReferenceFormat().get_reference(
668
 
            checkout.bzrdir)
669
 
        self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
670
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(
671
 
                ('ref', reference_url)),
672
 
                         request.execute('reference'))
673
 
 
674
 
    def test_stacked_branch(self):
675
 
        """Opening a stacked branch does not open the stacked-on branch."""
676
 
        trunk = self.make_branch('trunk')
677
 
        feature = self.make_branch('feature')
678
 
        feature.set_stacked_on_url(trunk.base)
679
 
        opened_branches = []
680
 
        _mod_branch.Branch.hooks.install_named_hook(
681
 
            'open', opened_branches.append, None)
682
 
        backing = self.get_transport()
683
 
        request = smart_dir.SmartServerRequestOpenBranchV2(backing)
684
 
        request.setup_jail()
685
 
        try:
686
 
            response = request.execute('feature')
687
 
        finally:
688
 
            request.teardown_jail()
689
 
        expected_format = feature._format.network_name()
690
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(
691
 
                ('branch', expected_format)),
692
 
                         response)
693
 
        self.assertLength(1, opened_branches)
694
 
 
695
 
    def test_notification_on_branch_from_repository(self):
696
 
        """When there is a repository, the error should return details."""
697
 
        backing = self.get_transport()
698
 
        request = smart_dir.SmartServerRequestOpenBranchV2(backing)
699
 
        repo = self.make_repository('.')
700
 
        self.assertEqual(smart_req.SmartServerResponse(('nobranch',)),
701
 
            request.execute(''))
702
 
 
703
 
 
704
 
class TestSmartServerRequestOpenBranchV3(TestCaseWithChrootedTransport):
705
 
 
706
 
    def test_no_branch(self):
707
 
        """When there is no branch, ('nobranch', ) is returned."""
708
 
        backing = self.get_transport()
709
 
        self.make_bzrdir('.')
710
 
        request = smart_dir.SmartServerRequestOpenBranchV3(backing)
711
 
        self.assertEqual(smart_req.SmartServerResponse(('nobranch',)),
712
 
            request.execute(''))
713
 
 
714
 
    def test_branch(self):
715
 
        """When there is a branch, 'ok' is returned."""
716
 
        backing = self.get_transport()
717
 
        expected = self.make_branch('.')._format.network_name()
718
 
        request = smart_dir.SmartServerRequestOpenBranchV3(backing)
719
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(
720
 
                ('branch', expected)),
721
 
                         request.execute(''))
722
 
 
723
 
    def test_branch_reference(self):
724
 
        """When there is a branch reference, the reference URL is returned."""
725
 
        self.vfs_transport_factory = test_server.LocalURLServer
726
 
        backing = self.get_transport()
727
 
        request = smart_dir.SmartServerRequestOpenBranchV3(backing)
728
 
        branch = self.make_branch('branch')
729
 
        checkout = branch.create_checkout('reference',lightweight=True)
730
 
        reference_url = _mod_branch.BranchReferenceFormat().get_reference(
731
 
            checkout.bzrdir)
732
 
        self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
733
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(
734
 
                ('ref', reference_url)),
735
 
                         request.execute('reference'))
736
 
 
737
 
    def test_stacked_branch(self):
738
 
        """Opening a stacked branch does not open the stacked-on branch."""
739
 
        trunk = self.make_branch('trunk')
740
 
        feature = self.make_branch('feature')
741
 
        feature.set_stacked_on_url(trunk.base)
742
 
        opened_branches = []
743
 
        _mod_branch.Branch.hooks.install_named_hook(
744
 
            'open', opened_branches.append, None)
745
 
        backing = self.get_transport()
746
 
        request = smart_dir.SmartServerRequestOpenBranchV3(backing)
747
 
        request.setup_jail()
748
 
        try:
749
 
            response = request.execute('feature')
750
 
        finally:
751
 
            request.teardown_jail()
752
 
        expected_format = feature._format.network_name()
753
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(
754
 
                ('branch', expected_format)),
755
 
                         response)
756
 
        self.assertLength(1, opened_branches)
757
 
 
758
 
    def test_notification_on_branch_from_repository(self):
759
 
        """When there is a repository, the error should return details."""
760
 
        backing = self.get_transport()
761
 
        request = smart_dir.SmartServerRequestOpenBranchV3(backing)
762
 
        repo = self.make_repository('.')
763
 
        self.assertEqual(smart_req.SmartServerResponse(
764
 
                ('nobranch', 'location is a repository')),
765
 
                         request.execute(''))
766
 
 
767
 
 
768
 
class TestSmartServerRequestRevisionHistory(tests.TestCaseWithMemoryTransport):
 
171
        self.assertEqual(SmartServerResponse(('ok', '')),
 
172
            request.execute(backing.local_abspath('')))
 
173
 
 
174
    def test_branch_reference(self):
 
175
        """When there is a branch reference, the reference URL is returned."""
 
176
        backing = self.get_transport()
 
177
        request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
 
178
        branch = self.make_branch('branch')
 
179
        checkout = branch.create_checkout('reference',lightweight=True)
 
180
        # TODO: once we have an API to probe for references of any sort, we
 
181
        # can use it here.
 
182
        reference_url = backing.abspath('branch') + '/'
 
183
        self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
 
184
        self.assertEqual(SmartServerResponse(('ok', reference_url)),
 
185
            request.execute(backing.local_abspath('reference')))
 
186
 
 
187
 
 
188
class TestSmartServerRequestRevisionHistory(tests.TestCaseWithTransport):
769
189
 
770
190
    def test_empty(self):
771
191
        """For an empty branch, the body is empty."""
772
192
        backing = self.get_transport()
773
 
        request = smart_branch.SmartServerRequestRevisionHistory(backing)
 
193
        request = smart.branch.SmartServerRequestRevisionHistory(backing)
774
194
        self.make_branch('.')
775
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), ''),
776
 
            request.execute(''))
 
195
        self.assertEqual(SmartServerResponse(('ok', ), ''),
 
196
            request.execute(backing.local_abspath('')))
777
197
 
778
198
    def test_not_empty(self):
779
199
        """For a non-empty branch, the body is empty."""
780
200
        backing = self.get_transport()
781
 
        request = smart_branch.SmartServerRequestRevisionHistory(backing)
 
201
        request = smart.branch.SmartServerRequestRevisionHistory(backing)
782
202
        tree = self.make_branch_and_memory_tree('.')
783
203
        tree.lock_write()
784
204
        tree.add('')
786
206
        r2 = tree.commit('2nd commit', rev_id=u'\xc8'.encode('utf-8'))
787
207
        tree.unlock()
788
208
        self.assertEqual(
789
 
            smart_req.SmartServerResponse(('ok', ), ('\x00'.join([r1, r2]))),
790
 
            request.execute(''))
791
 
 
792
 
 
793
 
class TestSmartServerBranchRequest(tests.TestCaseWithMemoryTransport):
 
209
            SmartServerResponse(('ok', ), ('\x00'.join([r1, r2]))),
 
210
            request.execute(backing.local_abspath('')))
 
211
 
 
212
 
 
213
class TestSmartServerBranchRequest(tests.TestCaseWithTransport):
794
214
 
795
215
    def test_no_branch(self):
796
216
        """When there is a bzrdir and no branch, NotBranchError is raised."""
797
217
        backing = self.get_transport()
798
 
        request = smart_branch.SmartServerBranchRequest(backing)
 
218
        request = smart.branch.SmartServerBranchRequest(backing)
799
219
        self.make_bzrdir('.')
800
220
        self.assertRaises(errors.NotBranchError,
801
 
            request.execute, '')
 
221
            request.execute, backing.local_abspath(''))
802
222
 
803
223
    def test_branch_reference(self):
804
224
        """When there is a branch reference, NotBranchError is raised."""
805
225
        backing = self.get_transport()
806
 
        request = smart_branch.SmartServerBranchRequest(backing)
 
226
        request = smart.branch.SmartServerBranchRequest(backing)
807
227
        branch = self.make_branch('branch')
808
228
        checkout = branch.create_checkout('reference',lightweight=True)
809
229
        self.assertRaises(errors.NotBranchError,
810
 
            request.execute, 'checkout')
811
 
 
812
 
 
813
 
class TestSmartServerBranchRequestLastRevisionInfo(
814
 
    tests.TestCaseWithMemoryTransport):
 
230
            request.execute, backing.local_abspath('checkout'))
 
231
 
 
232
 
 
233
class TestSmartServerBranchRequestLastRevisionInfo(tests.TestCaseWithTransport):
815
234
 
816
235
    def test_empty(self):
817
236
        """For an empty branch, the result is ('ok', '0', 'null:')."""
818
237
        backing = self.get_transport()
819
 
        request = smart_branch.SmartServerBranchRequestLastRevisionInfo(backing)
 
238
        request = smart.branch.SmartServerBranchRequestLastRevisionInfo(backing)
820
239
        self.make_branch('.')
821
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', '0', 'null:')),
822
 
            request.execute(''))
 
240
        self.assertEqual(SmartServerResponse(('ok', '0', 'null:')),
 
241
            request.execute(backing.local_abspath('')))
823
242
 
824
243
    def test_not_empty(self):
825
244
        """For a non-empty branch, the result is ('ok', 'revno', 'revid')."""
826
245
        backing = self.get_transport()
827
 
        request = smart_branch.SmartServerBranchRequestLastRevisionInfo(backing)
 
246
        request = smart.branch.SmartServerBranchRequestLastRevisionInfo(backing)
828
247
        tree = self.make_branch_and_memory_tree('.')
829
248
        tree.lock_write()
830
249
        tree.add('')
833
252
        r2 = tree.commit('2nd commit', rev_id=rev_id_utf8)
834
253
        tree.unlock()
835
254
        self.assertEqual(
836
 
            smart_req.SmartServerResponse(('ok', '2', rev_id_utf8)),
837
 
            request.execute(''))
838
 
 
839
 
 
840
 
class TestSmartServerBranchRequestRevisionIdToRevno(
841
 
    tests.TestCaseWithMemoryTransport):
842
 
 
843
 
    def test_null(self):
844
 
        backing = self.get_transport()
845
 
        request = smart_branch.SmartServerBranchRequestRevisionIdToRevno(
846
 
            backing)
847
 
        self.make_branch('.')
848
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', '0')),
849
 
            request.execute('', 'null:'))
850
 
 
851
 
    def test_simple(self):
852
 
        backing = self.get_transport()
853
 
        request = smart_branch.SmartServerBranchRequestRevisionIdToRevno(
854
 
            backing)
855
 
        tree = self.make_branch_and_memory_tree('.')
856
 
        tree.lock_write()
857
 
        tree.add('')
858
 
        r1 = tree.commit('1st commit')
859
 
        tree.unlock()
860
 
        self.assertEqual(
861
 
            smart_req.SmartServerResponse(('ok', '1')),
862
 
            request.execute('', r1))
863
 
 
864
 
    def test_not_found(self):
865
 
        backing = self.get_transport()
866
 
        request = smart_branch.SmartServerBranchRequestRevisionIdToRevno(
867
 
            backing)
868
 
        branch = self.make_branch('.')
869
 
        self.assertEqual(
870
 
            smart_req.FailedSmartServerResponse(
871
 
                ('NoSuchRevision', 'idontexist')),
872
 
            request.execute('', 'idontexist'))
873
 
 
874
 
 
875
 
class TestSmartServerBranchRequestGetConfigFile(
876
 
    tests.TestCaseWithMemoryTransport):
 
255
            SmartServerResponse(('ok', '2', rev_id_utf8)),
 
256
            request.execute(backing.local_abspath('')))
 
257
 
 
258
 
 
259
class TestSmartServerBranchRequestGetConfigFile(tests.TestCaseWithTransport):
877
260
 
878
261
    def test_default(self):
879
262
        """With no file, we get empty content."""
880
263
        backing = self.get_transport()
881
 
        request = smart_branch.SmartServerBranchGetConfigFile(backing)
 
264
        request = smart.branch.SmartServerBranchGetConfigFile(backing)
882
265
        branch = self.make_branch('.')
883
266
        # there should be no file by default
884
267
        content = ''
885
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), content),
886
 
            request.execute(''))
 
268
        self.assertEqual(SmartServerResponse(('ok', ), content),
 
269
            request.execute(backing.local_abspath('')))
887
270
 
888
271
    def test_with_content(self):
889
272
        # SmartServerBranchGetConfigFile should return the content from
890
273
        # branch.control_files.get('branch.conf') for now - in the future it may
891
 
        # perform more complex processing.
892
 
        backing = self.get_transport()
893
 
        request = smart_branch.SmartServerBranchGetConfigFile(backing)
894
 
        branch = self.make_branch('.')
895
 
        branch._transport.put_bytes('branch.conf', 'foo bar baz')
896
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), 'foo bar baz'),
897
 
            request.execute(''))
898
 
 
899
 
 
900
 
class TestLockedBranch(tests.TestCaseWithMemoryTransport):
901
 
 
902
 
    def get_lock_tokens(self, branch):
903
 
        branch_token = branch.lock_write().branch_token
904
 
        repo_token = branch.repository.lock_write().repository_token
905
 
        branch.repository.unlock()
906
 
        return branch_token, repo_token
907
 
 
908
 
 
909
 
class TestSmartServerBranchRequestPutConfigFile(TestLockedBranch):
910
 
 
911
 
    def test_with_content(self):
912
 
        backing = self.get_transport()
913
 
        request = smart_branch.SmartServerBranchPutConfigFile(backing)
914
 
        branch = self.make_branch('.')
915
 
        branch_token, repo_token = self.get_lock_tokens(branch)
916
 
        self.assertIs(None, request.execute('', branch_token, repo_token))
917
 
        self.assertEqual(
918
 
            smart_req.SmartServerResponse(('ok', )),
919
 
            request.do_body('foo bar baz'))
920
 
        self.assertEquals(
921
 
            branch.control_transport.get_bytes('branch.conf'),
922
 
            'foo bar baz')
923
 
        branch.unlock()
924
 
 
925
 
 
926
 
class TestSmartServerBranchRequestSetConfigOption(TestLockedBranch):
927
 
 
928
 
    def test_value_name(self):
929
 
        branch = self.make_branch('.')
930
 
        request = smart_branch.SmartServerBranchRequestSetConfigOption(
931
 
            branch.bzrdir.root_transport)
932
 
        branch_token, repo_token = self.get_lock_tokens(branch)
933
 
        config = branch._get_config()
934
 
        result = request.execute('', branch_token, repo_token, 'bar', 'foo',
935
 
            '')
936
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), result)
937
 
        self.assertEqual('bar', config.get_option('foo'))
938
 
        # Cleanup
939
 
        branch.unlock()
940
 
 
941
 
    def test_value_name_section(self):
942
 
        branch = self.make_branch('.')
943
 
        request = smart_branch.SmartServerBranchRequestSetConfigOption(
944
 
            branch.bzrdir.root_transport)
945
 
        branch_token, repo_token = self.get_lock_tokens(branch)
946
 
        config = branch._get_config()
947
 
        result = request.execute('', branch_token, repo_token, 'bar', 'foo',
948
 
            'gam')
949
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), result)
950
 
        self.assertEqual('bar', config.get_option('foo', 'gam'))
951
 
        # Cleanup
952
 
        branch.unlock()
953
 
 
954
 
 
955
 
class TestSmartServerBranchRequestSetConfigOptionDict(TestLockedBranch):
956
 
 
957
 
    def setUp(self):
958
 
        TestLockedBranch.setUp(self)
959
 
        # A dict with non-ascii keys and values to exercise unicode
960
 
        # roundtripping.
961
 
        self.encoded_value_dict = (
962
 
            'd5:ascii1:a11:unicode \xe2\x8c\x9a3:\xe2\x80\xbde')
963
 
        self.value_dict = {
964
 
            'ascii': 'a', u'unicode \N{WATCH}': u'\N{INTERROBANG}'}
965
 
 
966
 
    def test_value_name(self):
967
 
        branch = self.make_branch('.')
968
 
        request = smart_branch.SmartServerBranchRequestSetConfigOptionDict(
969
 
            branch.bzrdir.root_transport)
970
 
        branch_token, repo_token = self.get_lock_tokens(branch)
971
 
        config = branch._get_config()
972
 
        result = request.execute('', branch_token, repo_token,
973
 
            self.encoded_value_dict, 'foo', '')
974
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), result)
975
 
        self.assertEqual(self.value_dict, config.get_option('foo'))
976
 
        # Cleanup
977
 
        branch.unlock()
978
 
 
979
 
    def test_value_name_section(self):
980
 
        branch = self.make_branch('.')
981
 
        request = smart_branch.SmartServerBranchRequestSetConfigOptionDict(
982
 
            branch.bzrdir.root_transport)
983
 
        branch_token, repo_token = self.get_lock_tokens(branch)
984
 
        config = branch._get_config()
985
 
        result = request.execute('', branch_token, repo_token,
986
 
            self.encoded_value_dict, 'foo', 'gam')
987
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), result)
988
 
        self.assertEqual(self.value_dict, config.get_option('foo', 'gam'))
989
 
        # Cleanup
990
 
        branch.unlock()
991
 
 
992
 
 
993
 
class TestSmartServerBranchRequestSetTagsBytes(TestLockedBranch):
994
 
    # Only called when the branch format and tags match [yay factory
995
 
    # methods] so only need to test straight forward cases.
996
 
 
997
 
    def test_set_bytes(self):
998
 
        base_branch = self.make_branch('base')
999
 
        tag_bytes = base_branch._get_tags_bytes()
1000
 
        # get_lock_tokens takes out a lock.
1001
 
        branch_token, repo_token = self.get_lock_tokens(base_branch)
1002
 
        request = smart_branch.SmartServerBranchSetTagsBytes(
1003
 
            self.get_transport())
1004
 
        response = request.execute('base', branch_token, repo_token)
1005
 
        self.assertEqual(None, response)
1006
 
        response = request.do_chunk(tag_bytes)
1007
 
        self.assertEqual(None, response)
1008
 
        response = request.do_end()
1009
 
        self.assertEquals(
1010
 
            smart_req.SuccessfulSmartServerResponse(()), response)
1011
 
        base_branch.unlock()
1012
 
 
1013
 
    def test_lock_failed(self):
1014
 
        base_branch = self.make_branch('base')
1015
 
        base_branch.lock_write()
1016
 
        tag_bytes = base_branch._get_tags_bytes()
1017
 
        request = smart_branch.SmartServerBranchSetTagsBytes(
1018
 
            self.get_transport())
1019
 
        self.assertRaises(errors.TokenMismatch, request.execute,
1020
 
            'base', 'wrong token', 'wrong token')
1021
 
        # The request handler will keep processing the message parts, so even
1022
 
        # if the request fails immediately do_chunk and do_end are still
1023
 
        # called.
1024
 
        request.do_chunk(tag_bytes)
1025
 
        request.do_end()
1026
 
        base_branch.unlock()
1027
 
 
1028
 
 
1029
 
 
1030
 
class SetLastRevisionTestBase(TestLockedBranch):
1031
 
    """Base test case for verbs that implement set_last_revision."""
1032
 
 
1033
 
    def setUp(self):
1034
 
        tests.TestCaseWithMemoryTransport.setUp(self)
1035
 
        backing_transport = self.get_transport()
1036
 
        self.request = self.request_class(backing_transport)
1037
 
        self.tree = self.make_branch_and_memory_tree('.')
1038
 
 
1039
 
    def lock_branch(self):
1040
 
        return self.get_lock_tokens(self.tree.branch)
1041
 
 
1042
 
    def unlock_branch(self):
1043
 
        self.tree.branch.unlock()
1044
 
 
1045
 
    def set_last_revision(self, revision_id, revno):
1046
 
        branch_token, repo_token = self.lock_branch()
1047
 
        response = self._set_last_revision(
1048
 
            revision_id, revno, branch_token, repo_token)
1049
 
        self.unlock_branch()
1050
 
        return response
1051
 
 
1052
 
    def assertRequestSucceeds(self, revision_id, revno):
1053
 
        response = self.set_last_revision(revision_id, revno)
1054
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
1055
 
                         response)
1056
 
 
1057
 
 
1058
 
class TestSetLastRevisionVerbMixin(object):
1059
 
    """Mixin test case for verbs that implement set_last_revision."""
1060
 
 
1061
 
    def test_set_null_to_null(self):
1062
 
        """An empty branch can have its last revision set to 'null:'."""
1063
 
        self.assertRequestSucceeds('null:', 0)
1064
 
 
1065
 
    def test_NoSuchRevision(self):
1066
 
        """If the revision_id is not present, the verb returns NoSuchRevision.
1067
 
        """
1068
 
        revision_id = 'non-existent revision'
1069
 
        self.assertEqual(smart_req.FailedSmartServerResponse(('NoSuchRevision',
1070
 
                                                              revision_id)),
1071
 
                         self.set_last_revision(revision_id, 1))
1072
 
 
1073
 
    def make_tree_with_two_commits(self):
1074
 
        self.tree.lock_write()
1075
 
        self.tree.add('')
1076
 
        rev_id_utf8 = u'\xc8'.encode('utf-8')
1077
 
        r1 = self.tree.commit('1st commit', rev_id=rev_id_utf8)
1078
 
        r2 = self.tree.commit('2nd commit', rev_id='rev-2')
1079
 
        self.tree.unlock()
1080
 
 
1081
 
    def test_branch_last_revision_info_is_updated(self):
1082
 
        """A branch's tip can be set to a revision that is present in its
1083
 
        repository.
1084
 
        """
1085
 
        # Make a branch with an empty revision history, but two revisions in
1086
 
        # its repository.
1087
 
        self.make_tree_with_two_commits()
1088
 
        rev_id_utf8 = u'\xc8'.encode('utf-8')
1089
 
        self.tree.branch.set_last_revision_info(0, 'null:')
1090
 
        self.assertEqual(
1091
 
            (0, 'null:'), self.tree.branch.last_revision_info())
1092
 
        # We can update the branch to a revision that is present in the
1093
 
        # repository.
1094
 
        self.assertRequestSucceeds(rev_id_utf8, 1)
1095
 
        self.assertEqual(
1096
 
            (1, rev_id_utf8), self.tree.branch.last_revision_info())
1097
 
 
1098
 
    def test_branch_last_revision_info_rewind(self):
1099
 
        """A branch's tip can be set to a revision that is an ancestor of the
1100
 
        current tip.
1101
 
        """
1102
 
        self.make_tree_with_two_commits()
1103
 
        rev_id_utf8 = u'\xc8'.encode('utf-8')
1104
 
        self.assertEqual(
1105
 
            (2, 'rev-2'), self.tree.branch.last_revision_info())
1106
 
        self.assertRequestSucceeds(rev_id_utf8, 1)
1107
 
        self.assertEqual(
1108
 
            (1, rev_id_utf8), self.tree.branch.last_revision_info())
1109
 
 
1110
 
    def test_TipChangeRejected(self):
1111
 
        """If a pre_change_branch_tip hook raises TipChangeRejected, the verb
1112
 
        returns TipChangeRejected.
1113
 
        """
1114
 
        rejection_message = u'rejection message\N{INTERROBANG}'
1115
 
        def hook_that_rejects(params):
1116
 
            raise errors.TipChangeRejected(rejection_message)
1117
 
        _mod_branch.Branch.hooks.install_named_hook(
1118
 
            'pre_change_branch_tip', hook_that_rejects, None)
1119
 
        self.assertEqual(
1120
 
            smart_req.FailedSmartServerResponse(
1121
 
                ('TipChangeRejected', rejection_message.encode('utf-8'))),
1122
 
            self.set_last_revision('null:', 0))
1123
 
 
1124
 
 
1125
 
class TestSmartServerBranchRequestSetLastRevision(
1126
 
        SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
1127
 
    """Tests for Branch.set_last_revision verb."""
1128
 
 
1129
 
    request_class = smart_branch.SmartServerBranchRequestSetLastRevision
1130
 
 
1131
 
    def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
1132
 
        return self.request.execute(
1133
 
            '', branch_token, repo_token, revision_id)
1134
 
 
1135
 
 
1136
 
class TestSmartServerBranchRequestSetLastRevisionInfo(
1137
 
        SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
1138
 
    """Tests for Branch.set_last_revision_info verb."""
1139
 
 
1140
 
    request_class = smart_branch.SmartServerBranchRequestSetLastRevisionInfo
1141
 
 
1142
 
    def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
1143
 
        return self.request.execute(
1144
 
            '', branch_token, repo_token, revno, revision_id)
1145
 
 
1146
 
    def test_NoSuchRevision(self):
1147
 
        """Branch.set_last_revision_info does not have to return
1148
 
        NoSuchRevision if the revision_id is absent.
1149
 
        """
1150
 
        raise tests.TestNotApplicable()
1151
 
 
1152
 
 
1153
 
class TestSmartServerBranchRequestSetLastRevisionEx(
1154
 
        SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
1155
 
    """Tests for Branch.set_last_revision_ex verb."""
1156
 
 
1157
 
    request_class = smart_branch.SmartServerBranchRequestSetLastRevisionEx
1158
 
 
1159
 
    def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
1160
 
        return self.request.execute(
1161
 
            '', branch_token, repo_token, revision_id, 0, 0)
1162
 
 
1163
 
    def assertRequestSucceeds(self, revision_id, revno):
1164
 
        response = self.set_last_revision(revision_id, revno)
1165
 
        self.assertEqual(
1166
 
            smart_req.SuccessfulSmartServerResponse(('ok', revno, revision_id)),
1167
 
            response)
1168
 
 
1169
 
    def test_branch_last_revision_info_rewind(self):
1170
 
        """A branch's tip can be set to a revision that is an ancestor of the
1171
 
        current tip, but only if allow_overwrite_descendant is passed.
1172
 
        """
1173
 
        self.make_tree_with_two_commits()
1174
 
        rev_id_utf8 = u'\xc8'.encode('utf-8')
1175
 
        self.assertEqual(
1176
 
            (2, 'rev-2'), self.tree.branch.last_revision_info())
1177
 
        # If allow_overwrite_descendant flag is 0, then trying to set the tip
1178
 
        # to an older revision ID has no effect.
1179
 
        branch_token, repo_token = self.lock_branch()
1180
 
        response = self.request.execute(
1181
 
            '', branch_token, repo_token, rev_id_utf8, 0, 0)
1182
 
        self.assertEqual(
1183
 
            smart_req.SuccessfulSmartServerResponse(('ok', 2, 'rev-2')),
1184
 
            response)
1185
 
        self.assertEqual(
1186
 
            (2, 'rev-2'), self.tree.branch.last_revision_info())
1187
 
 
1188
 
        # If allow_overwrite_descendant flag is 1, then setting the tip to an
1189
 
        # ancestor works.
1190
 
        response = self.request.execute(
1191
 
            '', branch_token, repo_token, rev_id_utf8, 0, 1)
1192
 
        self.assertEqual(
1193
 
            smart_req.SuccessfulSmartServerResponse(('ok', 1, rev_id_utf8)),
1194
 
            response)
1195
 
        self.unlock_branch()
1196
 
        self.assertEqual(
1197
 
            (1, rev_id_utf8), self.tree.branch.last_revision_info())
1198
 
 
1199
 
    def make_branch_with_divergent_history(self):
1200
 
        """Make a branch with divergent history in its repo.
1201
 
 
1202
 
        The branch's tip will be 'child-2', and the repo will also contain
1203
 
        'child-1', which diverges from a common base revision.
1204
 
        """
1205
 
        self.tree.lock_write()
1206
 
        self.tree.add('')
1207
 
        r1 = self.tree.commit('1st commit')
1208
 
        revno_1, revid_1 = self.tree.branch.last_revision_info()
1209
 
        r2 = self.tree.commit('2nd commit', rev_id='child-1')
1210
 
        # Undo the second commit
1211
 
        self.tree.branch.set_last_revision_info(revno_1, revid_1)
1212
 
        self.tree.set_parent_ids([revid_1])
1213
 
        # Make a new second commit, child-2.  child-2 has diverged from
1214
 
        # child-1.
1215
 
        new_r2 = self.tree.commit('2nd commit', rev_id='child-2')
1216
 
        self.tree.unlock()
1217
 
 
1218
 
    def test_not_allow_diverged(self):
1219
 
        """If allow_diverged is not passed, then setting a divergent history
1220
 
        returns a Diverged error.
1221
 
        """
1222
 
        self.make_branch_with_divergent_history()
1223
 
        self.assertEqual(
1224
 
            smart_req.FailedSmartServerResponse(('Diverged',)),
1225
 
            self.set_last_revision('child-1', 2))
1226
 
        # The branch tip was not changed.
1227
 
        self.assertEqual('child-2', self.tree.branch.last_revision())
1228
 
 
1229
 
    def test_allow_diverged(self):
1230
 
        """If allow_diverged is passed, then setting a divergent history
1231
 
        succeeds.
1232
 
        """
1233
 
        self.make_branch_with_divergent_history()
1234
 
        branch_token, repo_token = self.lock_branch()
1235
 
        response = self.request.execute(
1236
 
            '', branch_token, repo_token, 'child-1', 1, 0)
1237
 
        self.assertEqual(
1238
 
            smart_req.SuccessfulSmartServerResponse(('ok', 2, 'child-1')),
1239
 
            response)
1240
 
        self.unlock_branch()
1241
 
        # The branch tip was changed.
1242
 
        self.assertEqual('child-1', self.tree.branch.last_revision())
1243
 
 
1244
 
 
1245
 
class TestSmartServerBranchBreakLock(tests.TestCaseWithMemoryTransport):
1246
 
 
1247
 
    def test_lock_to_break(self):
1248
 
        base_branch = self.make_branch('base')
1249
 
        request = smart_branch.SmartServerBranchBreakLock(
1250
 
            self.get_transport())
1251
 
        base_branch.lock_write()
1252
 
        self.assertEqual(
1253
 
            smart_req.SuccessfulSmartServerResponse(('ok', ), None),
1254
 
            request.execute('base'))
1255
 
 
1256
 
    def test_nothing_to_break(self):
1257
 
        base_branch = self.make_branch('base')
1258
 
        request = smart_branch.SmartServerBranchBreakLock(
1259
 
            self.get_transport())
1260
 
        self.assertEqual(
1261
 
            smart_req.SuccessfulSmartServerResponse(('ok', ), None),
1262
 
            request.execute('base'))
1263
 
 
1264
 
 
1265
 
class TestSmartServerBranchRequestGetParent(tests.TestCaseWithMemoryTransport):
1266
 
 
1267
 
    def test_get_parent_none(self):
1268
 
        base_branch = self.make_branch('base')
1269
 
        request = smart_branch.SmartServerBranchGetParent(self.get_transport())
1270
 
        response = request.execute('base')
1271
 
        self.assertEquals(
1272
 
            smart_req.SuccessfulSmartServerResponse(('',)), response)
1273
 
 
1274
 
    def test_get_parent_something(self):
1275
 
        base_branch = self.make_branch('base')
1276
 
        base_branch.set_parent(self.get_url('foo'))
1277
 
        request = smart_branch.SmartServerBranchGetParent(self.get_transport())
1278
 
        response = request.execute('base')
1279
 
        self.assertEquals(
1280
 
            smart_req.SuccessfulSmartServerResponse(("../foo",)),
1281
 
            response)
1282
 
 
1283
 
 
1284
 
class TestSmartServerBranchRequestSetParent(TestLockedBranch):
1285
 
 
1286
 
    def test_set_parent_none(self):
1287
 
        branch = self.make_branch('base', format="1.9")
1288
 
        branch.lock_write()
1289
 
        branch._set_parent_location('foo')
1290
 
        branch.unlock()
1291
 
        request = smart_branch.SmartServerBranchRequestSetParentLocation(
1292
 
            self.get_transport())
1293
 
        branch_token, repo_token = self.get_lock_tokens(branch)
1294
 
        try:
1295
 
            response = request.execute('base', branch_token, repo_token, '')
1296
 
        finally:
1297
 
            branch.unlock()
1298
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), response)
1299
 
        self.assertEqual(None, branch.get_parent())
1300
 
 
1301
 
    def test_set_parent_something(self):
1302
 
        branch = self.make_branch('base', format="1.9")
1303
 
        request = smart_branch.SmartServerBranchRequestSetParentLocation(
1304
 
            self.get_transport())
1305
 
        branch_token, repo_token = self.get_lock_tokens(branch)
1306
 
        try:
1307
 
            response = request.execute('base', branch_token, repo_token,
1308
 
            'http://bar/')
1309
 
        finally:
1310
 
            branch.unlock()
1311
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), response)
1312
 
        self.assertEqual('http://bar/', branch.get_parent())
1313
 
 
1314
 
 
1315
 
class TestSmartServerBranchRequestGetTagsBytes(
1316
 
    tests.TestCaseWithMemoryTransport):
1317
 
    # Only called when the branch format and tags match [yay factory
1318
 
    # methods] so only need to test straight forward cases.
1319
 
 
1320
 
    def test_get_bytes(self):
1321
 
        base_branch = self.make_branch('base')
1322
 
        request = smart_branch.SmartServerBranchGetTagsBytes(
1323
 
            self.get_transport())
1324
 
        response = request.execute('base')
1325
 
        self.assertEquals(
1326
 
            smart_req.SuccessfulSmartServerResponse(('',)), response)
1327
 
 
1328
 
 
1329
 
class TestSmartServerBranchRequestGetStackedOnURL(tests.TestCaseWithMemoryTransport):
1330
 
 
1331
 
    def test_get_stacked_on_url(self):
1332
 
        base_branch = self.make_branch('base', format='1.6')
1333
 
        stacked_branch = self.make_branch('stacked', format='1.6')
1334
 
        # typically should be relative
1335
 
        stacked_branch.set_stacked_on_url('../base')
1336
 
        request = smart_branch.SmartServerBranchRequestGetStackedOnURL(
1337
 
            self.get_transport())
1338
 
        response = request.execute('stacked')
1339
 
        self.assertEquals(
1340
 
            smart_req.SmartServerResponse(('ok', '../base')),
1341
 
            response)
1342
 
 
1343
 
 
1344
 
class TestSmartServerBranchRequestLockWrite(TestLockedBranch):
1345
 
 
1346
 
    def setUp(self):
1347
 
        tests.TestCaseWithMemoryTransport.setUp(self)
 
274
        # perform more complex processing. 
 
275
        backing = self.get_transport()
 
276
        request = smart.branch.SmartServerBranchGetConfigFile(backing)
 
277
        branch = self.make_branch('.')
 
278
        branch.control_files.put_utf8('branch.conf', 'foo bar baz')
 
279
        self.assertEqual(SmartServerResponse(('ok', ), 'foo bar baz'),
 
280
            request.execute(backing.local_abspath('')))
 
281
 
 
282
 
 
283
class TestSmartServerBranchRequestSetLastRevision(tests.TestCaseWithTransport):
 
284
 
 
285
    def test_empty(self):
 
286
        backing = self.get_transport()
 
287
        request = smart.branch.SmartServerBranchRequestSetLastRevision(backing)
 
288
        b = self.make_branch('.')
 
289
        branch_token = b.lock_write()
 
290
        repo_token = b.repository.lock_write()
 
291
        b.repository.unlock()
 
292
        try:
 
293
            self.assertEqual(SmartServerResponse(('ok',)),
 
294
                request.execute(
 
295
                    backing.local_abspath(''), branch_token, repo_token,
 
296
                    'null:'))
 
297
        finally:
 
298
            b.unlock()
 
299
 
 
300
    def test_not_present_revision_id(self):
 
301
        backing = self.get_transport()
 
302
        request = smart.branch.SmartServerBranchRequestSetLastRevision(backing)
 
303
        b = self.make_branch('.')
 
304
        branch_token = b.lock_write()
 
305
        repo_token = b.repository.lock_write()
 
306
        b.repository.unlock()
 
307
        try:
 
308
            revision_id = 'non-existent revision'
 
309
            self.assertEqual(
 
310
                SmartServerResponse(('NoSuchRevision', revision_id)),
 
311
                request.execute(
 
312
                    backing.local_abspath(''), branch_token, repo_token,
 
313
                    revision_id))
 
314
        finally:
 
315
            b.unlock()
 
316
 
 
317
    def test_revision_id_present(self):
 
318
        backing = self.get_transport()
 
319
        request = smart.branch.SmartServerBranchRequestSetLastRevision(backing)
 
320
        tree = self.make_branch_and_memory_tree('.')
 
321
        tree.lock_write()
 
322
        tree.add('')
 
323
        rev_id_utf8 = u'\xc8'.encode('utf-8')
 
324
        r1 = tree.commit('1st commit', rev_id=rev_id_utf8)
 
325
        r2 = tree.commit('2nd commit')
 
326
        tree.unlock()
 
327
        branch_token = tree.branch.lock_write()
 
328
        repo_token = tree.branch.repository.lock_write()
 
329
        tree.branch.repository.unlock()
 
330
        try:
 
331
            self.assertEqual(
 
332
                SmartServerResponse(('ok',)),
 
333
                request.execute(
 
334
                    backing.local_abspath(''), branch_token, repo_token,
 
335
                    rev_id_utf8))
 
336
            self.assertEqual([rev_id_utf8], tree.branch.revision_history())
 
337
        finally:
 
338
            tree.branch.unlock()
 
339
 
 
340
    def test_revision_id_present2(self):
 
341
        backing = self.get_transport()
 
342
        request = smart.branch.SmartServerBranchRequestSetLastRevision(backing)
 
343
        tree = self.make_branch_and_memory_tree('.')
 
344
        tree.lock_write()
 
345
        tree.add('')
 
346
        rev_id_utf8 = u'\xc8'.encode('utf-8')
 
347
        r1 = tree.commit('1st commit', rev_id=rev_id_utf8)
 
348
        r2 = tree.commit('2nd commit')
 
349
        tree.unlock()
 
350
        tree.branch.set_revision_history([])
 
351
        branch_token = tree.branch.lock_write()
 
352
        repo_token = tree.branch.repository.lock_write()
 
353
        tree.branch.repository.unlock()
 
354
        try:
 
355
            self.assertEqual(
 
356
                SmartServerResponse(('ok',)),
 
357
                request.execute(
 
358
                    backing.local_abspath(''), branch_token, repo_token,
 
359
                    rev_id_utf8))
 
360
            self.assertEqual([rev_id_utf8], tree.branch.revision_history())
 
361
        finally:
 
362
            tree.branch.unlock()
 
363
 
 
364
 
 
365
class TestSmartServerBranchRequestLockWrite(tests.TestCaseWithTransport):
 
366
 
 
367
    def setUp(self):
 
368
        tests.TestCaseWithTransport.setUp(self)
 
369
        self.reduceLockdirTimeout()
1348
370
 
1349
371
    def test_lock_write_on_unlocked_branch(self):
1350
372
        backing = self.get_transport()
1351
 
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
1352
 
        branch = self.make_branch('.', format='knit')
 
373
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
 
374
        branch = self.make_branch('.')
1353
375
        repository = branch.repository
1354
 
        response = request.execute('')
 
376
        response = request.execute(backing.local_abspath(''))
1355
377
        branch_nonce = branch.control_files._lock.peek().get('nonce')
1356
378
        repository_nonce = repository.control_files._lock.peek().get('nonce')
1357
 
        self.assertEqual(smart_req.SmartServerResponse(
1358
 
                ('ok', branch_nonce, repository_nonce)),
1359
 
                         response)
 
379
        self.assertEqual(
 
380
            SmartServerResponse(('ok', branch_nonce, repository_nonce)),
 
381
            response)
1360
382
        # The branch (and associated repository) is now locked.  Verify that
1361
383
        # with a new branch object.
1362
384
        new_branch = repository.bzrdir.open_branch()
1363
385
        self.assertRaises(errors.LockContention, new_branch.lock_write)
1364
 
        # Cleanup
1365
 
        request = smart_branch.SmartServerBranchRequestUnlock(backing)
1366
 
        response = request.execute('', branch_nonce, repository_nonce)
1367
386
 
1368
387
    def test_lock_write_on_locked_branch(self):
1369
388
        backing = self.get_transport()
1370
 
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
 
389
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1371
390
        branch = self.make_branch('.')
1372
 
        branch_token = branch.lock_write().branch_token
 
391
        branch.lock_write()
1373
392
        branch.leave_lock_in_place()
1374
393
        branch.unlock()
1375
 
        response = request.execute('')
 
394
        response = request.execute(backing.local_abspath(''))
1376
395
        self.assertEqual(
1377
 
            smart_req.SmartServerResponse(('LockContention',)), response)
1378
 
        # Cleanup
1379
 
        branch.lock_write(branch_token)
1380
 
        branch.dont_leave_lock_in_place()
1381
 
        branch.unlock()
 
396
            SmartServerResponse(('LockContention',)), response)
1382
397
 
1383
398
    def test_lock_write_with_tokens_on_locked_branch(self):
1384
399
        backing = self.get_transport()
1385
 
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
1386
 
        branch = self.make_branch('.', format='knit')
1387
 
        branch_token, repo_token = self.get_lock_tokens(branch)
 
400
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
 
401
        branch = self.make_branch('.')
 
402
        branch_token = branch.lock_write()
 
403
        repo_token = branch.repository.lock_write()
 
404
        branch.repository.unlock()
1388
405
        branch.leave_lock_in_place()
1389
406
        branch.repository.leave_lock_in_place()
1390
407
        branch.unlock()
1391
 
        response = request.execute('',
 
408
        response = request.execute(backing.local_abspath(''),
1392
409
                                   branch_token, repo_token)
1393
410
        self.assertEqual(
1394
 
            smart_req.SmartServerResponse(('ok', branch_token, repo_token)),
1395
 
            response)
1396
 
        # Cleanup
1397
 
        branch.repository.lock_write(repo_token)
1398
 
        branch.repository.dont_leave_lock_in_place()
1399
 
        branch.repository.unlock()
1400
 
        branch.lock_write(branch_token)
1401
 
        branch.dont_leave_lock_in_place()
1402
 
        branch.unlock()
 
411
            SmartServerResponse(('ok', branch_token, repo_token)), response)
1403
412
 
1404
413
    def test_lock_write_with_mismatched_tokens_on_locked_branch(self):
1405
414
        backing = self.get_transport()
1406
 
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
1407
 
        branch = self.make_branch('.', format='knit')
1408
 
        branch_token, repo_token = self.get_lock_tokens(branch)
 
415
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
 
416
        branch = self.make_branch('.')
 
417
        branch_token = branch.lock_write()
 
418
        repo_token = branch.repository.lock_write()
 
419
        branch.repository.unlock()
1409
420
        branch.leave_lock_in_place()
1410
421
        branch.repository.leave_lock_in_place()
1411
422
        branch.unlock()
1412
 
        response = request.execute('',
 
423
        response = request.execute(backing.local_abspath(''),
1413
424
                                   branch_token+'xxx', repo_token)
1414
425
        self.assertEqual(
1415
 
            smart_req.SmartServerResponse(('TokenMismatch',)), response)
1416
 
        # Cleanup
1417
 
        branch.repository.lock_write(repo_token)
1418
 
        branch.repository.dont_leave_lock_in_place()
 
426
            SmartServerResponse(('TokenMismatch',)), response)
 
427
 
 
428
    def test_lock_write_on_locked_repo(self):
 
429
        backing = self.get_transport()
 
430
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
 
431
        branch = self.make_branch('.')
 
432
        branch.repository.lock_write()
 
433
        branch.repository.leave_lock_in_place()
1419
434
        branch.repository.unlock()
1420
 
        branch.lock_write(branch_token)
1421
 
        branch.dont_leave_lock_in_place()
1422
 
        branch.unlock()
1423
 
 
1424
 
    def test_lock_write_on_locked_repo(self):
1425
 
        backing = self.get_transport()
1426
 
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
1427
 
        branch = self.make_branch('.', format='knit')
1428
 
        repo = branch.repository
1429
 
        repo_token = repo.lock_write().repository_token
1430
 
        repo.leave_lock_in_place()
1431
 
        repo.unlock()
1432
 
        response = request.execute('')
 
435
        response = request.execute(backing.local_abspath(''))
1433
436
        self.assertEqual(
1434
 
            smart_req.SmartServerResponse(('LockContention',)), response)
1435
 
        # Cleanup
1436
 
        repo.lock_write(repo_token)
1437
 
        repo.dont_leave_lock_in_place()
1438
 
        repo.unlock()
 
437
            SmartServerResponse(('LockContention',)), response)
1439
438
 
1440
439
    def test_lock_write_on_readonly_transport(self):
1441
440
        backing = self.get_readonly_transport()
1442
 
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
1443
 
        branch = self.make_branch('.')
1444
 
        root = self.get_transport().clone('/')
1445
 
        path = urlutils.relative_url(root.base, self.get_transport().base)
1446
 
        response = request.execute(path)
1447
 
        error_name, lock_str, why_str = response.args
1448
 
        self.assertFalse(response.is_successful())
1449
 
        self.assertEqual('LockFailed', error_name)
1450
 
 
1451
 
 
1452
 
class TestSmartServerBranchRequestGetPhysicalLockStatus(TestLockedBranch):
1453
 
 
1454
 
    def setUp(self):
1455
 
        tests.TestCaseWithMemoryTransport.setUp(self)
1456
 
 
1457
 
    def test_true(self):
1458
 
        backing = self.get_transport()
1459
 
        request = smart_branch.SmartServerBranchRequestGetPhysicalLockStatus(
1460
 
            backing)
1461
 
        branch = self.make_branch('.')
1462
 
        branch_token, repo_token = self.get_lock_tokens(branch)
1463
 
        self.assertEquals(True, branch.get_physical_lock_status())
1464
 
        response = request.execute('')
1465
 
        self.assertEqual(
1466
 
            smart_req.SmartServerResponse(('yes',)), response)
1467
 
        branch.unlock()
1468
 
 
1469
 
    def test_false(self):
1470
 
        backing = self.get_transport()
1471
 
        request = smart_branch.SmartServerBranchRequestGetPhysicalLockStatus(
1472
 
            backing)
1473
 
        branch = self.make_branch('.')
1474
 
        self.assertEquals(False, branch.get_physical_lock_status())
1475
 
        response = request.execute('')
1476
 
        self.assertEqual(
1477
 
            smart_req.SmartServerResponse(('no',)), response)
1478
 
 
1479
 
 
1480
 
class TestSmartServerBranchRequestUnlock(TestLockedBranch):
1481
 
 
1482
 
    def setUp(self):
1483
 
        tests.TestCaseWithMemoryTransport.setUp(self)
 
441
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
 
442
        branch = self.make_branch('.')
 
443
        response = request.execute('')
 
444
        self.assertEqual(
 
445
            SmartServerResponse(('UnlockableTransport',)), response)
 
446
 
 
447
 
 
448
class TestSmartServerBranchRequestUnlock(tests.TestCaseWithTransport):
 
449
 
 
450
    def setUp(self):
 
451
        tests.TestCaseWithTransport.setUp(self)
 
452
        self.reduceLockdirTimeout()
1484
453
 
1485
454
    def test_unlock_on_locked_branch_and_repo(self):
1486
455
        backing = self.get_transport()
1487
 
        request = smart_branch.SmartServerBranchRequestUnlock(backing)
1488
 
        branch = self.make_branch('.', format='knit')
 
456
        request = smart.branch.SmartServerBranchRequestUnlock(backing)
 
457
        branch = self.make_branch('.')
1489
458
        # Lock the branch
1490
 
        branch_token, repo_token = self.get_lock_tokens(branch)
 
459
        branch_token = branch.lock_write()
 
460
        repo_token = branch.repository.lock_write()
 
461
        branch.repository.unlock()
1491
462
        # Unlock the branch (and repo) object, leaving the physical locks
1492
463
        # in place.
1493
464
        branch.leave_lock_in_place()
1494
465
        branch.repository.leave_lock_in_place()
1495
466
        branch.unlock()
1496
 
        response = request.execute('',
 
467
        response = request.execute(backing.local_abspath(''),
1497
468
                                   branch_token, repo_token)
1498
469
        self.assertEqual(
1499
 
            smart_req.SmartServerResponse(('ok',)), response)
 
470
            SmartServerResponse(('ok',)), response)
1500
471
        # The branch is now unlocked.  Verify that with a new branch
1501
472
        # object.
1502
473
        new_branch = branch.bzrdir.open_branch()
1505
476
 
1506
477
    def test_unlock_on_unlocked_branch_unlocked_repo(self):
1507
478
        backing = self.get_transport()
1508
 
        request = smart_branch.SmartServerBranchRequestUnlock(backing)
1509
 
        branch = self.make_branch('.', format='knit')
 
479
        request = smart.branch.SmartServerBranchRequestUnlock(backing)
 
480
        branch = self.make_branch('.')
1510
481
        response = request.execute(
1511
 
            '', 'branch token', 'repo token')
 
482
            backing.local_abspath(''), 'branch token', 'repo token')
1512
483
        self.assertEqual(
1513
 
            smart_req.SmartServerResponse(('TokenMismatch',)), response)
 
484
            SmartServerResponse(('TokenMismatch',)), response)
1514
485
 
1515
486
    def test_unlock_on_unlocked_branch_locked_repo(self):
1516
487
        backing = self.get_transport()
1517
 
        request = smart_branch.SmartServerBranchRequestUnlock(backing)
1518
 
        branch = self.make_branch('.', format='knit')
 
488
        request = smart.branch.SmartServerBranchRequestUnlock(backing)
 
489
        branch = self.make_branch('.')
1519
490
        # Lock the repository.
1520
 
        repo_token = branch.repository.lock_write().repository_token
 
491
        repo_token = branch.repository.lock_write()
1521
492
        branch.repository.leave_lock_in_place()
1522
493
        branch.repository.unlock()
1523
494
        # Issue branch lock_write request on the unlocked branch (with locked
1524
495
        # repo).
1525
 
        response = request.execute('', 'branch token', repo_token)
 
496
        response = request.execute(
 
497
            backing.local_abspath(''), 'branch token', repo_token)
1526
498
        self.assertEqual(
1527
 
            smart_req.SmartServerResponse(('TokenMismatch',)), response)
1528
 
        # Cleanup
1529
 
        branch.repository.lock_write(repo_token)
1530
 
        branch.repository.dont_leave_lock_in_place()
1531
 
        branch.repository.unlock()
1532
 
 
1533
 
 
1534
 
class TestSmartServerRepositoryRequest(tests.TestCaseWithMemoryTransport):
 
499
            SmartServerResponse(('TokenMismatch',)), response)
 
500
 
 
501
 
 
502
class TestSmartServerRepositoryRequest(tests.TestCaseWithTransport):
1535
503
 
1536
504
    def test_no_repository(self):
1537
505
        """Raise NoRepositoryPresent when there is a bzrdir and no repo."""
1540
508
        # its the exact path being looked at and the server is not
1541
509
        # searching.
1542
510
        backing = self.get_transport()
1543
 
        request = smart_repo.SmartServerRepositoryRequest(backing)
 
511
        request = smart.repository.SmartServerRepositoryRequest(backing)
1544
512
        self.make_repository('.', shared=True)
1545
513
        self.make_bzrdir('subdir')
1546
514
        self.assertRaises(errors.NoRepositoryPresent,
1547
 
            request.execute, 'subdir')
1548
 
 
1549
 
 
1550
 
class TestSmartServerRepositoryAddSignatureText(tests.TestCaseWithMemoryTransport):
1551
 
 
1552
 
    def test_add_text(self):
1553
 
        backing = self.get_transport()
1554
 
        request = smart_repo.SmartServerRepositoryAddSignatureText(backing)
1555
 
        tree = self.make_branch_and_memory_tree('.')
1556
 
        write_token = tree.lock_write()
1557
 
        self.addCleanup(tree.unlock)
1558
 
        tree.add('')
1559
 
        tree.commit("Message", rev_id='rev1')
1560
 
        tree.branch.repository.start_write_group()
1561
 
        write_group_tokens = tree.branch.repository.suspend_write_group()
1562
 
        self.assertEqual(None, request.execute('', write_token,
1563
 
            'rev1', *write_group_tokens))
1564
 
        response = request.do_body('somesignature')
1565
 
        self.assertTrue(response.is_successful())
1566
 
        self.assertEqual(response.args[0], 'ok')
1567
 
        write_group_tokens = response.args[1:]
1568
 
        tree.branch.repository.resume_write_group(write_group_tokens)
1569
 
        tree.branch.repository.commit_write_group()
1570
 
        tree.unlock()
1571
 
        self.assertEqual("somesignature",
1572
 
            tree.branch.repository.get_signature_text("rev1"))
1573
 
 
1574
 
 
1575
 
class TestSmartServerRepositoryAllRevisionIds(
1576
 
    tests.TestCaseWithMemoryTransport):
1577
 
 
1578
 
    def test_empty(self):
1579
 
        """An empty body should be returned for an empty repository."""
1580
 
        backing = self.get_transport()
1581
 
        request = smart_repo.SmartServerRepositoryAllRevisionIds(backing)
1582
 
        self.make_repository('.')
1583
 
        self.assertEquals(
1584
 
            smart_req.SuccessfulSmartServerResponse(("ok", ), ""),
1585
 
            request.execute(''))
1586
 
 
1587
 
    def test_some_revisions(self):
1588
 
        """An empty body should be returned for an empty repository."""
1589
 
        backing = self.get_transport()
1590
 
        request = smart_repo.SmartServerRepositoryAllRevisionIds(backing)
1591
 
        tree = self.make_branch_and_memory_tree('.')
1592
 
        tree.lock_write()
1593
 
        tree.add('')
1594
 
        tree.commit(rev_id='origineel', message="message")
1595
 
        tree.commit(rev_id='nog-een-revisie', message="message")
1596
 
        tree.unlock()
1597
 
        self.assertEquals(
1598
 
            smart_req.SuccessfulSmartServerResponse(("ok", ),
1599
 
                "origineel\nnog-een-revisie"),
1600
 
            request.execute(''))
1601
 
 
1602
 
 
1603
 
class TestSmartServerRepositoryBreakLock(tests.TestCaseWithMemoryTransport):
1604
 
 
1605
 
    def test_lock_to_break(self):
1606
 
        backing = self.get_transport()
1607
 
        request = smart_repo.SmartServerRepositoryBreakLock(backing)
1608
 
        tree = self.make_branch_and_memory_tree('.')
1609
 
        tree.branch.repository.lock_write()
1610
 
        self.assertEqual(
1611
 
            smart_req.SuccessfulSmartServerResponse(('ok', ), None),
1612
 
            request.execute(''))
1613
 
 
1614
 
    def test_nothing_to_break(self):
1615
 
        backing = self.get_transport()
1616
 
        request = smart_repo.SmartServerRepositoryBreakLock(backing)
1617
 
        tree = self.make_branch_and_memory_tree('.')
1618
 
        self.assertEqual(
1619
 
            smart_req.SuccessfulSmartServerResponse(('ok', ), None),
1620
 
            request.execute(''))
1621
 
 
1622
 
 
1623
 
class TestSmartServerRepositoryGetParentMap(tests.TestCaseWithMemoryTransport):
1624
 
 
1625
 
    def test_trivial_bzipped(self):
1626
 
        # This tests that the wire encoding is actually bzipped
1627
 
        backing = self.get_transport()
1628
 
        request = smart_repo.SmartServerRepositoryGetParentMap(backing)
1629
 
        tree = self.make_branch_and_memory_tree('.')
1630
 
 
1631
 
        self.assertEqual(None,
1632
 
            request.execute('', 'missing-id'))
1633
 
        # Note that it returns a body that is bzipped.
1634
 
        self.assertEqual(
1635
 
            smart_req.SuccessfulSmartServerResponse(('ok', ), bz2.compress('')),
1636
 
            request.do_body('\n\n0\n'))
1637
 
 
1638
 
    def test_trivial_include_missing(self):
1639
 
        backing = self.get_transport()
1640
 
        request = smart_repo.SmartServerRepositoryGetParentMap(backing)
1641
 
        tree = self.make_branch_and_memory_tree('.')
1642
 
 
1643
 
        self.assertEqual(None,
1644
 
            request.execute('', 'missing-id', 'include-missing:'))
1645
 
        self.assertEqual(
1646
 
            smart_req.SuccessfulSmartServerResponse(('ok', ),
1647
 
                bz2.compress('missing:missing-id')),
1648
 
            request.do_body('\n\n0\n'))
1649
 
 
1650
 
 
1651
 
class TestSmartServerRepositoryGetRevisionGraph(
1652
 
    tests.TestCaseWithMemoryTransport):
 
515
            request.execute, backing.local_abspath('subdir'))
 
516
 
 
517
 
 
518
class TestSmartServerRepositoryGetRevisionGraph(tests.TestCaseWithTransport):
1653
519
 
1654
520
    def test_none_argument(self):
1655
521
        backing = self.get_transport()
1656
 
        request = smart_repo.SmartServerRepositoryGetRevisionGraph(backing)
 
522
        request = smart.repository.SmartServerRepositoryGetRevisionGraph(backing)
1657
523
        tree = self.make_branch_and_memory_tree('.')
1658
524
        tree.lock_write()
1659
525
        tree.add('')
1664
530
        # the lines of revision_id->revision_parent_list has no guaranteed
1665
531
        # order coming out of a dict, so sort both our test and response
1666
532
        lines = sorted([' '.join([r2, r1]), r1])
1667
 
        response = request.execute('', '')
 
533
        response = request.execute(backing.local_abspath(''), '')
1668
534
        response.body = '\n'.join(sorted(response.body.split('\n')))
1669
535
 
1670
536
        self.assertEqual(
1671
 
            smart_req.SmartServerResponse(('ok', ), '\n'.join(lines)), response)
 
537
            SmartServerResponse(('ok', ), '\n'.join(lines)), response)
1672
538
 
1673
539
    def test_specific_revision_argument(self):
1674
540
        backing = self.get_transport()
1675
 
        request = smart_repo.SmartServerRepositoryGetRevisionGraph(backing)
 
541
        request = smart.repository.SmartServerRepositoryGetRevisionGraph(backing)
1676
542
        tree = self.make_branch_and_memory_tree('.')
1677
543
        tree.lock_write()
1678
544
        tree.add('')
1681
547
        r2 = tree.commit('2nd commit', rev_id=u'\xc8'.encode('utf-8'))
1682
548
        tree.unlock()
1683
549
 
1684
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), rev_id_utf8),
1685
 
            request.execute('', rev_id_utf8))
1686
 
 
 
550
        self.assertEqual(SmartServerResponse(('ok', ), rev_id_utf8),
 
551
            request.execute(backing.local_abspath(''), rev_id_utf8))
 
552
    
1687
553
    def test_no_such_revision(self):
1688
554
        backing = self.get_transport()
1689
 
        request = smart_repo.SmartServerRepositoryGetRevisionGraph(backing)
 
555
        request = smart.repository.SmartServerRepositoryGetRevisionGraph(backing)
1690
556
        tree = self.make_branch_and_memory_tree('.')
1691
557
        tree.lock_write()
1692
558
        tree.add('')
1694
560
        tree.unlock()
1695
561
 
1696
562
        # Note that it still returns body (of zero bytes).
1697
 
        self.assertEqual(smart_req.SmartServerResponse(
1698
 
                ('nosuchrevision', 'missingrevision', ), ''),
1699
 
                         request.execute('', 'missingrevision'))
1700
 
 
1701
 
 
1702
 
class TestSmartServerRepositoryGetRevIdForRevno(
1703
 
    tests.TestCaseWithMemoryTransport):
1704
 
 
1705
 
    def test_revno_found(self):
1706
 
        backing = self.get_transport()
1707
 
        request = smart_repo.SmartServerRepositoryGetRevIdForRevno(backing)
1708
 
        tree = self.make_branch_and_memory_tree('.')
1709
 
        tree.lock_write()
1710
 
        tree.add('')
1711
 
        rev1_id_utf8 = u'\xc8'.encode('utf-8')
1712
 
        rev2_id_utf8 = u'\xc9'.encode('utf-8')
1713
 
        tree.commit('1st commit', rev_id=rev1_id_utf8)
1714
 
        tree.commit('2nd commit', rev_id=rev2_id_utf8)
1715
 
        tree.unlock()
1716
 
 
1717
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', rev1_id_utf8)),
1718
 
            request.execute('', 1, (2, rev2_id_utf8)))
1719
 
 
1720
 
    def test_known_revid_missing(self):
1721
 
        backing = self.get_transport()
1722
 
        request = smart_repo.SmartServerRepositoryGetRevIdForRevno(backing)
1723
 
        repo = self.make_repository('.')
1724
 
        self.assertEqual(
1725
 
            smart_req.FailedSmartServerResponse(('nosuchrevision', 'ghost')),
1726
 
            request.execute('', 1, (2, 'ghost')))
1727
 
 
1728
 
    def test_history_incomplete(self):
1729
 
        backing = self.get_transport()
1730
 
        request = smart_repo.SmartServerRepositoryGetRevIdForRevno(backing)
1731
 
        parent = self.make_branch_and_memory_tree('parent', format='1.9')
1732
 
        parent.lock_write()
1733
 
        parent.add([''], ['TREE_ROOT'])
1734
 
        r1 = parent.commit(message='first commit')
1735
 
        r2 = parent.commit(message='second commit')
1736
 
        parent.unlock()
1737
 
        local = self.make_branch_and_memory_tree('local', format='1.9')
1738
 
        local.branch.pull(parent.branch)
1739
 
        local.set_parent_ids([r2])
1740
 
        r3 = local.commit(message='local commit')
1741
 
        local.branch.create_clone_on_transport(
1742
 
            self.get_transport('stacked'), stacked_on=self.get_url('parent'))
1743
 
        self.assertEqual(
1744
 
            smart_req.SmartServerResponse(('history-incomplete', 2, r2)),
1745
 
            request.execute('stacked', 1, (3, r3)))
1746
 
 
1747
 
 
1748
 
class TestSmartServerRepositoryIterRevisions(
1749
 
    tests.TestCaseWithMemoryTransport):
1750
 
 
1751
 
    def test_basic(self):
1752
 
        backing = self.get_transport()
1753
 
        request = smart_repo.SmartServerRepositoryIterRevisions(backing)
1754
 
        tree = self.make_branch_and_memory_tree('.', format='2a')
1755
 
        tree.lock_write()
1756
 
        tree.add('')
1757
 
        tree.commit('1st commit', rev_id="rev1")
1758
 
        tree.commit('2nd commit', rev_id="rev2")
1759
 
        tree.unlock()
1760
 
 
1761
 
        self.assertIs(None, request.execute(''))
1762
 
        response = request.do_body("rev1\nrev2")
1763
 
        self.assertTrue(response.is_successful())
1764
 
        # Format 2a uses serializer format 10
1765
 
        self.assertEquals(response.args, ("ok", "10"))
1766
 
 
1767
 
        self.addCleanup(tree.branch.lock_read().unlock)
1768
 
        entries = [zlib.compress(record.get_bytes_as("fulltext")) for record in
1769
 
            tree.branch.repository.revisions.get_record_stream(
1770
 
            [("rev1", ), ("rev2", )], "unordered", True)]
1771
 
 
1772
 
        contents = "".join(response.body_stream)
1773
 
        self.assertTrue(contents in (
1774
 
            "".join([entries[0], entries[1]]),
1775
 
            "".join([entries[1], entries[0]])))
1776
 
 
1777
 
    def test_missing(self):
1778
 
        backing = self.get_transport()
1779
 
        request = smart_repo.SmartServerRepositoryIterRevisions(backing)
1780
 
        tree = self.make_branch_and_memory_tree('.', format='2a')
1781
 
 
1782
 
        self.assertIs(None, request.execute(''))
1783
 
        response = request.do_body("rev1\nrev2")
1784
 
        self.assertTrue(response.is_successful())
1785
 
        # Format 2a uses serializer format 10
1786
 
        self.assertEquals(response.args, ("ok", "10"))
1787
 
 
1788
 
        contents = "".join(response.body_stream)
1789
 
        self.assertEquals(contents, "")
1790
 
 
1791
 
 
1792
 
class GetStreamTestBase(tests.TestCaseWithMemoryTransport):
1793
 
 
1794
 
    def make_two_commit_repo(self):
1795
 
        tree = self.make_branch_and_memory_tree('.')
1796
 
        tree.lock_write()
1797
 
        tree.add('')
1798
 
        r1 = tree.commit('1st commit')
1799
 
        r2 = tree.commit('2nd commit', rev_id=u'\xc8'.encode('utf-8'))
1800
 
        tree.unlock()
1801
 
        repo = tree.branch.repository
1802
 
        return repo, r1, r2
1803
 
 
1804
 
 
1805
 
class TestSmartServerRepositoryGetStream(GetStreamTestBase):
1806
 
 
1807
 
    def test_ancestry_of(self):
1808
 
        """The search argument may be a 'ancestry-of' some heads'."""
1809
 
        backing = self.get_transport()
1810
 
        request = smart_repo.SmartServerRepositoryGetStream(backing)
1811
 
        repo, r1, r2 = self.make_two_commit_repo()
1812
 
        fetch_spec = ['ancestry-of', r2]
1813
 
        lines = '\n'.join(fetch_spec)
1814
 
        request.execute('', repo._format.network_name())
1815
 
        response = request.do_body(lines)
1816
 
        self.assertEqual(('ok',), response.args)
1817
 
        stream_bytes = ''.join(response.body_stream)
1818
 
        self.assertStartsWith(stream_bytes, 'Bazaar pack format 1')
1819
 
 
1820
 
    def test_search(self):
1821
 
        """The search argument may be a 'search' of some explicit keys."""
1822
 
        backing = self.get_transport()
1823
 
        request = smart_repo.SmartServerRepositoryGetStream(backing)
1824
 
        repo, r1, r2 = self.make_two_commit_repo()
1825
 
        fetch_spec = ['search', '%s %s' % (r1, r2), 'null:', '2']
1826
 
        lines = '\n'.join(fetch_spec)
1827
 
        request.execute('', repo._format.network_name())
1828
 
        response = request.do_body(lines)
1829
 
        self.assertEqual(('ok',), response.args)
1830
 
        stream_bytes = ''.join(response.body_stream)
1831
 
        self.assertStartsWith(stream_bytes, 'Bazaar pack format 1')
1832
 
 
1833
 
    def test_search_everything(self):
1834
 
        """A search of 'everything' returns a stream."""
1835
 
        backing = self.get_transport()
1836
 
        request = smart_repo.SmartServerRepositoryGetStream_1_19(backing)
1837
 
        repo, r1, r2 = self.make_two_commit_repo()
1838
 
        serialised_fetch_spec = 'everything'
1839
 
        request.execute('', repo._format.network_name())
1840
 
        response = request.do_body(serialised_fetch_spec)
1841
 
        self.assertEqual(('ok',), response.args)
1842
 
        stream_bytes = ''.join(response.body_stream)
1843
 
        self.assertStartsWith(stream_bytes, 'Bazaar pack format 1')
1844
 
 
1845
 
 
1846
 
class TestSmartServerRequestHasRevision(tests.TestCaseWithMemoryTransport):
 
563
        self.assertEqual(
 
564
            SmartServerResponse(('nosuchrevision', 'missingrevision', ), ''),
 
565
            request.execute(backing.local_abspath(''), 'missingrevision'))
 
566
 
 
567
 
 
568
class TestSmartServerRequestHasRevision(tests.TestCaseWithTransport):
1847
569
 
1848
570
    def test_missing_revision(self):
1849
571
        """For a missing revision, ('no', ) is returned."""
1850
572
        backing = self.get_transport()
1851
 
        request = smart_repo.SmartServerRequestHasRevision(backing)
 
573
        request = smart.repository.SmartServerRequestHasRevision(backing)
1852
574
        self.make_repository('.')
1853
 
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
1854
 
            request.execute('', 'revid'))
 
575
        self.assertEqual(SmartServerResponse(('no', )),
 
576
            request.execute(backing.local_abspath(''), 'revid'))
1855
577
 
1856
578
    def test_present_revision(self):
1857
579
        """For a present revision, ('yes', ) is returned."""
1858
580
        backing = self.get_transport()
1859
 
        request = smart_repo.SmartServerRequestHasRevision(backing)
 
581
        request = smart.repository.SmartServerRequestHasRevision(backing)
1860
582
        tree = self.make_branch_and_memory_tree('.')
1861
583
        tree.lock_write()
1862
584
        tree.add('')
1864
586
        r1 = tree.commit('a commit', rev_id=rev_id_utf8)
1865
587
        tree.unlock()
1866
588
        self.assertTrue(tree.branch.repository.has_revision(rev_id_utf8))
1867
 
        self.assertEqual(smart_req.SmartServerResponse(('yes', )),
1868
 
            request.execute('', rev_id_utf8))
1869
 
 
1870
 
 
1871
 
class TestSmartServerRepositoryIterFilesBytes(tests.TestCaseWithTransport):
1872
 
 
1873
 
    def test_single(self):
1874
 
        backing = self.get_transport()
1875
 
        request = smart_repo.SmartServerRepositoryIterFilesBytes(backing)
1876
 
        t = self.make_branch_and_tree('.')
1877
 
        self.addCleanup(t.lock_write().unlock)
1878
 
        self.build_tree_contents([("file", "somecontents")])
1879
 
        t.add(["file"], ["thefileid"])
1880
 
        t.commit(rev_id='somerev', message="add file")
1881
 
        self.assertIs(None, request.execute(''))
1882
 
        response = request.do_body("thefileid\0somerev\n")
1883
 
        self.assertTrue(response.is_successful())
1884
 
        self.assertEquals(response.args, ("ok", ))
1885
 
        self.assertEquals("".join(response.body_stream),
1886
 
            "ok\x000\n" + zlib.compress("somecontents"))
1887
 
 
1888
 
    def test_missing(self):
1889
 
        backing = self.get_transport()
1890
 
        request = smart_repo.SmartServerRepositoryIterFilesBytes(backing)
1891
 
        t = self.make_branch_and_tree('.')
1892
 
        self.addCleanup(t.lock_write().unlock)
1893
 
        self.assertIs(None, request.execute(''))
1894
 
        response = request.do_body("thefileid\0revision\n")
1895
 
        self.assertTrue(response.is_successful())
1896
 
        self.assertEquals(response.args, ("ok", ))
1897
 
        self.assertEquals("".join(response.body_stream),
1898
 
            "absent\x00thefileid\x00revision\x000\n")
1899
 
 
1900
 
 
1901
 
class TestSmartServerRequestHasSignatureForRevisionId(
1902
 
        tests.TestCaseWithMemoryTransport):
1903
 
 
1904
 
    def test_missing_revision(self):
1905
 
        """For a missing revision, NoSuchRevision is returned."""
1906
 
        backing = self.get_transport()
1907
 
        request = smart_repo.SmartServerRequestHasSignatureForRevisionId(
1908
 
            backing)
1909
 
        self.make_repository('.')
1910
 
        self.assertEqual(
1911
 
            smart_req.FailedSmartServerResponse(
1912
 
                ('nosuchrevision', 'revid'), None),
1913
 
            request.execute('', 'revid'))
1914
 
 
1915
 
    def test_missing_signature(self):
1916
 
        """For a missing signature, ('no', ) is returned."""
1917
 
        backing = self.get_transport()
1918
 
        request = smart_repo.SmartServerRequestHasSignatureForRevisionId(
1919
 
            backing)
1920
 
        tree = self.make_branch_and_memory_tree('.')
1921
 
        tree.lock_write()
1922
 
        tree.add('')
1923
 
        r1 = tree.commit('a commit', rev_id='A')
1924
 
        tree.unlock()
1925
 
        self.assertTrue(tree.branch.repository.has_revision('A'))
1926
 
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
1927
 
            request.execute('', 'A'))
1928
 
 
1929
 
    def test_present_signature(self):
1930
 
        """For a present signature, ('yes', ) is returned."""
1931
 
        backing = self.get_transport()
1932
 
        request = smart_repo.SmartServerRequestHasSignatureForRevisionId(
1933
 
            backing)
1934
 
        strategy = gpg.LoopbackGPGStrategy(None)
1935
 
        tree = self.make_branch_and_memory_tree('.')
1936
 
        tree.lock_write()
1937
 
        tree.add('')
1938
 
        r1 = tree.commit('a commit', rev_id='A')
1939
 
        tree.branch.repository.start_write_group()
1940
 
        tree.branch.repository.sign_revision('A', strategy)
1941
 
        tree.branch.repository.commit_write_group()
1942
 
        tree.unlock()
1943
 
        self.assertTrue(tree.branch.repository.has_revision('A'))
1944
 
        self.assertEqual(smart_req.SmartServerResponse(('yes', )),
1945
 
            request.execute('', 'A'))
1946
 
 
1947
 
 
1948
 
class TestSmartServerRepositoryGatherStats(tests.TestCaseWithMemoryTransport):
 
589
        self.assertEqual(SmartServerResponse(('yes', )),
 
590
            request.execute(backing.local_abspath(''), rev_id_utf8))
 
591
 
 
592
 
 
593
class TestSmartServerRepositoryGatherStats(tests.TestCaseWithTransport):
1949
594
 
1950
595
    def test_empty_revid(self):
1951
596
        """With an empty revid, we get only size an number and revisions"""
1952
597
        backing = self.get_transport()
1953
 
        request = smart_repo.SmartServerRepositoryGatherStats(backing)
 
598
        request = smart.repository.SmartServerRepositoryGatherStats(backing)
1954
599
        repository = self.make_repository('.')
1955
600
        stats = repository.gather_stats()
1956
 
        expected_body = 'revisions: 0\n'
1957
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), expected_body),
1958
 
                         request.execute('', '', 'no'))
 
601
        size = stats['size']
 
602
        expected_body = 'revisions: 0\nsize: %d\n' % size
 
603
        self.assertEqual(SmartServerResponse(('ok', ), expected_body),
 
604
                         request.execute(backing.local_abspath(''), '', 'no'))
1959
605
 
1960
606
    def test_revid_with_committers(self):
1961
607
        """For a revid we get more infos."""
1962
608
        backing = self.get_transport()
1963
609
        rev_id_utf8 = u'\xc8abc'.encode('utf-8')
1964
 
        request = smart_repo.SmartServerRepositoryGatherStats(backing)
 
610
        request = smart.repository.SmartServerRepositoryGatherStats(backing)
1965
611
        tree = self.make_branch_and_memory_tree('.')
1966
612
        tree.lock_write()
1967
613
        tree.add('')
1972
618
        tree.unlock()
1973
619
 
1974
620
        stats = tree.branch.repository.gather_stats()
 
621
        size = stats['size']
1975
622
        expected_body = ('firstrev: 123456.200 3600\n'
1976
623
                         'latestrev: 654321.400 0\n'
1977
 
                         'revisions: 2\n')
1978
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), expected_body),
1979
 
                         request.execute('',
 
624
                         'revisions: 2\n'
 
625
                         'size: %d\n' % size)
 
626
        self.assertEqual(SmartServerResponse(('ok', ), expected_body),
 
627
                         request.execute(backing.local_abspath(''),
1980
628
                                         rev_id_utf8, 'no'))
1981
629
 
1982
630
    def test_not_empty_repository_with_committers(self):
1983
631
        """For a revid and requesting committers we get the whole thing."""
1984
632
        backing = self.get_transport()
1985
633
        rev_id_utf8 = u'\xc8abc'.encode('utf-8')
1986
 
        request = smart_repo.SmartServerRepositoryGatherStats(backing)
 
634
        request = smart.repository.SmartServerRepositoryGatherStats(backing)
1987
635
        tree = self.make_branch_and_memory_tree('.')
1988
636
        tree.lock_write()
1989
637
        tree.add('')
1995
643
        tree.unlock()
1996
644
        stats = tree.branch.repository.gather_stats()
1997
645
 
 
646
        size = stats['size']
1998
647
        expected_body = ('committers: 2\n'
1999
648
                         'firstrev: 123456.200 3600\n'
2000
649
                         'latestrev: 654321.400 0\n'
2001
 
                         'revisions: 2\n')
2002
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), expected_body),
2003
 
                         request.execute('',
 
650
                         'revisions: 2\n'
 
651
                         'size: %d\n' % size)
 
652
        self.assertEqual(SmartServerResponse(('ok', ), expected_body),
 
653
                         request.execute(backing.local_abspath(''),
2004
654
                                         rev_id_utf8, 'yes'))
2005
655
 
2006
 
    def test_unknown_revid(self):
2007
 
        """An unknown revision id causes a 'nosuchrevision' error."""
2008
 
        backing = self.get_transport()
2009
 
        request = smart_repo.SmartServerRepositoryGatherStats(backing)
2010
 
        repository = self.make_repository('.')
2011
 
        expected_body = 'revisions: 0\n'
2012
 
        self.assertEqual(
2013
 
            smart_req.FailedSmartServerResponse(
2014
 
                ('nosuchrevision', 'mia'), None),
2015
 
            request.execute('', 'mia', 'yes'))
2016
 
 
2017
 
 
2018
 
class TestSmartServerRepositoryIsShared(tests.TestCaseWithMemoryTransport):
 
656
 
 
657
class TestSmartServerRepositoryIsShared(tests.TestCaseWithTransport):
2019
658
 
2020
659
    def test_is_shared(self):
2021
660
        """For a shared repository, ('yes', ) is returned."""
2022
661
        backing = self.get_transport()
2023
 
        request = smart_repo.SmartServerRepositoryIsShared(backing)
 
662
        request = smart.repository.SmartServerRepositoryIsShared(backing)
2024
663
        self.make_repository('.', shared=True)
2025
 
        self.assertEqual(smart_req.SmartServerResponse(('yes', )),
2026
 
            request.execute('', ))
 
664
        self.assertEqual(SmartServerResponse(('yes', )),
 
665
            request.execute(backing.local_abspath(''), ))
2027
666
 
2028
667
    def test_is_not_shared(self):
2029
668
        """For a shared repository, ('no', ) is returned."""
2030
669
        backing = self.get_transport()
2031
 
        request = smart_repo.SmartServerRepositoryIsShared(backing)
 
670
        request = smart.repository.SmartServerRepositoryIsShared(backing)
2032
671
        self.make_repository('.', shared=False)
2033
 
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
2034
 
            request.execute('', ))
2035
 
 
2036
 
 
2037
 
class TestSmartServerRepositoryGetRevisionSignatureText(
2038
 
        tests.TestCaseWithMemoryTransport):
2039
 
 
2040
 
    def test_get_signature(self):
2041
 
        backing = self.get_transport()
2042
 
        request = smart_repo.SmartServerRepositoryGetRevisionSignatureText(
2043
 
            backing)
2044
 
        bb = self.make_branch_builder('.')
2045
 
        bb.build_commit(rev_id='A')
2046
 
        repo = bb.get_branch().repository
2047
 
        strategy = gpg.LoopbackGPGStrategy(None)
2048
 
        self.addCleanup(repo.lock_write().unlock)
2049
 
        repo.start_write_group()
2050
 
        repo.sign_revision('A', strategy)
2051
 
        repo.commit_write_group()
2052
 
        expected_body = (
2053
 
            '-----BEGIN PSEUDO-SIGNED CONTENT-----\n' +
2054
 
            Testament.from_revision(repo, 'A').as_short_text() +
2055
 
            '-----END PSEUDO-SIGNED CONTENT-----\n')
2056
 
        self.assertEqual(
2057
 
            smart_req.SmartServerResponse(('ok', ), expected_body),
2058
 
            request.execute('', 'A'))
2059
 
 
2060
 
 
2061
 
class TestSmartServerRepositoryMakeWorkingTrees(
2062
 
        tests.TestCaseWithMemoryTransport):
2063
 
 
2064
 
    def test_make_working_trees(self):
2065
 
        """For a repository with working trees, ('yes', ) is returned."""
2066
 
        backing = self.get_transport()
2067
 
        request = smart_repo.SmartServerRepositoryMakeWorkingTrees(backing)
2068
 
        r = self.make_repository('.')
2069
 
        r.set_make_working_trees(True)
2070
 
        self.assertEqual(smart_req.SmartServerResponse(('yes', )),
2071
 
            request.execute('', ))
2072
 
 
2073
 
    def test_is_not_shared(self):
2074
 
        """For a repository with working trees, ('no', ) is returned."""
2075
 
        backing = self.get_transport()
2076
 
        request = smart_repo.SmartServerRepositoryMakeWorkingTrees(backing)
2077
 
        r = self.make_repository('.')
2078
 
        r.set_make_working_trees(False)
2079
 
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
2080
 
            request.execute('', ))
2081
 
 
2082
 
 
2083
 
class TestSmartServerRepositoryLockWrite(tests.TestCaseWithMemoryTransport):
 
672
        self.assertEqual(SmartServerResponse(('no', )),
 
673
            request.execute(backing.local_abspath(''), ))
 
674
 
 
675
 
 
676
class TestSmartServerRepositoryLockWrite(tests.TestCaseWithTransport):
 
677
 
 
678
    def setUp(self):
 
679
        tests.TestCaseWithTransport.setUp(self)
 
680
        self.reduceLockdirTimeout()
2084
681
 
2085
682
    def test_lock_write_on_unlocked_repo(self):
2086
683
        backing = self.get_transport()
2087
 
        request = smart_repo.SmartServerRepositoryLockWrite(backing)
2088
 
        repository = self.make_repository('.', format='knit')
2089
 
        response = request.execute('')
 
684
        request = smart.repository.SmartServerRepositoryLockWrite(backing)
 
685
        repository = self.make_repository('.')
 
686
        response = request.execute(backing.local_abspath(''))
2090
687
        nonce = repository.control_files._lock.peek().get('nonce')
2091
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', nonce)), response)
 
688
        self.assertEqual(SmartServerResponse(('ok', nonce)), response)
2092
689
        # The repository is now locked.  Verify that with a new repository
2093
690
        # object.
2094
691
        new_repo = repository.bzrdir.open_repository()
2095
692
        self.assertRaises(errors.LockContention, new_repo.lock_write)
2096
 
        # Cleanup
2097
 
        request = smart_repo.SmartServerRepositoryUnlock(backing)
2098
 
        response = request.execute('', nonce)
2099
693
 
2100
694
    def test_lock_write_on_locked_repo(self):
2101
695
        backing = self.get_transport()
2102
 
        request = smart_repo.SmartServerRepositoryLockWrite(backing)
2103
 
        repository = self.make_repository('.', format='knit')
2104
 
        repo_token = repository.lock_write().repository_token
 
696
        request = smart.repository.SmartServerRepositoryLockWrite(backing)
 
697
        repository = self.make_repository('.')
 
698
        repository.lock_write()
2105
699
        repository.leave_lock_in_place()
2106
700
        repository.unlock()
2107
 
        response = request.execute('')
 
701
        response = request.execute(backing.local_abspath(''))
2108
702
        self.assertEqual(
2109
 
            smart_req.SmartServerResponse(('LockContention',)), response)
2110
 
        # Cleanup
2111
 
        repository.lock_write(repo_token)
2112
 
        repository.dont_leave_lock_in_place()
2113
 
        repository.unlock()
 
703
            SmartServerResponse(('LockContention',)), response)
2114
704
 
2115
705
    def test_lock_write_on_readonly_transport(self):
2116
706
        backing = self.get_readonly_transport()
2117
 
        request = smart_repo.SmartServerRepositoryLockWrite(backing)
2118
 
        repository = self.make_repository('.', format='knit')
 
707
        request = smart.repository.SmartServerRepositoryLockWrite(backing)
 
708
        repository = self.make_repository('.')
2119
709
        response = request.execute('')
2120
 
        self.assertFalse(response.is_successful())
2121
 
        self.assertEqual('LockFailed', response.args[0])
2122
 
 
2123
 
 
2124
 
class TestInsertStreamBase(tests.TestCaseWithMemoryTransport):
2125
 
 
2126
 
    def make_empty_byte_stream(self, repo):
2127
 
        byte_stream = smart_repo._stream_to_byte_stream([], repo._format)
2128
 
        return ''.join(byte_stream)
2129
 
 
2130
 
 
2131
 
class TestSmartServerRepositoryInsertStream(TestInsertStreamBase):
2132
 
 
2133
 
    def test_insert_stream_empty(self):
2134
 
        backing = self.get_transport()
2135
 
        request = smart_repo.SmartServerRepositoryInsertStream(backing)
2136
 
        repository = self.make_repository('.')
2137
 
        response = request.execute('', '')
2138
 
        self.assertEqual(None, response)
2139
 
        response = request.do_chunk(self.make_empty_byte_stream(repository))
2140
 
        self.assertEqual(None, response)
2141
 
        response = request.do_end()
2142
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', )), response)
2143
 
 
2144
 
 
2145
 
class TestSmartServerRepositoryInsertStreamLocked(TestInsertStreamBase):
2146
 
 
2147
 
    def test_insert_stream_empty(self):
2148
 
        backing = self.get_transport()
2149
 
        request = smart_repo.SmartServerRepositoryInsertStreamLocked(
2150
 
            backing)
2151
 
        repository = self.make_repository('.', format='knit')
2152
 
        lock_token = repository.lock_write().repository_token
2153
 
        response = request.execute('', '', lock_token)
2154
 
        self.assertEqual(None, response)
2155
 
        response = request.do_chunk(self.make_empty_byte_stream(repository))
2156
 
        self.assertEqual(None, response)
2157
 
        response = request.do_end()
2158
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', )), response)
2159
 
        repository.unlock()
2160
 
 
2161
 
    def test_insert_stream_with_wrong_lock_token(self):
2162
 
        backing = self.get_transport()
2163
 
        request = smart_repo.SmartServerRepositoryInsertStreamLocked(
2164
 
            backing)
2165
 
        repository = self.make_repository('.', format='knit')
2166
 
        lock_token = repository.lock_write().repository_token
2167
 
        self.assertRaises(
2168
 
            errors.TokenMismatch, request.execute, '', '', 'wrong-token')
2169
 
        repository.unlock()
2170
 
 
2171
 
 
2172
 
class TestSmartServerRepositoryUnlock(tests.TestCaseWithMemoryTransport):
 
710
        self.assertEqual(
 
711
            SmartServerResponse(('UnlockableTransport',)), response)
 
712
 
 
713
 
 
714
class TestSmartServerRepositoryUnlock(tests.TestCaseWithTransport):
2173
715
 
2174
716
    def setUp(self):
2175
 
        tests.TestCaseWithMemoryTransport.setUp(self)
 
717
        tests.TestCaseWithTransport.setUp(self)
 
718
        self.reduceLockdirTimeout()
2176
719
 
2177
720
    def test_unlock_on_locked_repo(self):
2178
721
        backing = self.get_transport()
2179
 
        request = smart_repo.SmartServerRepositoryUnlock(backing)
2180
 
        repository = self.make_repository('.', format='knit')
2181
 
        token = repository.lock_write().repository_token
 
722
        request = smart.repository.SmartServerRepositoryUnlock(backing)
 
723
        repository = self.make_repository('.')
 
724
        token = repository.lock_write()
2182
725
        repository.leave_lock_in_place()
2183
726
        repository.unlock()
2184
 
        response = request.execute('', token)
 
727
        response = request.execute(backing.local_abspath(''), token)
2185
728
        self.assertEqual(
2186
 
            smart_req.SmartServerResponse(('ok',)), response)
 
729
            SmartServerResponse(('ok',)), response)
2187
730
        # The repository is now unlocked.  Verify that with a new repository
2188
731
        # object.
2189
732
        new_repo = repository.bzrdir.open_repository()
2192
735
 
2193
736
    def test_unlock_on_unlocked_repo(self):
2194
737
        backing = self.get_transport()
2195
 
        request = smart_repo.SmartServerRepositoryUnlock(backing)
2196
 
        repository = self.make_repository('.', format='knit')
2197
 
        response = request.execute('', 'some token')
 
738
        request = smart.repository.SmartServerRepositoryUnlock(backing)
 
739
        repository = self.make_repository('.')
 
740
        response = request.execute(backing.local_abspath(''), 'some token')
2198
741
        self.assertEqual(
2199
 
            smart_req.SmartServerResponse(('TokenMismatch',)), response)
2200
 
 
2201
 
 
2202
 
class TestSmartServerRepositoryGetPhysicalLockStatus(
2203
 
    tests.TestCaseWithTransport):
2204
 
 
2205
 
    def test_with_write_lock(self):
2206
 
        backing = self.get_transport()
2207
 
        repo = self.make_repository('.')
2208
 
        self.addCleanup(repo.lock_write().unlock)
2209
 
        # lock_write() doesn't necessarily actually take a physical
2210
 
        # lock out.
2211
 
        if repo.get_physical_lock_status():
2212
 
            expected = 'yes'
2213
 
        else:
2214
 
            expected = 'no'
2215
 
        request_class = smart_repo.SmartServerRepositoryGetPhysicalLockStatus
2216
 
        request = request_class(backing)
2217
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse((expected,)),
2218
 
            request.execute('', ))
2219
 
 
2220
 
    def test_without_write_lock(self):
2221
 
        backing = self.get_transport()
2222
 
        repo = self.make_repository('.')
2223
 
        self.assertEquals(False, repo.get_physical_lock_status())
2224
 
        request_class = smart_repo.SmartServerRepositoryGetPhysicalLockStatus
2225
 
        request = request_class(backing)
2226
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(('no',)),
2227
 
            request.execute('', ))
2228
 
 
2229
 
 
2230
 
class TestSmartServerRepositoryReconcile(tests.TestCaseWithTransport):
2231
 
 
2232
 
    def test_reconcile(self):
2233
 
        backing = self.get_transport()
2234
 
        repo = self.make_repository('.')
2235
 
        token = repo.lock_write().repository_token
2236
 
        self.addCleanup(repo.unlock)
2237
 
        request_class = smart_repo.SmartServerRepositoryReconcile
2238
 
        request = request_class(backing)
2239
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(
2240
 
            ('ok', ),
2241
 
             'garbage_inventories: 0\n'
2242
 
             'inconsistent_parents: 0\n'),
2243
 
            request.execute('', token))
2244
 
 
2245
 
 
2246
 
class TestSmartServerIsReadonly(tests.TestCaseWithMemoryTransport):
 
742
            SmartServerResponse(('TokenMismatch',)), response)
 
743
 
 
744
 
 
745
class TestSmartServerRepositoryTarball(tests.TestCaseWithTransport):
 
746
 
 
747
    def test_repository_tarball(self):
 
748
        backing = self.get_transport()
 
749
        request = smart.repository.SmartServerRepositoryTarball(backing)
 
750
        repository = self.make_repository('.')
 
751
        # make some extraneous junk in the repository directory which should
 
752
        # not be copied
 
753
        self.build_tree(['.bzr/repository/extra-junk'])
 
754
        response = request.execute(backing.local_abspath(''), 'bz2')
 
755
        self.assertEqual(('ok',), response.args)
 
756
        # body should be a tbz2
 
757
        body_file = StringIO(response.body)
 
758
        body_tar = tarfile.open('body_tar.tbz2', fileobj=body_file,
 
759
            mode='r|bz2')
 
760
        # let's make sure there are some key repository components inside it.
 
761
        # the tarfile returns directories with trailing slashes...
 
762
        names = set([n.rstrip('/') for n in body_tar.getnames()])
 
763
        self.assertTrue('.bzr/repository/lock' in names)
 
764
        self.assertTrue('.bzr/repository/format' in names)
 
765
        self.assertTrue('.bzr/repository/extra-junk' not in names,
 
766
            "extraneous file present in tar file")
 
767
 
 
768
 
 
769
class TestSmartServerIsReadonly(tests.TestCaseWithTransport):
2247
770
 
2248
771
    def test_is_readonly_no(self):
2249
772
        backing = self.get_transport()
2250
 
        request = smart_req.SmartServerIsReadonly(backing)
 
773
        request = smart.request.SmartServerIsReadonly(backing)
2251
774
        response = request.execute()
2252
775
        self.assertEqual(
2253
 
            smart_req.SmartServerResponse(('no',)), response)
 
776
            SmartServerResponse(('no',)), response)
2254
777
 
2255
778
    def test_is_readonly_yes(self):
2256
779
        backing = self.get_readonly_transport()
2257
 
        request = smart_req.SmartServerIsReadonly(backing)
 
780
        request = smart.request.SmartServerIsReadonly(backing)
2258
781
        response = request.execute()
2259
782
        self.assertEqual(
2260
 
            smart_req.SmartServerResponse(('yes',)), response)
2261
 
 
2262
 
 
2263
 
class TestSmartServerRepositorySetMakeWorkingTrees(
2264
 
    tests.TestCaseWithMemoryTransport):
2265
 
 
2266
 
    def test_set_false(self):
2267
 
        backing = self.get_transport()
2268
 
        repo = self.make_repository('.', shared=True)
2269
 
        repo.set_make_working_trees(True)
2270
 
        request_class = smart_repo.SmartServerRepositorySetMakeWorkingTrees
2271
 
        request = request_class(backing)
2272
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
2273
 
            request.execute('', 'False'))
2274
 
        repo = repo.bzrdir.open_repository()
2275
 
        self.assertFalse(repo.make_working_trees())
2276
 
 
2277
 
    def test_set_true(self):
2278
 
        backing = self.get_transport()
2279
 
        repo = self.make_repository('.', shared=True)
2280
 
        repo.set_make_working_trees(False)
2281
 
        request_class = smart_repo.SmartServerRepositorySetMakeWorkingTrees
2282
 
        request = request_class(backing)
2283
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
2284
 
            request.execute('', 'True'))
2285
 
        repo = repo.bzrdir.open_repository()
2286
 
        self.assertTrue(repo.make_working_trees())
2287
 
 
2288
 
 
2289
 
class TestSmartServerRepositoryGetSerializerFormat(
2290
 
    tests.TestCaseWithMemoryTransport):
2291
 
 
2292
 
    def test_get_serializer_format(self):
2293
 
        backing = self.get_transport()
2294
 
        repo = self.make_repository('.', format='2a')
2295
 
        request_class = smart_repo.SmartServerRepositoryGetSerializerFormat
2296
 
        request = request_class(backing)
2297
 
        self.assertEqual(
2298
 
            smart_req.SuccessfulSmartServerResponse(('ok', '10')),
2299
 
            request.execute(''))
2300
 
 
2301
 
 
2302
 
class TestSmartServerRepositoryWriteGroup(
2303
 
    tests.TestCaseWithMemoryTransport):
2304
 
 
2305
 
    def test_start_write_group(self):
2306
 
        backing = self.get_transport()
2307
 
        repo = self.make_repository('.')
2308
 
        lock_token = repo.lock_write().repository_token
2309
 
        self.addCleanup(repo.unlock)
2310
 
        request_class = smart_repo.SmartServerRepositoryStartWriteGroup
2311
 
        request = request_class(backing)
2312
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok', [])),
2313
 
            request.execute('', lock_token))
2314
 
 
2315
 
    def test_start_write_group_unsuspendable(self):
2316
 
        backing = self.get_transport()
2317
 
        repo = self.make_repository('.', format='knit')
2318
 
        lock_token = repo.lock_write().repository_token
2319
 
        self.addCleanup(repo.unlock)
2320
 
        request_class = smart_repo.SmartServerRepositoryStartWriteGroup
2321
 
        request = request_class(backing)
2322
 
        self.assertEqual(
2323
 
            smart_req.FailedSmartServerResponse(('UnsuspendableWriteGroup',)),
2324
 
            request.execute('', lock_token))
2325
 
 
2326
 
    def test_commit_write_group(self):
2327
 
        backing = self.get_transport()
2328
 
        repo = self.make_repository('.')
2329
 
        lock_token = repo.lock_write().repository_token
2330
 
        self.addCleanup(repo.unlock)
2331
 
        repo.start_write_group()
2332
 
        tokens = repo.suspend_write_group()
2333
 
        request_class = smart_repo.SmartServerRepositoryCommitWriteGroup
2334
 
        request = request_class(backing)
2335
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
2336
 
            request.execute('', lock_token, tokens))
2337
 
 
2338
 
    def test_abort_write_group(self):
2339
 
        backing = self.get_transport()
2340
 
        repo = self.make_repository('.')
2341
 
        lock_token = repo.lock_write().repository_token
2342
 
        repo.start_write_group()
2343
 
        tokens = repo.suspend_write_group()
2344
 
        self.addCleanup(repo.unlock)
2345
 
        request_class = smart_repo.SmartServerRepositoryAbortWriteGroup
2346
 
        request = request_class(backing)
2347
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
2348
 
            request.execute('', lock_token, tokens))
2349
 
 
2350
 
    def test_check_write_group(self):
2351
 
        backing = self.get_transport()
2352
 
        repo = self.make_repository('.')
2353
 
        lock_token = repo.lock_write().repository_token
2354
 
        repo.start_write_group()
2355
 
        tokens = repo.suspend_write_group()
2356
 
        self.addCleanup(repo.unlock)
2357
 
        request_class = smart_repo.SmartServerRepositoryCheckWriteGroup
2358
 
        request = request_class(backing)
2359
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
2360
 
            request.execute('', lock_token, tokens))
2361
 
 
2362
 
    def test_check_write_group_invalid(self):
2363
 
        backing = self.get_transport()
2364
 
        repo = self.make_repository('.')
2365
 
        lock_token = repo.lock_write().repository_token
2366
 
        self.addCleanup(repo.unlock)
2367
 
        request_class = smart_repo.SmartServerRepositoryCheckWriteGroup
2368
 
        request = request_class(backing)
2369
 
        self.assertEqual(smart_req.FailedSmartServerResponse(
2370
 
            ('UnresumableWriteGroup', ['random'],
2371
 
                'Malformed write group token')),
2372
 
            request.execute('', lock_token, ["random"]))
2373
 
 
2374
 
 
2375
 
class TestSmartServerPackRepositoryAutopack(tests.TestCaseWithTransport):
2376
 
 
2377
 
    def make_repo_needing_autopacking(self, path='.'):
2378
 
        # Make a repo in need of autopacking.
2379
 
        tree = self.make_branch_and_tree('.', format='pack-0.92')
2380
 
        repo = tree.branch.repository
2381
 
        # monkey-patch the pack collection to disable autopacking
2382
 
        repo._pack_collection._max_pack_count = lambda count: count
2383
 
        for x in range(10):
2384
 
            tree.commit('commit %s' % x)
2385
 
        self.assertEqual(10, len(repo._pack_collection.names()))
2386
 
        del repo._pack_collection._max_pack_count
2387
 
        return repo
2388
 
 
2389
 
    def test_autopack_needed(self):
2390
 
        repo = self.make_repo_needing_autopacking()
2391
 
        repo.lock_write()
2392
 
        self.addCleanup(repo.unlock)
2393
 
        backing = self.get_transport()
2394
 
        request = smart_packrepo.SmartServerPackRepositoryAutopack(
2395
 
            backing)
2396
 
        response = request.execute('')
2397
 
        self.assertEqual(smart_req.SmartServerResponse(('ok',)), response)
2398
 
        repo._pack_collection.reload_pack_names()
2399
 
        self.assertEqual(1, len(repo._pack_collection.names()))
2400
 
 
2401
 
    def test_autopack_not_needed(self):
2402
 
        tree = self.make_branch_and_tree('.', format='pack-0.92')
2403
 
        repo = tree.branch.repository
2404
 
        repo.lock_write()
2405
 
        self.addCleanup(repo.unlock)
2406
 
        for x in range(9):
2407
 
            tree.commit('commit %s' % x)
2408
 
        backing = self.get_transport()
2409
 
        request = smart_packrepo.SmartServerPackRepositoryAutopack(
2410
 
            backing)
2411
 
        response = request.execute('')
2412
 
        self.assertEqual(smart_req.SmartServerResponse(('ok',)), response)
2413
 
        repo._pack_collection.reload_pack_names()
2414
 
        self.assertEqual(9, len(repo._pack_collection.names()))
2415
 
 
2416
 
    def test_autopack_on_nonpack_format(self):
2417
 
        """A request to autopack a non-pack repo is a no-op."""
2418
 
        repo = self.make_repository('.', format='knit')
2419
 
        backing = self.get_transport()
2420
 
        request = smart_packrepo.SmartServerPackRepositoryAutopack(
2421
 
            backing)
2422
 
        response = request.execute('')
2423
 
        self.assertEqual(smart_req.SmartServerResponse(('ok',)), response)
2424
 
 
2425
 
 
2426
 
class TestSmartServerVfsGet(tests.TestCaseWithMemoryTransport):
2427
 
 
2428
 
    def test_unicode_path(self):
2429
 
        """VFS requests expect unicode paths to be escaped."""
2430
 
        filename = u'foo\N{INTERROBANG}'
2431
 
        filename_escaped = urlutils.escape(filename)
2432
 
        backing = self.get_transport()
2433
 
        request = vfs.GetRequest(backing)
2434
 
        backing.put_bytes_non_atomic(filename_escaped, 'contents')
2435
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), 'contents'),
2436
 
            request.execute(filename_escaped))
 
783
            SmartServerResponse(('yes',)), response)
2437
784
 
2438
785
 
2439
786
class TestHandlers(tests.TestCase):
2440
787
    """Tests for the request.request_handlers object."""
2441
788
 
2442
 
    def test_all_registrations_exist(self):
2443
 
        """All registered request_handlers can be found."""
2444
 
        # If there's a typo in a register_lazy call, this loop will fail with
2445
 
        # an AttributeError.
2446
 
        for key in smart_req.request_handlers.keys():
2447
 
            try:
2448
 
                item = smart_req.request_handlers.get(key)
2449
 
            except AttributeError, e:
2450
 
                raise AttributeError('failed to get %s: %s' % (key, e))
2451
 
 
2452
 
    def assertHandlerEqual(self, verb, handler):
2453
 
        self.assertEqual(smart_req.request_handlers.get(verb), handler)
2454
 
 
2455
789
    def test_registered_methods(self):
2456
790
        """Test that known methods are registered to the correct object."""
2457
 
        self.assertHandlerEqual('Branch.break_lock',
2458
 
            smart_branch.SmartServerBranchBreakLock)
2459
 
        self.assertHandlerEqual('Branch.get_config_file',
2460
 
            smart_branch.SmartServerBranchGetConfigFile)
2461
 
        self.assertHandlerEqual('Branch.put_config_file',
2462
 
            smart_branch.SmartServerBranchPutConfigFile)
2463
 
        self.assertHandlerEqual('Branch.get_parent',
2464
 
            smart_branch.SmartServerBranchGetParent)
2465
 
        self.assertHandlerEqual('Branch.get_physical_lock_status',
2466
 
            smart_branch.SmartServerBranchRequestGetPhysicalLockStatus)
2467
 
        self.assertHandlerEqual('Branch.get_tags_bytes',
2468
 
            smart_branch.SmartServerBranchGetTagsBytes)
2469
 
        self.assertHandlerEqual('Branch.lock_write',
2470
 
            smart_branch.SmartServerBranchRequestLockWrite)
2471
 
        self.assertHandlerEqual('Branch.last_revision_info',
2472
 
            smart_branch.SmartServerBranchRequestLastRevisionInfo)
2473
 
        self.assertHandlerEqual('Branch.revision_history',
2474
 
            smart_branch.SmartServerRequestRevisionHistory)
2475
 
        self.assertHandlerEqual('Branch.revision_id_to_revno',
2476
 
            smart_branch.SmartServerBranchRequestRevisionIdToRevno)
2477
 
        self.assertHandlerEqual('Branch.set_config_option',
2478
 
            smart_branch.SmartServerBranchRequestSetConfigOption)
2479
 
        self.assertHandlerEqual('Branch.set_last_revision',
2480
 
            smart_branch.SmartServerBranchRequestSetLastRevision)
2481
 
        self.assertHandlerEqual('Branch.set_last_revision_info',
2482
 
            smart_branch.SmartServerBranchRequestSetLastRevisionInfo)
2483
 
        self.assertHandlerEqual('Branch.set_last_revision_ex',
2484
 
            smart_branch.SmartServerBranchRequestSetLastRevisionEx)
2485
 
        self.assertHandlerEqual('Branch.set_parent_location',
2486
 
            smart_branch.SmartServerBranchRequestSetParentLocation)
2487
 
        self.assertHandlerEqual('Branch.unlock',
2488
 
            smart_branch.SmartServerBranchRequestUnlock)
2489
 
        self.assertHandlerEqual('BzrDir.destroy_branch',
2490
 
            smart_dir.SmartServerBzrDirRequestDestroyBranch)
2491
 
        self.assertHandlerEqual('BzrDir.find_repository',
2492
 
            smart_dir.SmartServerRequestFindRepositoryV1)
2493
 
        self.assertHandlerEqual('BzrDir.find_repositoryV2',
2494
 
            smart_dir.SmartServerRequestFindRepositoryV2)
2495
 
        self.assertHandlerEqual('BzrDirFormat.initialize',
2496
 
            smart_dir.SmartServerRequestInitializeBzrDir)
2497
 
        self.assertHandlerEqual('BzrDirFormat.initialize_ex_1.16',
2498
 
            smart_dir.SmartServerRequestBzrDirInitializeEx)
2499
 
        self.assertHandlerEqual('BzrDir.checkout_metadir',
2500
 
            smart_dir.SmartServerBzrDirRequestCheckoutMetaDir)
2501
 
        self.assertHandlerEqual('BzrDir.cloning_metadir',
2502
 
            smart_dir.SmartServerBzrDirRequestCloningMetaDir)
2503
 
        self.assertHandlerEqual('BzrDir.get_config_file',
2504
 
            smart_dir.SmartServerBzrDirRequestConfigFile)
2505
 
        self.assertHandlerEqual('BzrDir.open_branch',
2506
 
            smart_dir.SmartServerRequestOpenBranch)
2507
 
        self.assertHandlerEqual('BzrDir.open_branchV2',
2508
 
            smart_dir.SmartServerRequestOpenBranchV2)
2509
 
        self.assertHandlerEqual('BzrDir.open_branchV3',
2510
 
            smart_dir.SmartServerRequestOpenBranchV3)
2511
 
        self.assertHandlerEqual('PackRepository.autopack',
2512
 
            smart_packrepo.SmartServerPackRepositoryAutopack)
2513
 
        self.assertHandlerEqual('Repository.add_signature_text',
2514
 
            smart_repo.SmartServerRepositoryAddSignatureText)
2515
 
        self.assertHandlerEqual('Repository.all_revision_ids',
2516
 
            smart_repo.SmartServerRepositoryAllRevisionIds)
2517
 
        self.assertHandlerEqual('Repository.break_lock',
2518
 
            smart_repo.SmartServerRepositoryBreakLock)
2519
 
        self.assertHandlerEqual('Repository.gather_stats',
2520
 
            smart_repo.SmartServerRepositoryGatherStats)
2521
 
        self.assertHandlerEqual('Repository.get_parent_map',
2522
 
            smart_repo.SmartServerRepositoryGetParentMap)
2523
 
        self.assertHandlerEqual('Repository.get_physical_lock_status',
2524
 
            smart_repo.SmartServerRepositoryGetPhysicalLockStatus)
2525
 
        self.assertHandlerEqual('Repository.get_rev_id_for_revno',
2526
 
            smart_repo.SmartServerRepositoryGetRevIdForRevno)
2527
 
        self.assertHandlerEqual('Repository.get_revision_graph',
2528
 
            smart_repo.SmartServerRepositoryGetRevisionGraph)
2529
 
        self.assertHandlerEqual('Repository.get_revision_signature_text',
2530
 
            smart_repo.SmartServerRepositoryGetRevisionSignatureText)
2531
 
        self.assertHandlerEqual('Repository.get_stream',
2532
 
            smart_repo.SmartServerRepositoryGetStream)
2533
 
        self.assertHandlerEqual('Repository.get_stream_1.19',
2534
 
            smart_repo.SmartServerRepositoryGetStream_1_19)
2535
 
        self.assertHandlerEqual('Repository.iter_revisions',
2536
 
            smart_repo.SmartServerRepositoryIterRevisions)
2537
 
        self.assertHandlerEqual('Repository.has_revision',
2538
 
            smart_repo.SmartServerRequestHasRevision)
2539
 
        self.assertHandlerEqual('Repository.insert_stream',
2540
 
            smart_repo.SmartServerRepositoryInsertStream)
2541
 
        self.assertHandlerEqual('Repository.insert_stream_locked',
2542
 
            smart_repo.SmartServerRepositoryInsertStreamLocked)
2543
 
        self.assertHandlerEqual('Repository.is_shared',
2544
 
            smart_repo.SmartServerRepositoryIsShared)
2545
 
        self.assertHandlerEqual('Repository.iter_files_bytes',
2546
 
            smart_repo.SmartServerRepositoryIterFilesBytes)
2547
 
        self.assertHandlerEqual('Repository.lock_write',
2548
 
            smart_repo.SmartServerRepositoryLockWrite)
2549
 
        self.assertHandlerEqual('Repository.make_working_trees',
2550
 
            smart_repo.SmartServerRepositoryMakeWorkingTrees)
2551
 
        self.assertHandlerEqual('Repository.pack',
2552
 
            smart_repo.SmartServerRepositoryPack)
2553
 
        self.assertHandlerEqual('Repository.reconcile',
2554
 
            smart_repo.SmartServerRepositoryReconcile)
2555
 
        self.assertHandlerEqual('Repository.tarball',
2556
 
            smart_repo.SmartServerRepositoryTarball)
2557
 
        self.assertHandlerEqual('Repository.unlock',
2558
 
            smart_repo.SmartServerRepositoryUnlock)
2559
 
        self.assertHandlerEqual('Repository.start_write_group',
2560
 
            smart_repo.SmartServerRepositoryStartWriteGroup)
2561
 
        self.assertHandlerEqual('Repository.check_write_group',
2562
 
            smart_repo.SmartServerRepositoryCheckWriteGroup)
2563
 
        self.assertHandlerEqual('Repository.commit_write_group',
2564
 
            smart_repo.SmartServerRepositoryCommitWriteGroup)
2565
 
        self.assertHandlerEqual('Repository.abort_write_group',
2566
 
            smart_repo.SmartServerRepositoryAbortWriteGroup)
2567
 
        self.assertHandlerEqual('VersionedFileRepository.get_serializer_format',
2568
 
            smart_repo.SmartServerRepositoryGetSerializerFormat)
2569
 
        self.assertHandlerEqual('VersionedFileRepository.get_inventories',
2570
 
            smart_repo.SmartServerRepositoryGetInventories)
2571
 
        self.assertHandlerEqual('Transport.is_readonly',
2572
 
            smart_req.SmartServerIsReadonly)
2573
 
 
2574
 
 
2575
 
class SmartTCPServerHookTests(tests.TestCaseWithMemoryTransport):
2576
 
    """Tests for SmartTCPServer hooks."""
2577
 
 
2578
 
    def setUp(self):
2579
 
        super(SmartTCPServerHookTests, self).setUp()
2580
 
        self.server = server.SmartTCPServer(self.get_transport())
2581
 
 
2582
 
    def test_run_server_started_hooks(self):
2583
 
        """Test the server started hooks get fired properly."""
2584
 
        started_calls = []
2585
 
        server.SmartTCPServer.hooks.install_named_hook('server_started',
2586
 
            lambda backing_urls, url: started_calls.append((backing_urls, url)),
2587
 
            None)
2588
 
        started_ex_calls = []
2589
 
        server.SmartTCPServer.hooks.install_named_hook('server_started_ex',
2590
 
            lambda backing_urls, url: started_ex_calls.append((backing_urls, url)),
2591
 
            None)
2592
 
        self.server._sockname = ('example.com', 42)
2593
 
        self.server.run_server_started_hooks()
2594
 
        self.assertEquals(started_calls,
2595
 
            [([self.get_transport().base], 'bzr://example.com:42/')])
2596
 
        self.assertEquals(started_ex_calls,
2597
 
            [([self.get_transport().base], self.server)])
2598
 
 
2599
 
    def test_run_server_started_hooks_ipv6(self):
2600
 
        """Test that socknames can contain 4-tuples."""
2601
 
        self.server._sockname = ('::', 42, 0, 0)
2602
 
        started_calls = []
2603
 
        server.SmartTCPServer.hooks.install_named_hook('server_started',
2604
 
            lambda backing_urls, url: started_calls.append((backing_urls, url)),
2605
 
            None)
2606
 
        self.server.run_server_started_hooks()
2607
 
        self.assertEquals(started_calls,
2608
 
                [([self.get_transport().base], 'bzr://:::42/')])
2609
 
 
2610
 
    def test_run_server_stopped_hooks(self):
2611
 
        """Test the server stopped hooks."""
2612
 
        self.server._sockname = ('example.com', 42)
2613
 
        stopped_calls = []
2614
 
        server.SmartTCPServer.hooks.install_named_hook('server_stopped',
2615
 
            lambda backing_urls, url: stopped_calls.append((backing_urls, url)),
2616
 
            None)
2617
 
        self.server.run_server_stopped_hooks()
2618
 
        self.assertEquals(stopped_calls,
2619
 
            [([self.get_transport().base], 'bzr://example.com:42/')])
2620
 
 
2621
 
 
2622
 
class TestSmartServerRepositoryPack(tests.TestCaseWithMemoryTransport):
2623
 
 
2624
 
    def test_pack(self):
2625
 
        backing = self.get_transport()
2626
 
        request = smart_repo.SmartServerRepositoryPack(backing)
2627
 
        tree = self.make_branch_and_memory_tree('.')
2628
 
        repo_token = tree.branch.repository.lock_write().repository_token
2629
 
 
2630
 
        self.assertIs(None, request.execute('', repo_token, False))
2631
 
 
2632
 
        self.assertEqual(
2633
 
            smart_req.SuccessfulSmartServerResponse(('ok', ), ),
2634
 
            request.do_body(''))
2635
 
 
2636
 
 
2637
 
class TestSmartServerRepositoryGetInventories(tests.TestCaseWithTransport):
2638
 
 
2639
 
    def _get_serialized_inventory_delta(self, repository, base_revid, revid):
2640
 
        base_inv = repository.revision_tree(base_revid).inventory
2641
 
        inv = repository.revision_tree(revid).inventory
2642
 
        inv_delta = inv._make_delta(base_inv)
2643
 
        serializer = inventory_delta.InventoryDeltaSerializer(True, False)
2644
 
        return "".join(serializer.delta_to_lines(base_revid, revid, inv_delta))
2645
 
 
2646
 
    def test_single(self):
2647
 
        backing = self.get_transport()
2648
 
        request = smart_repo.SmartServerRepositoryGetInventories(backing)
2649
 
        t = self.make_branch_and_tree('.', format='2a')
2650
 
        self.addCleanup(t.lock_write().unlock)
2651
 
        self.build_tree_contents([("file", "somecontents")])
2652
 
        t.add(["file"], ["thefileid"])
2653
 
        t.commit(rev_id='somerev', message="add file")
2654
 
        self.assertIs(None, request.execute('', 'unordered'))
2655
 
        response = request.do_body("somerev\n")
2656
 
        self.assertTrue(response.is_successful())
2657
 
        self.assertEquals(response.args, ("ok", ))
2658
 
        stream = [('inventory-deltas', [
2659
 
            versionedfile.FulltextContentFactory('somerev', None, None,
2660
 
                self._get_serialized_inventory_delta(
2661
 
                    t.branch.repository, 'null:', 'somerev'))])]
2662
 
        fmt = bzrdir.format_registry.get('2a')().repository_format
2663
 
        self.assertEquals(
2664
 
            "".join(response.body_stream),
2665
 
            "".join(smart_repo._stream_to_byte_stream(stream, fmt)))
2666
 
 
2667
 
    def test_empty(self):
2668
 
        backing = self.get_transport()
2669
 
        request = smart_repo.SmartServerRepositoryGetInventories(backing)
2670
 
        t = self.make_branch_and_tree('.', format='2a')
2671
 
        self.addCleanup(t.lock_write().unlock)
2672
 
        self.build_tree_contents([("file", "somecontents")])
2673
 
        t.add(["file"], ["thefileid"])
2674
 
        t.commit(rev_id='somerev', message="add file")
2675
 
        self.assertIs(None, request.execute('', 'unordered'))
2676
 
        response = request.do_body("")
2677
 
        self.assertTrue(response.is_successful())
2678
 
        self.assertEquals(response.args, ("ok", ))
2679
 
        self.assertEquals("".join(response.body_stream),
2680
 
            "Bazaar pack format 1 (introduced in 0.18)\nB54\n\nBazaar repository format 2a (needs bzr 1.16 or later)\nE")
 
791
        self.assertEqual(
 
792
            smart.request.request_handlers.get('Branch.get_config_file'),
 
793
            smart.branch.SmartServerBranchGetConfigFile)
 
794
        self.assertEqual(
 
795
            smart.request.request_handlers.get('Branch.lock_write'),
 
796
            smart.branch.SmartServerBranchRequestLockWrite)
 
797
        self.assertEqual(
 
798
            smart.request.request_handlers.get('Branch.last_revision_info'),
 
799
            smart.branch.SmartServerBranchRequestLastRevisionInfo)
 
800
        self.assertEqual(
 
801
            smart.request.request_handlers.get('Branch.revision_history'),
 
802
            smart.branch.SmartServerRequestRevisionHistory)
 
803
        self.assertEqual(
 
804
            smart.request.request_handlers.get('Branch.set_last_revision'),
 
805
            smart.branch.SmartServerBranchRequestSetLastRevision)
 
806
        self.assertEqual(
 
807
            smart.request.request_handlers.get('Branch.unlock'),
 
808
            smart.branch.SmartServerBranchRequestUnlock)
 
809
        self.assertEqual(
 
810
            smart.request.request_handlers.get('BzrDir.find_repository'),
 
811
            smart.bzrdir.SmartServerRequestFindRepository)
 
812
        self.assertEqual(
 
813
            smart.request.request_handlers.get('BzrDirFormat.initialize'),
 
814
            smart.bzrdir.SmartServerRequestInitializeBzrDir)
 
815
        self.assertEqual(
 
816
            smart.request.request_handlers.get('BzrDir.open_branch'),
 
817
            smart.bzrdir.SmartServerRequestOpenBranch)
 
818
        self.assertEqual(
 
819
            smart.request.request_handlers.get('Repository.gather_stats'),
 
820
            smart.repository.SmartServerRepositoryGatherStats)
 
821
        self.assertEqual(
 
822
            smart.request.request_handlers.get('Repository.get_revision_graph'),
 
823
            smart.repository.SmartServerRepositoryGetRevisionGraph)
 
824
        self.assertEqual(
 
825
            smart.request.request_handlers.get('Repository.has_revision'),
 
826
            smart.repository.SmartServerRequestHasRevision)
 
827
        self.assertEqual(
 
828
            smart.request.request_handlers.get('Repository.is_shared'),
 
829
            smart.repository.SmartServerRepositoryIsShared)
 
830
        self.assertEqual(
 
831
            smart.request.request_handlers.get('Repository.lock_write'),
 
832
            smart.repository.SmartServerRepositoryLockWrite)
 
833
        self.assertEqual(
 
834
            smart.request.request_handlers.get('Repository.unlock'),
 
835
            smart.repository.SmartServerRepositoryUnlock)
 
836
        self.assertEqual(
 
837
            smart.request.request_handlers.get('Repository.tarball'),
 
838
            smart.repository.SmartServerRepositoryTarball)
 
839
        self.assertEqual(
 
840
            smart.request.request_handlers.get('Transport.is_readonly'),
 
841
            smart.request.SmartServerIsReadonly)