← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart.py

Merge up through 2.2.0.

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