← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart.py

  • Committer: John Arbash Meinel
  • Date: 2009-06-16 13:57:14 UTC
  • mto: This revision was merged to the branch mainline in revision 4449.
  • Revision ID: john@arbash-meinel.com-20090616135714-8o7jdtqqsfuv914z
The new code removes a get_parent_map call.

Show diffs side-by-side

added added

removed removed

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