← Back to branch summary

~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: 2009-06-22 17:11:20 UTC
  • mfrom: (4398.8.10 1.16-commit-fulltext)
  • Revision ID: pqm@pqm.ubuntu.com-20090622171120-fuxez9ylfqpxynqn
(jam) Add VF._add_text and reduce memory overhead during commit (see
        bug #109114)

Show diffs side-by-side

added added

removed removed

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