/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart.py

  • Committer: Martin Pool
  • Date: 2010-10-08 04:38:25 UTC
  • mfrom: (5462 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5478.
  • Revision ID: mbp@sourcefrog.net-20101008043825-b181r8bo5r3qwb6j
merge trunk

Show diffs side-by-side

added added

removed removed

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