← 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: Robert Collins
  • Date: 2009-03-16 07:44:05 UTC
  • mto: This revision was merged to the branch mainline in revision 4149.
  • Revision ID: robertc@robertcollins.net-20090316074405-t9guvf13rj4mlhuk
More test fallout, but all caught now.

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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Tests for the smart wire/domain protocol.
18
18
 
29
29
import tarfile
30
30
 
31
31
from bzrlib import (
32
 
    bencode,
33
 
    branch as _mod_branch,
34
32
    bzrdir,
35
33
    errors,
36
34
    pack,
 
35
    smart,
37
36
    tests,
38
 
    transport,
39
37
    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
 
    )
 
38
    )
 
39
from bzrlib.branch import Branch, BranchReferenceFormat
 
40
import bzrlib.smart.branch
 
41
import bzrlib.smart.bzrdir, bzrlib.smart.bzrdir as smart_dir
 
42
import bzrlib.smart.packrepository
 
43
import bzrlib.smart.repository
 
44
from bzrlib.smart.request import (
 
45
    FailedSmartServerResponse,
 
46
    SmartServerRequest,
 
47
    SmartServerResponse,
 
48
    SuccessfulSmartServerResponse,
 
49
    )
 
50
from bzrlib.tests import (
 
51
    split_suite_by_re,
 
52
    )
 
53
from bzrlib.transport import chroot, get_transport
 
54
from bzrlib.util import bencode
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())))
208
177
        self.assertEqual(expected, request.execute('', 'False'))
209
178
 
210
179
    def test_cloning_metadir_reference(self):
211
 
        """The request fails when bzrdir contains a branch reference."""
 
180
        """The request works when bzrdir contains a branch reference."""
212
181
        backing = self.get_transport()
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 = SuccessfulSmartServerResponse(
 
193
            (local_result.network_name(),
 
194
            local_result.repository_format.network_name(),
 
195
            ('ref', reference_url)))
225
196
        self.assertEqual(expected, request.execute('', 'False'))
226
197
 
227
198
 
232
203
        """When there is a bzrdir present, the call succeeds."""
233
204
        backing = self.get_transport()
234
205
        self.make_bzrdir('.')
235
 
        request_class = smart_dir.SmartServerRequestCreateRepository
 
206
        request_class = bzrlib.smart.bzrdir.SmartServerRequestCreateRepository
236
207
        request = request_class(backing)
237
 
        reference_bzrdir_format = bzrdir.format_registry.get('pack-0.92')()
 
208
        reference_bzrdir_format = bzrdir.format_registry.get('default')()
238
209
        reference_format = reference_bzrdir_format.repository_format
239
210
        network_name = reference_format.network_name()
240
 
        expected = smart_req.SuccessfulSmartServerResponse(
 
211
        expected = SuccessfulSmartServerResponse(
241
212
            ('ok', 'no', 'no', 'no', network_name))
242
213
        self.assertEqual(expected, request.execute('', network_name, 'True'))
243
214
 
250
221
        backing = self.get_transport()
251
222
        request = self._request_class(backing)
252
223
        self.make_bzrdir('.')
253
 
        self.assertEqual(smart_req.SmartServerResponse(('norepository', )),
 
224
        self.assertEqual(SmartServerResponse(('norepository', )),
254
225
            request.execute(''))
255
226
 
256
227
    def test_nonshared_repository(self):
262
233
        result = self._make_repository_and_result()
263
234
        self.assertEqual(result, request.execute(''))
264
235
        self.make_bzrdir('subdir')
265
 
        self.assertEqual(smart_req.SmartServerResponse(('norepository', )),
 
236
        self.assertEqual(SmartServerResponse(('norepository', )),
266
237
            request.execute('subdir'))
267
238
 
268
239
    def _make_repository_and_result(self, shared=False, format=None):
279
250
            subtrees = 'yes'
280
251
        else:
281
252
            subtrees = 'no'
282
 
        if repo._format.supports_external_lookups:
283
 
            external = 'yes'
284
 
        else:
285
 
            external = 'no'
286
 
        if (smart_dir.SmartServerRequestFindRepositoryV3 ==
 
253
        if (smart.bzrdir.SmartServerRequestFindRepositoryV3 ==
287
254
            self._request_class):
288
 
            return smart_req.SuccessfulSmartServerResponse(
289
 
                ('ok', '', rich_root, subtrees, external,
 
255
            return SuccessfulSmartServerResponse(
 
256
                ('ok', '', rich_root, subtrees, 'no',
290
257
                 repo._format.network_name()))
291
 
        elif (smart_dir.SmartServerRequestFindRepositoryV2 ==
 
258
        elif (smart.bzrdir.SmartServerRequestFindRepositoryV2 ==
292
259
            self._request_class):
293
260
            # All tests so far are on formats, and for non-external
294
261
            # repositories.
295
 
            return smart_req.SuccessfulSmartServerResponse(
296
 
                ('ok', '', rich_root, subtrees, external))
 
262
            return SuccessfulSmartServerResponse(
 
263
                ('ok', '', rich_root, subtrees, 'no'))
297
264
        else:
298
 
            return smart_req.SuccessfulSmartServerResponse(
299
 
                ('ok', '', rich_root, subtrees))
 
265
            return SuccessfulSmartServerResponse(('ok', '', rich_root, subtrees))
300
266
 
301
267
    def test_shared_repository(self):
302
268
        """When there is a shared repository, we get 'ok', 'relpath-to-repo'."""
305
271
        result = self._make_repository_and_result(shared=True)
306
272
        self.assertEqual(result, request.execute(''))
307
273
        self.make_bzrdir('subdir')
308
 
        result2 = smart_req.SmartServerResponse(
309
 
            result.args[0:1] + ('..', ) + result.args[2:])
 
274
        result2 = SmartServerResponse(result.args[0:1] + ('..', ) + result.args[2:])
310
275
        self.assertEqual(result2,
311
276
            request.execute('subdir'))
312
277
        self.make_bzrdir('subdir/deeper')
313
 
        result3 = smart_req.SmartServerResponse(
314
 
            result.args[0:1] + ('../..', ) + result.args[2:])
 
278
        result3 = SmartServerResponse(result.args[0:1] + ('../..', ) + result.args[2:])
315
279
        self.assertEqual(result3,
316
280
            request.execute('subdir/deeper'))
317
281
 
319
283
        """Test for the format attributes for rich root and subtree support."""
320
284
        backing = self.get_transport()
321
285
        request = self._request_class(backing)
322
 
        result = self._make_repository_and_result(
323
 
            format='dirstate-with-subtree')
 
286
        result = self._make_repository_and_result(format='dirstate-with-subtree')
324
287
        # check the test will be valid
325
288
        self.assertEqual('yes', result.args[2])
326
289
        self.assertEqual('yes', result.args[3])
330
293
        """Test for the supports_external_lookups attribute."""
331
294
        backing = self.get_transport()
332
295
        request = self._request_class(backing)
333
 
        result = self._make_repository_and_result(
334
 
            format='dirstate-with-subtree')
 
296
        result = self._make_repository_and_result(format='dirstate-with-subtree')
335
297
        # check the test will be valid
336
298
        self.assertEqual('no', result.args[4])
337
299
        self.assertEqual(result, request.execute(''))
338
300
 
339
301
 
340
 
class TestSmartServerBzrDirRequestGetConfigFile(
341
 
    tests.TestCaseWithMemoryTransport):
342
 
    """Tests for BzrDir.get_config_file."""
343
 
 
344
 
    def test_present(self):
345
 
        backing = self.get_transport()
346
 
        dir = self.make_bzrdir('.')
347
 
        dir.get_config().set_default_stack_on("/")
348
 
        local_result = dir._get_config()._get_config_file().read()
349
 
        request_class = smart_dir.SmartServerBzrDirRequestConfigFile
350
 
        request = request_class(backing)
351
 
        expected = smart_req.SuccessfulSmartServerResponse((), local_result)
352
 
        self.assertEqual(expected, request.execute(''))
353
 
 
354
 
    def test_missing(self):
355
 
        backing = self.get_transport()
356
 
        dir = self.make_bzrdir('.')
357
 
        request_class = smart_dir.SmartServerBzrDirRequestConfigFile
358
 
        request = request_class(backing)
359
 
        expected = smart_req.SuccessfulSmartServerResponse((), '')
360
 
        self.assertEqual(expected, request.execute(''))
361
 
 
362
 
 
363
302
class TestSmartServerRequestInitializeBzrDir(tests.TestCaseWithMemoryTransport):
364
303
 
365
304
    def test_empty_dir(self):
366
305
        """Initializing an empty dir should succeed and do it."""
367
306
        backing = self.get_transport()
368
 
        request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
369
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', )),
 
307
        request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
 
308
        self.assertEqual(SmartServerResponse(('ok', )),
370
309
            request.execute(''))
371
310
        made_dir = bzrdir.BzrDir.open_from_transport(backing)
372
311
        # no branch, tree or repository is expected with the current
378
317
    def test_missing_dir(self):
379
318
        """Initializing a missing directory should fail like the bzrdir api."""
380
319
        backing = self.get_transport()
381
 
        request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
 
320
        request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
382
321
        self.assertRaises(errors.NoSuchFile,
383
322
            request.execute, 'subdir')
384
323
 
385
324
    def test_initialized_dir(self):
386
325
        """Initializing an extant bzrdir should fail like the bzrdir api."""
387
326
        backing = self.get_transport()
388
 
        request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
 
327
        request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
389
328
        self.make_bzrdir('subdir')
390
329
        self.assertRaises(errors.FileExists,
391
330
            request.execute, 'subdir')
392
331
 
393
332
 
394
 
class TestSmartServerRequestBzrDirInitializeEx(
395
 
    tests.TestCaseWithMemoryTransport):
396
 
    """Basic tests for BzrDir.initialize_ex_1.16 in the smart server.
397
 
 
398
 
    The main unit tests in test_bzrdir exercise the API comprehensively.
399
 
    """
400
 
 
401
 
    def test_empty_dir(self):
402
 
        """Initializing an empty dir should succeed and do it."""
403
 
        backing = self.get_transport()
404
 
        name = self.make_bzrdir('reference')._format.network_name()
405
 
        request = smart_dir.SmartServerRequestBzrDirInitializeEx(backing)
406
 
        self.assertEqual(
407
 
            smart_req.SmartServerResponse(('', '', '', '', '', '', name,
408
 
                                           'False', '', '', '')),
409
 
            request.execute(name, '', 'True', 'False', 'False', '', '', '', '',
410
 
                            'False'))
411
 
        made_dir = bzrdir.BzrDir.open_from_transport(backing)
412
 
        # no branch, tree or repository is expected with the current
413
 
        # default format.
414
 
        self.assertRaises(errors.NoWorkingTree, made_dir.open_workingtree)
415
 
        self.assertRaises(errors.NotBranchError, made_dir.open_branch)
416
 
        self.assertRaises(errors.NoRepositoryPresent, made_dir.open_repository)
417
 
 
418
 
    def test_missing_dir(self):
419
 
        """Initializing a missing directory should fail like the bzrdir api."""
420
 
        backing = self.get_transport()
421
 
        name = self.make_bzrdir('reference')._format.network_name()
422
 
        request = smart_dir.SmartServerRequestBzrDirInitializeEx(backing)
423
 
        self.assertRaises(errors.NoSuchFile, request.execute, name,
424
 
            'subdir/dir', 'False', 'False', 'False', '', '', '', '', 'False')
425
 
 
426
 
    def test_initialized_dir(self):
427
 
        """Initializing an extant directory should fail like the bzrdir api."""
428
 
        backing = self.get_transport()
429
 
        name = self.make_bzrdir('reference')._format.network_name()
430
 
        request = smart_dir.SmartServerRequestBzrDirInitializeEx(backing)
431
 
        self.make_bzrdir('subdir')
432
 
        self.assertRaises(errors.FileExists, request.execute, name, 'subdir',
433
 
            'False', 'False', 'False', '', '', '', '', 'False')
434
 
 
435
 
 
436
 
class TestSmartServerRequestOpenBzrDir(tests.TestCaseWithMemoryTransport):
437
 
 
438
 
    def test_no_directory(self):
439
 
        backing = self.get_transport()
440
 
        request = smart_dir.SmartServerRequestOpenBzrDir(backing)
441
 
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
442
 
            request.execute('does-not-exist'))
443
 
 
444
 
    def test_empty_directory(self):
445
 
        backing = self.get_transport()
446
 
        backing.mkdir('empty')
447
 
        request = smart_dir.SmartServerRequestOpenBzrDir(backing)
448
 
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
449
 
            request.execute('empty'))
450
 
 
451
 
    def test_outside_root_client_path(self):
452
 
        backing = self.get_transport()
453
 
        request = smart_dir.SmartServerRequestOpenBzrDir(backing,
454
 
            root_client_path='root')
455
 
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
456
 
            request.execute('not-root'))
457
 
 
458
 
 
459
 
class TestSmartServerRequestOpenBzrDir_2_1(tests.TestCaseWithMemoryTransport):
460
 
 
461
 
    def test_no_directory(self):
462
 
        backing = self.get_transport()
463
 
        request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
464
 
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
465
 
            request.execute('does-not-exist'))
466
 
 
467
 
    def test_empty_directory(self):
468
 
        backing = self.get_transport()
469
 
        backing.mkdir('empty')
470
 
        request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
471
 
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
472
 
            request.execute('empty'))
473
 
 
474
 
    def test_present_without_workingtree(self):
475
 
        backing = self.get_transport()
476
 
        request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
477
 
        self.make_bzrdir('.')
478
 
        self.assertEqual(smart_req.SmartServerResponse(('yes', 'no')),
479
 
            request.execute(''))
480
 
 
481
 
    def test_outside_root_client_path(self):
482
 
        backing = self.get_transport()
483
 
        request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing,
484
 
            root_client_path='root')
485
 
        self.assertEqual(smart_req.SmartServerResponse(('no',)),
486
 
            request.execute('not-root'))
487
 
 
488
 
 
489
 
class TestSmartServerRequestOpenBzrDir_2_1_disk(TestCaseWithChrootedTransport):
490
 
 
491
 
    def test_present_with_workingtree(self):
492
 
        self.vfs_transport_factory = test_server.LocalURLServer
493
 
        backing = self.get_transport()
494
 
        request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
495
 
        bd = self.make_bzrdir('.')
496
 
        bd.create_repository()
497
 
        bd.create_branch()
498
 
        bd.create_workingtree()
499
 
        self.assertEqual(smart_req.SmartServerResponse(('yes', 'yes')),
500
 
            request.execute(''))
501
 
 
502
 
 
503
333
class TestSmartServerRequestOpenBranch(TestCaseWithChrootedTransport):
504
334
 
505
335
    def test_no_branch(self):
506
336
        """When there is no branch, ('nobranch', ) is returned."""
507
337
        backing = self.get_transport()
508
 
        request = smart_dir.SmartServerRequestOpenBranch(backing)
 
338
        request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
509
339
        self.make_bzrdir('.')
510
 
        self.assertEqual(smart_req.SmartServerResponse(('nobranch', )),
 
340
        self.assertEqual(SmartServerResponse(('nobranch', )),
511
341
            request.execute(''))
512
342
 
513
343
    def test_branch(self):
514
344
        """When there is a branch, 'ok' is returned."""
515
345
        backing = self.get_transport()
516
 
        request = smart_dir.SmartServerRequestOpenBranch(backing)
 
346
        request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
517
347
        self.make_branch('.')
518
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', '')),
 
348
        self.assertEqual(SmartServerResponse(('ok', '')),
519
349
            request.execute(''))
520
350
 
521
351
    def test_branch_reference(self):
522
352
        """When there is a branch reference, the reference URL is returned."""
523
 
        self.vfs_transport_factory = test_server.LocalURLServer
524
353
        backing = self.get_transport()
525
 
        request = smart_dir.SmartServerRequestOpenBranch(backing)
 
354
        request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
526
355
        branch = self.make_branch('branch')
527
356
        checkout = branch.create_checkout('reference',lightweight=True)
528
 
        reference_url = _mod_branch.BranchReferenceFormat().get_reference(
529
 
            checkout.bzrdir)
 
357
        reference_url = BranchReferenceFormat().get_reference(checkout.bzrdir)
530
358
        self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
531
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', reference_url)),
 
359
        self.assertEqual(SmartServerResponse(('ok', reference_url)),
532
360
            request.execute('reference'))
533
361
 
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
362
 
543
363
class TestSmartServerRequestOpenBranchV2(TestCaseWithChrootedTransport):
544
364
 
546
366
        """When there is no branch, ('nobranch', ) is returned."""
547
367
        backing = self.get_transport()
548
368
        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(''))
 
369
        request = smart.bzrdir.SmartServerRequestOpenBranchV2(backing)
 
370
        self.assertEqual(SmartServerResponse(('nobranch', )),
 
371
            request.execute(''))
 
372
 
 
373
    def test_branch(self):
 
374
        """When there is a branch, 'ok' is returned."""
 
375
        backing = self.get_transport()
 
376
        expected = self.make_branch('.')._format.network_name()
 
377
        request = smart.bzrdir.SmartServerRequestOpenBranchV2(backing)
 
378
        self.assertEqual(SuccessfulSmartServerResponse(('branch', expected)),
 
379
            request.execute(''))
 
380
 
 
381
    def test_branch_reference(self):
 
382
        """When there is a branch reference, the reference URL is returned."""
 
383
        backing = self.get_transport()
 
384
        request = smart.bzrdir.SmartServerRequestOpenBranchV2(backing)
 
385
        branch = self.make_branch('branch')
 
386
        checkout = branch.create_checkout('reference',lightweight=True)
 
387
        reference_url = BranchReferenceFormat().get_reference(checkout.bzrdir)
 
388
        self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
 
389
        self.assertEqual(SuccessfulSmartServerResponse(('ref', reference_url)),
 
390
            request.execute('reference'))
668
391
 
669
392
 
670
393
class TestSmartServerRequestRevisionHistory(tests.TestCaseWithMemoryTransport):
672
395
    def test_empty(self):
673
396
        """For an empty branch, the body is empty."""
674
397
        backing = self.get_transport()
675
 
        request = smart_branch.SmartServerRequestRevisionHistory(backing)
 
398
        request = smart.branch.SmartServerRequestRevisionHistory(backing)
676
399
        self.make_branch('.')
677
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), ''),
 
400
        self.assertEqual(SmartServerResponse(('ok', ), ''),
678
401
            request.execute(''))
679
402
 
680
403
    def test_not_empty(self):
681
404
        """For a non-empty branch, the body is empty."""
682
405
        backing = self.get_transport()
683
 
        request = smart_branch.SmartServerRequestRevisionHistory(backing)
 
406
        request = smart.branch.SmartServerRequestRevisionHistory(backing)
684
407
        tree = self.make_branch_and_memory_tree('.')
685
408
        tree.lock_write()
686
409
        tree.add('')
688
411
        r2 = tree.commit('2nd commit', rev_id=u'\xc8'.encode('utf-8'))
689
412
        tree.unlock()
690
413
        self.assertEqual(
691
 
            smart_req.SmartServerResponse(('ok', ), ('\x00'.join([r1, r2]))),
 
414
            SmartServerResponse(('ok', ), ('\x00'.join([r1, r2]))),
692
415
            request.execute(''))
693
416
 
694
417
 
697
420
    def test_no_branch(self):
698
421
        """When there is a bzrdir and no branch, NotBranchError is raised."""
699
422
        backing = self.get_transport()
700
 
        request = smart_branch.SmartServerBranchRequest(backing)
 
423
        request = smart.branch.SmartServerBranchRequest(backing)
701
424
        self.make_bzrdir('.')
702
425
        self.assertRaises(errors.NotBranchError,
703
426
            request.execute, '')
705
428
    def test_branch_reference(self):
706
429
        """When there is a branch reference, NotBranchError is raised."""
707
430
        backing = self.get_transport()
708
 
        request = smart_branch.SmartServerBranchRequest(backing)
 
431
        request = smart.branch.SmartServerBranchRequest(backing)
709
432
        branch = self.make_branch('branch')
710
433
        checkout = branch.create_checkout('reference',lightweight=True)
711
434
        self.assertRaises(errors.NotBranchError,
712
435
            request.execute, 'checkout')
713
436
 
714
437
 
715
 
class TestSmartServerBranchRequestLastRevisionInfo(
716
 
    tests.TestCaseWithMemoryTransport):
 
438
class TestSmartServerBranchRequestLastRevisionInfo(tests.TestCaseWithMemoryTransport):
717
439
 
718
440
    def test_empty(self):
719
441
        """For an empty branch, the result is ('ok', '0', 'null:')."""
720
442
        backing = self.get_transport()
721
 
        request = smart_branch.SmartServerBranchRequestLastRevisionInfo(backing)
 
443
        request = smart.branch.SmartServerBranchRequestLastRevisionInfo(backing)
722
444
        self.make_branch('.')
723
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', '0', 'null:')),
 
445
        self.assertEqual(SmartServerResponse(('ok', '0', 'null:')),
724
446
            request.execute(''))
725
447
 
726
448
    def test_not_empty(self):
727
449
        """For a non-empty branch, the result is ('ok', 'revno', 'revid')."""
728
450
        backing = self.get_transport()
729
 
        request = smart_branch.SmartServerBranchRequestLastRevisionInfo(backing)
 
451
        request = smart.branch.SmartServerBranchRequestLastRevisionInfo(backing)
730
452
        tree = self.make_branch_and_memory_tree('.')
731
453
        tree.lock_write()
732
454
        tree.add('')
735
457
        r2 = tree.commit('2nd commit', rev_id=rev_id_utf8)
736
458
        tree.unlock()
737
459
        self.assertEqual(
738
 
            smart_req.SmartServerResponse(('ok', '2', rev_id_utf8)),
 
460
            SmartServerResponse(('ok', '2', rev_id_utf8)),
739
461
            request.execute(''))
740
462
 
741
463
 
742
 
class TestSmartServerBranchRequestGetConfigFile(
743
 
    tests.TestCaseWithMemoryTransport):
 
464
class TestSmartServerBranchRequestGetConfigFile(tests.TestCaseWithMemoryTransport):
744
465
 
745
466
    def test_default(self):
746
467
        """With no file, we get empty content."""
747
468
        backing = self.get_transport()
748
 
        request = smart_branch.SmartServerBranchGetConfigFile(backing)
 
469
        request = smart.branch.SmartServerBranchGetConfigFile(backing)
749
470
        branch = self.make_branch('.')
750
471
        # there should be no file by default
751
472
        content = ''
752
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), content),
 
473
        self.assertEqual(SmartServerResponse(('ok', ), content),
753
474
            request.execute(''))
754
475
 
755
476
    def test_with_content(self):
757
478
        # branch.control_files.get('branch.conf') for now - in the future it may
758
479
        # perform more complex processing.
759
480
        backing = self.get_transport()
760
 
        request = smart_branch.SmartServerBranchGetConfigFile(backing)
 
481
        request = smart.branch.SmartServerBranchGetConfigFile(backing)
761
482
        branch = self.make_branch('.')
762
483
        branch._transport.put_bytes('branch.conf', 'foo bar baz')
763
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), 'foo bar baz'),
 
484
        self.assertEqual(SmartServerResponse(('ok', ), 'foo bar baz'),
764
485
            request.execute(''))
765
486
 
766
487
 
767
 
class TestLockedBranch(tests.TestCaseWithMemoryTransport):
768
 
 
769
 
    def get_lock_tokens(self, branch):
770
 
        branch_token = branch.lock_write()
771
 
        repo_token = branch.repository.lock_write()
772
 
        branch.repository.unlock()
773
 
        return branch_token, repo_token
774
 
 
775
 
 
776
 
class TestSmartServerBranchRequestSetConfigOption(TestLockedBranch):
777
 
 
778
 
    def test_value_name(self):
779
 
        branch = self.make_branch('.')
780
 
        request = smart_branch.SmartServerBranchRequestSetConfigOption(
781
 
            branch.bzrdir.root_transport)
782
 
        branch_token, repo_token = self.get_lock_tokens(branch)
783
 
        config = branch._get_config()
784
 
        result = request.execute('', branch_token, repo_token, 'bar', 'foo',
785
 
            '')
786
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), result)
787
 
        self.assertEqual('bar', config.get_option('foo'))
788
 
        # Cleanup
789
 
        branch.unlock()
790
 
 
791
 
    def test_value_name_section(self):
792
 
        branch = self.make_branch('.')
793
 
        request = smart_branch.SmartServerBranchRequestSetConfigOption(
794
 
            branch.bzrdir.root_transport)
795
 
        branch_token, repo_token = self.get_lock_tokens(branch)
796
 
        config = branch._get_config()
797
 
        result = request.execute('', branch_token, repo_token, 'bar', 'foo',
798
 
            'gam')
799
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), result)
800
 
        self.assertEqual('bar', config.get_option('foo', 'gam'))
801
 
        # Cleanup
802
 
        branch.unlock()
803
 
 
804
 
 
805
 
class TestSmartServerBranchRequestSetTagsBytes(TestLockedBranch):
806
 
    # Only called when the branch format and tags match [yay factory
807
 
    # methods] so only need to test straight forward cases.
808
 
 
809
 
    def test_set_bytes(self):
810
 
        base_branch = self.make_branch('base')
811
 
        tag_bytes = base_branch._get_tags_bytes()
812
 
        # get_lock_tokens takes out a lock.
813
 
        branch_token, repo_token = self.get_lock_tokens(base_branch)
814
 
        request = smart_branch.SmartServerBranchSetTagsBytes(
815
 
            self.get_transport())
816
 
        response = request.execute('base', branch_token, repo_token)
817
 
        self.assertEqual(None, response)
818
 
        response = request.do_chunk(tag_bytes)
819
 
        self.assertEqual(None, response)
820
 
        response = request.do_end()
821
 
        self.assertEquals(
822
 
            smart_req.SuccessfulSmartServerResponse(()), response)
823
 
        base_branch.unlock()
824
 
 
825
 
    def test_lock_failed(self):
826
 
        base_branch = self.make_branch('base')
827
 
        base_branch.lock_write()
828
 
        tag_bytes = base_branch._get_tags_bytes()
829
 
        request = smart_branch.SmartServerBranchSetTagsBytes(
830
 
            self.get_transport())
831
 
        self.assertRaises(errors.TokenMismatch, request.execute,
832
 
            'base', 'wrong token', 'wrong token')
833
 
        # The request handler will keep processing the message parts, so even
834
 
        # if the request fails immediately do_chunk and do_end are still
835
 
        # called.
836
 
        request.do_chunk(tag_bytes)
837
 
        request.do_end()
838
 
        base_branch.unlock()
839
 
 
840
 
 
841
 
 
842
 
class SetLastRevisionTestBase(TestLockedBranch):
 
488
class SetLastRevisionTestBase(tests.TestCaseWithMemoryTransport):
843
489
    """Base test case for verbs that implement set_last_revision."""
844
490
 
845
491
    def setUp(self):
849
495
        self.tree = self.make_branch_and_memory_tree('.')
850
496
 
851
497
    def lock_branch(self):
852
 
        return self.get_lock_tokens(self.tree.branch)
 
498
        b = self.tree.branch
 
499
        branch_token = b.lock_write()
 
500
        repo_token = b.repository.lock_write()
 
501
        b.repository.unlock()
 
502
        return branch_token, repo_token
853
503
 
854
504
    def unlock_branch(self):
855
505
        self.tree.branch.unlock()
863
513
 
864
514
    def assertRequestSucceeds(self, revision_id, revno):
865
515
        response = self.set_last_revision(revision_id, revno)
866
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
867
 
                         response)
 
516
        self.assertEqual(SuccessfulSmartServerResponse(('ok',)), response)
868
517
 
869
518
 
870
519
class TestSetLastRevisionVerbMixin(object):
878
527
        """If the revision_id is not present, the verb returns NoSuchRevision.
879
528
        """
880
529
        revision_id = 'non-existent revision'
881
 
        self.assertEqual(smart_req.FailedSmartServerResponse(('NoSuchRevision',
882
 
                                                              revision_id)),
883
 
                         self.set_last_revision(revision_id, 1))
 
530
        self.assertEqual(
 
531
            FailedSmartServerResponse(('NoSuchRevision', revision_id)),
 
532
            self.set_last_revision(revision_id, 1))
884
533
 
885
534
    def make_tree_with_two_commits(self):
886
535
        self.tree.lock_write()
926
575
        rejection_message = u'rejection message\N{INTERROBANG}'
927
576
        def hook_that_rejects(params):
928
577
            raise errors.TipChangeRejected(rejection_message)
929
 
        _mod_branch.Branch.hooks.install_named_hook(
 
578
        Branch.hooks.install_named_hook(
930
579
            'pre_change_branch_tip', hook_that_rejects, None)
931
580
        self.assertEqual(
932
 
            smart_req.FailedSmartServerResponse(
 
581
            FailedSmartServerResponse(
933
582
                ('TipChangeRejected', rejection_message.encode('utf-8'))),
934
583
            self.set_last_revision('null:', 0))
935
584
 
938
587
        SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
939
588
    """Tests for Branch.set_last_revision verb."""
940
589
 
941
 
    request_class = smart_branch.SmartServerBranchRequestSetLastRevision
 
590
    request_class = smart.branch.SmartServerBranchRequestSetLastRevision
942
591
 
943
592
    def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
944
593
        return self.request.execute(
949
598
        SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
950
599
    """Tests for Branch.set_last_revision_info verb."""
951
600
 
952
 
    request_class = smart_branch.SmartServerBranchRequestSetLastRevisionInfo
 
601
    request_class = smart.branch.SmartServerBranchRequestSetLastRevisionInfo
953
602
 
954
603
    def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
955
604
        return self.request.execute(
966
615
        SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
967
616
    """Tests for Branch.set_last_revision_ex verb."""
968
617
 
969
 
    request_class = smart_branch.SmartServerBranchRequestSetLastRevisionEx
 
618
    request_class = smart.branch.SmartServerBranchRequestSetLastRevisionEx
970
619
 
971
620
    def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
972
621
        return self.request.execute(
975
624
    def assertRequestSucceeds(self, revision_id, revno):
976
625
        response = self.set_last_revision(revision_id, revno)
977
626
        self.assertEqual(
978
 
            smart_req.SuccessfulSmartServerResponse(('ok', revno, revision_id)),
 
627
            SuccessfulSmartServerResponse(('ok', revno, revision_id)),
979
628
            response)
980
629
 
981
630
    def test_branch_last_revision_info_rewind(self):
992
641
        response = self.request.execute(
993
642
            '', branch_token, repo_token, rev_id_utf8, 0, 0)
994
643
        self.assertEqual(
995
 
            smart_req.SuccessfulSmartServerResponse(('ok', 2, 'rev-2')),
 
644
            SuccessfulSmartServerResponse(('ok', 2, 'rev-2')),
996
645
            response)
997
646
        self.assertEqual(
998
647
            (2, 'rev-2'), self.tree.branch.last_revision_info())
1002
651
        response = self.request.execute(
1003
652
            '', branch_token, repo_token, rev_id_utf8, 0, 1)
1004
653
        self.assertEqual(
1005
 
            smart_req.SuccessfulSmartServerResponse(('ok', 1, rev_id_utf8)),
 
654
            SuccessfulSmartServerResponse(('ok', 1, rev_id_utf8)),
1006
655
            response)
1007
656
        self.unlock_branch()
1008
657
        self.assertEqual(
1033
682
        """
1034
683
        self.make_branch_with_divergent_history()
1035
684
        self.assertEqual(
1036
 
            smart_req.FailedSmartServerResponse(('Diverged',)),
 
685
            FailedSmartServerResponse(('Diverged',)),
1037
686
            self.set_last_revision('child-1', 2))
1038
687
        # The branch tip was not changed.
1039
688
        self.assertEqual('child-2', self.tree.branch.last_revision())
1047
696
        response = self.request.execute(
1048
697
            '', branch_token, repo_token, 'child-1', 1, 0)
1049
698
        self.assertEqual(
1050
 
            smart_req.SuccessfulSmartServerResponse(('ok', 2, 'child-1')),
 
699
            SuccessfulSmartServerResponse(('ok', 2, 'child-1')),
1051
700
            response)
1052
701
        self.unlock_branch()
1053
702
        # The branch tip was changed.
1058
707
 
1059
708
    def test_get_parent_none(self):
1060
709
        base_branch = self.make_branch('base')
1061
 
        request = smart_branch.SmartServerBranchGetParent(self.get_transport())
 
710
        request = smart.branch.SmartServerBranchGetParent(self.get_transport())
1062
711
        response = request.execute('base')
1063
712
        self.assertEquals(
1064
 
            smart_req.SuccessfulSmartServerResponse(('',)), response)
 
713
            SuccessfulSmartServerResponse(('',)), response)
1065
714
 
1066
715
    def test_get_parent_something(self):
1067
716
        base_branch = self.make_branch('base')
1068
717
        base_branch.set_parent(self.get_url('foo'))
1069
 
        request = smart_branch.SmartServerBranchGetParent(self.get_transport())
 
718
        request = smart.branch.SmartServerBranchGetParent(self.get_transport())
1070
719
        response = request.execute('base')
1071
720
        self.assertEquals(
1072
 
            smart_req.SuccessfulSmartServerResponse(("../foo",)),
 
721
            SuccessfulSmartServerResponse(("../foo",)),
1073
722
            response)
1074
723
 
1075
724
 
1076
 
class TestSmartServerBranchRequestSetParent(tests.TestCaseWithMemoryTransport):
1077
 
 
1078
 
    def test_set_parent_none(self):
1079
 
        branch = self.make_branch('base', format="1.9")
1080
 
        branch.lock_write()
1081
 
        branch._set_parent_location('foo')
1082
 
        branch.unlock()
1083
 
        request = smart_branch.SmartServerBranchRequestSetParentLocation(
1084
 
            self.get_transport())
1085
 
        branch_token = branch.lock_write()
1086
 
        repo_token = branch.repository.lock_write()
1087
 
        try:
1088
 
            response = request.execute('base', branch_token, repo_token, '')
1089
 
        finally:
1090
 
            branch.repository.unlock()
1091
 
            branch.unlock()
1092
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), response)
1093
 
        self.assertEqual(None, branch.get_parent())
1094
 
 
1095
 
    def test_set_parent_something(self):
1096
 
        branch = self.make_branch('base', format="1.9")
1097
 
        request = smart_branch.SmartServerBranchRequestSetParentLocation(
1098
 
            self.get_transport())
1099
 
        branch_token = branch.lock_write()
1100
 
        repo_token = branch.repository.lock_write()
1101
 
        try:
1102
 
            response = request.execute('base', branch_token, repo_token,
1103
 
            'http://bar/')
1104
 
        finally:
1105
 
            branch.repository.unlock()
1106
 
            branch.unlock()
1107
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), response)
1108
 
        self.assertEqual('http://bar/', branch.get_parent())
1109
 
 
1110
 
 
1111
 
class TestSmartServerBranchRequestGetTagsBytes(
1112
 
    tests.TestCaseWithMemoryTransport):
1113
 
    # Only called when the branch format and tags match [yay factory
1114
 
    # methods] so only need to test straight forward cases.
 
725
class TestSmartServerBranchRequestGetTagsBytes(tests.TestCaseWithMemoryTransport):
 
726
# Only called when the branch format and tags match [yay factory
 
727
# methods] so only need to test straight forward cases.
1115
728
 
1116
729
    def test_get_bytes(self):
1117
730
        base_branch = self.make_branch('base')
1118
 
        request = smart_branch.SmartServerBranchGetTagsBytes(
 
731
        request = smart.branch.SmartServerBranchGetTagsBytes(
1119
732
            self.get_transport())
1120
733
        response = request.execute('base')
1121
734
        self.assertEquals(
1122
 
            smart_req.SuccessfulSmartServerResponse(('',)), response)
 
735
            SuccessfulSmartServerResponse(('',)), response)
1123
736
 
1124
737
 
1125
738
class TestSmartServerBranchRequestGetStackedOnURL(tests.TestCaseWithMemoryTransport):
1129
742
        stacked_branch = self.make_branch('stacked', format='1.6')
1130
743
        # typically should be relative
1131
744
        stacked_branch.set_stacked_on_url('../base')
1132
 
        request = smart_branch.SmartServerBranchRequestGetStackedOnURL(
 
745
        request = smart.branch.SmartServerBranchRequestGetStackedOnURL(
1133
746
            self.get_transport())
1134
747
        response = request.execute('stacked')
1135
748
        self.assertEquals(
1136
 
            smart_req.SmartServerResponse(('ok', '../base')),
 
749
            SmartServerResponse(('ok', '../base')),
1137
750
            response)
1138
751
 
1139
752
 
1144
757
 
1145
758
    def test_lock_write_on_unlocked_branch(self):
1146
759
        backing = self.get_transport()
1147
 
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
 
760
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1148
761
        branch = self.make_branch('.', format='knit')
1149
762
        repository = branch.repository
1150
763
        response = request.execute('')
1151
764
        branch_nonce = branch.control_files._lock.peek().get('nonce')
1152
765
        repository_nonce = repository.control_files._lock.peek().get('nonce')
1153
 
        self.assertEqual(smart_req.SmartServerResponse(
1154
 
                ('ok', branch_nonce, repository_nonce)),
1155
 
                         response)
 
766
        self.assertEqual(
 
767
            SmartServerResponse(('ok', branch_nonce, repository_nonce)),
 
768
            response)
1156
769
        # The branch (and associated repository) is now locked.  Verify that
1157
770
        # with a new branch object.
1158
771
        new_branch = repository.bzrdir.open_branch()
1159
772
        self.assertRaises(errors.LockContention, new_branch.lock_write)
1160
 
        # Cleanup
1161
 
        request = smart_branch.SmartServerBranchRequestUnlock(backing)
1162
 
        response = request.execute('', branch_nonce, repository_nonce)
1163
773
 
1164
774
    def test_lock_write_on_locked_branch(self):
1165
775
        backing = self.get_transport()
1166
 
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
 
776
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1167
777
        branch = self.make_branch('.')
1168
 
        branch_token = branch.lock_write()
 
778
        branch.lock_write()
1169
779
        branch.leave_lock_in_place()
1170
780
        branch.unlock()
1171
781
        response = request.execute('')
1172
782
        self.assertEqual(
1173
 
            smart_req.SmartServerResponse(('LockContention',)), response)
1174
 
        # Cleanup
1175
 
        branch.lock_write(branch_token)
1176
 
        branch.dont_leave_lock_in_place()
1177
 
        branch.unlock()
 
783
            SmartServerResponse(('LockContention',)), response)
1178
784
 
1179
785
    def test_lock_write_with_tokens_on_locked_branch(self):
1180
786
        backing = self.get_transport()
1181
 
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
 
787
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1182
788
        branch = self.make_branch('.', format='knit')
1183
789
        branch_token = branch.lock_write()
1184
790
        repo_token = branch.repository.lock_write()
1189
795
        response = request.execute('',
1190
796
                                   branch_token, repo_token)
1191
797
        self.assertEqual(
1192
 
            smart_req.SmartServerResponse(('ok', branch_token, repo_token)),
1193
 
            response)
1194
 
        # Cleanup
1195
 
        branch.repository.lock_write(repo_token)
1196
 
        branch.repository.dont_leave_lock_in_place()
1197
 
        branch.repository.unlock()
1198
 
        branch.lock_write(branch_token)
1199
 
        branch.dont_leave_lock_in_place()
1200
 
        branch.unlock()
 
798
            SmartServerResponse(('ok', branch_token, repo_token)), response)
1201
799
 
1202
800
    def test_lock_write_with_mismatched_tokens_on_locked_branch(self):
1203
801
        backing = self.get_transport()
1204
 
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
 
802
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1205
803
        branch = self.make_branch('.', format='knit')
1206
804
        branch_token = branch.lock_write()
1207
805
        repo_token = branch.repository.lock_write()
1212
810
        response = request.execute('',
1213
811
                                   branch_token+'xxx', repo_token)
1214
812
        self.assertEqual(
1215
 
            smart_req.SmartServerResponse(('TokenMismatch',)), response)
1216
 
        # Cleanup
1217
 
        branch.repository.lock_write(repo_token)
1218
 
        branch.repository.dont_leave_lock_in_place()
1219
 
        branch.repository.unlock()
1220
 
        branch.lock_write(branch_token)
1221
 
        branch.dont_leave_lock_in_place()
1222
 
        branch.unlock()
 
813
            SmartServerResponse(('TokenMismatch',)), response)
1223
814
 
1224
815
    def test_lock_write_on_locked_repo(self):
1225
816
        backing = self.get_transport()
1226
 
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
 
817
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1227
818
        branch = self.make_branch('.', format='knit')
1228
 
        repo = branch.repository
1229
 
        repo_token = repo.lock_write()
1230
 
        repo.leave_lock_in_place()
1231
 
        repo.unlock()
 
819
        branch.repository.lock_write()
 
820
        branch.repository.leave_lock_in_place()
 
821
        branch.repository.unlock()
1232
822
        response = request.execute('')
1233
823
        self.assertEqual(
1234
 
            smart_req.SmartServerResponse(('LockContention',)), response)
1235
 
        # Cleanup
1236
 
        repo.lock_write(repo_token)
1237
 
        repo.dont_leave_lock_in_place()
1238
 
        repo.unlock()
 
824
            SmartServerResponse(('LockContention',)), response)
1239
825
 
1240
826
    def test_lock_write_on_readonly_transport(self):
1241
827
        backing = self.get_readonly_transport()
1242
 
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
 
828
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1243
829
        branch = self.make_branch('.')
1244
830
        root = self.get_transport().clone('/')
1245
831
        path = urlutils.relative_url(root.base, self.get_transport().base)
1256
842
 
1257
843
    def test_unlock_on_locked_branch_and_repo(self):
1258
844
        backing = self.get_transport()
1259
 
        request = smart_branch.SmartServerBranchRequestUnlock(backing)
 
845
        request = smart.branch.SmartServerBranchRequestUnlock(backing)
1260
846
        branch = self.make_branch('.', format='knit')
1261
847
        # Lock the branch
1262
848
        branch_token = branch.lock_write()
1270
856
        response = request.execute('',
1271
857
                                   branch_token, repo_token)
1272
858
        self.assertEqual(
1273
 
            smart_req.SmartServerResponse(('ok',)), response)
 
859
            SmartServerResponse(('ok',)), response)
1274
860
        # The branch is now unlocked.  Verify that with a new branch
1275
861
        # object.
1276
862
        new_branch = branch.bzrdir.open_branch()
1279
865
 
1280
866
    def test_unlock_on_unlocked_branch_unlocked_repo(self):
1281
867
        backing = self.get_transport()
1282
 
        request = smart_branch.SmartServerBranchRequestUnlock(backing)
 
868
        request = smart.branch.SmartServerBranchRequestUnlock(backing)
1283
869
        branch = self.make_branch('.', format='knit')
1284
870
        response = request.execute(
1285
871
            '', 'branch token', 'repo token')
1286
872
        self.assertEqual(
1287
 
            smart_req.SmartServerResponse(('TokenMismatch',)), response)
 
873
            SmartServerResponse(('TokenMismatch',)), response)
1288
874
 
1289
875
    def test_unlock_on_unlocked_branch_locked_repo(self):
1290
876
        backing = self.get_transport()
1291
 
        request = smart_branch.SmartServerBranchRequestUnlock(backing)
 
877
        request = smart.branch.SmartServerBranchRequestUnlock(backing)
1292
878
        branch = self.make_branch('.', format='knit')
1293
879
        # Lock the repository.
1294
880
        repo_token = branch.repository.lock_write()
1299
885
        response = request.execute(
1300
886
            '', 'branch token', repo_token)
1301
887
        self.assertEqual(
1302
 
            smart_req.SmartServerResponse(('TokenMismatch',)), response)
1303
 
        # Cleanup
1304
 
        branch.repository.lock_write(repo_token)
1305
 
        branch.repository.dont_leave_lock_in_place()
1306
 
        branch.repository.unlock()
 
888
            SmartServerResponse(('TokenMismatch',)), response)
1307
889
 
1308
890
 
1309
891
class TestSmartServerRepositoryRequest(tests.TestCaseWithMemoryTransport):
1315
897
        # its the exact path being looked at and the server is not
1316
898
        # searching.
1317
899
        backing = self.get_transport()
1318
 
        request = smart_repo.SmartServerRepositoryRequest(backing)
 
900
        request = smart.repository.SmartServerRepositoryRequest(backing)
1319
901
        self.make_repository('.', shared=True)
1320
902
        self.make_bzrdir('subdir')
1321
903
        self.assertRaises(errors.NoRepositoryPresent,
1327
909
    def test_trivial_bzipped(self):
1328
910
        # This tests that the wire encoding is actually bzipped
1329
911
        backing = self.get_transport()
1330
 
        request = smart_repo.SmartServerRepositoryGetParentMap(backing)
 
912
        request = smart.repository.SmartServerRepositoryGetParentMap(backing)
1331
913
        tree = self.make_branch_and_memory_tree('.')
1332
914
 
1333
915
        self.assertEqual(None,
1334
916
            request.execute('', 'missing-id'))
1335
 
        # Note that it returns a body that is bzipped.
1336
 
        self.assertEqual(
1337
 
            smart_req.SuccessfulSmartServerResponse(('ok', ), bz2.compress('')),
1338
 
            request.do_body('\n\n0\n'))
1339
 
 
1340
 
    def test_trivial_include_missing(self):
1341
 
        backing = self.get_transport()
1342
 
        request = smart_repo.SmartServerRepositoryGetParentMap(backing)
1343
 
        tree = self.make_branch_and_memory_tree('.')
1344
 
 
1345
 
        self.assertEqual(None,
1346
 
            request.execute('', 'missing-id', 'include-missing:'))
1347
 
        self.assertEqual(
1348
 
            smart_req.SuccessfulSmartServerResponse(('ok', ),
1349
 
                bz2.compress('missing:missing-id')),
1350
 
            request.do_body('\n\n0\n'))
1351
 
 
1352
 
 
1353
 
class TestSmartServerRepositoryGetRevisionGraph(
1354
 
    tests.TestCaseWithMemoryTransport):
 
917
        # Note that it returns a body (of '' bzipped).
 
918
        self.assertEqual(
 
919
            SuccessfulSmartServerResponse(('ok', ), bz2.compress('')),
 
920
            request.do_body('\n\n0\n'))
 
921
 
 
922
 
 
923
class TestSmartServerRepositoryGetRevisionGraph(tests.TestCaseWithMemoryTransport):
1355
924
 
1356
925
    def test_none_argument(self):
1357
926
        backing = self.get_transport()
1358
 
        request = smart_repo.SmartServerRepositoryGetRevisionGraph(backing)
 
927
        request = smart.repository.SmartServerRepositoryGetRevisionGraph(backing)
1359
928
        tree = self.make_branch_and_memory_tree('.')
1360
929
        tree.lock_write()
1361
930
        tree.add('')
1370
939
        response.body = '\n'.join(sorted(response.body.split('\n')))
1371
940
 
1372
941
        self.assertEqual(
1373
 
            smart_req.SmartServerResponse(('ok', ), '\n'.join(lines)), response)
 
942
            SmartServerResponse(('ok', ), '\n'.join(lines)), response)
1374
943
 
1375
944
    def test_specific_revision_argument(self):
1376
945
        backing = self.get_transport()
1377
 
        request = smart_repo.SmartServerRepositoryGetRevisionGraph(backing)
 
946
        request = smart.repository.SmartServerRepositoryGetRevisionGraph(backing)
1378
947
        tree = self.make_branch_and_memory_tree('.')
1379
948
        tree.lock_write()
1380
949
        tree.add('')
1383
952
        r2 = tree.commit('2nd commit', rev_id=u'\xc8'.encode('utf-8'))
1384
953
        tree.unlock()
1385
954
 
1386
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), rev_id_utf8),
 
955
        self.assertEqual(SmartServerResponse(('ok', ), rev_id_utf8),
1387
956
            request.execute('', rev_id_utf8))
1388
957
 
1389
958
    def test_no_such_revision(self):
1390
959
        backing = self.get_transport()
1391
 
        request = smart_repo.SmartServerRepositoryGetRevisionGraph(backing)
 
960
        request = smart.repository.SmartServerRepositoryGetRevisionGraph(backing)
1392
961
        tree = self.make_branch_and_memory_tree('.')
1393
962
        tree.lock_write()
1394
963
        tree.add('')
1396
965
        tree.unlock()
1397
966
 
1398
967
        # Note that it still returns body (of zero bytes).
1399
 
        self.assertEqual(smart_req.SmartServerResponse(
1400
 
                ('nosuchrevision', 'missingrevision', ), ''),
1401
 
                         request.execute('', 'missingrevision'))
1402
 
 
1403
 
 
1404
 
class TestSmartServerRepositoryGetRevIdForRevno(
1405
 
    tests.TestCaseWithMemoryTransport):
1406
 
 
1407
 
    def test_revno_found(self):
1408
 
        backing = self.get_transport()
1409
 
        request = smart_repo.SmartServerRepositoryGetRevIdForRevno(backing)
1410
 
        tree = self.make_branch_and_memory_tree('.')
1411
 
        tree.lock_write()
1412
 
        tree.add('')
1413
 
        rev1_id_utf8 = u'\xc8'.encode('utf-8')
1414
 
        rev2_id_utf8 = u'\xc9'.encode('utf-8')
1415
 
        tree.commit('1st commit', rev_id=rev1_id_utf8)
1416
 
        tree.commit('2nd commit', rev_id=rev2_id_utf8)
1417
 
        tree.unlock()
1418
 
 
1419
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', rev1_id_utf8)),
1420
 
            request.execute('', 1, (2, rev2_id_utf8)))
1421
 
 
1422
 
    def test_known_revid_missing(self):
1423
 
        backing = self.get_transport()
1424
 
        request = smart_repo.SmartServerRepositoryGetRevIdForRevno(backing)
1425
 
        repo = self.make_repository('.')
1426
 
        self.assertEqual(
1427
 
            smart_req.FailedSmartServerResponse(('nosuchrevision', 'ghost')),
1428
 
            request.execute('', 1, (2, 'ghost')))
1429
 
 
1430
 
    def test_history_incomplete(self):
1431
 
        backing = self.get_transport()
1432
 
        request = smart_repo.SmartServerRepositoryGetRevIdForRevno(backing)
1433
 
        parent = self.make_branch_and_memory_tree('parent', format='1.9')
1434
 
        parent.lock_write()
1435
 
        parent.add([''], ['TREE_ROOT'])
1436
 
        r1 = parent.commit(message='first commit')
1437
 
        r2 = parent.commit(message='second commit')
1438
 
        parent.unlock()
1439
 
        local = self.make_branch_and_memory_tree('local', format='1.9')
1440
 
        local.branch.pull(parent.branch)
1441
 
        local.set_parent_ids([r2])
1442
 
        r3 = local.commit(message='local commit')
1443
 
        local.branch.create_clone_on_transport(
1444
 
            self.get_transport('stacked'), stacked_on=self.get_url('parent'))
1445
 
        self.assertEqual(
1446
 
            smart_req.SmartServerResponse(('history-incomplete', 2, r2)),
1447
 
            request.execute('stacked', 1, (3, r3)))
 
968
        self.assertEqual(
 
969
            SmartServerResponse(('nosuchrevision', 'missingrevision', ), ''),
 
970
            request.execute('', 'missingrevision'))
1448
971
 
1449
972
 
1450
973
class TestSmartServerRepositoryGetStream(tests.TestCaseWithMemoryTransport):
1462
985
    def test_ancestry_of(self):
1463
986
        """The search argument may be a 'ancestry-of' some heads'."""
1464
987
        backing = self.get_transport()
1465
 
        request = smart_repo.SmartServerRepositoryGetStream(backing)
 
988
        request = smart.repository.SmartServerRepositoryGetStream(backing)
1466
989
        repo, r1, r2 = self.make_two_commit_repo()
1467
990
        fetch_spec = ['ancestry-of', r2]
1468
991
        lines = '\n'.join(fetch_spec)
1475
998
    def test_search(self):
1476
999
        """The search argument may be a 'search' of some explicit keys."""
1477
1000
        backing = self.get_transport()
1478
 
        request = smart_repo.SmartServerRepositoryGetStream(backing)
 
1001
        request = smart.repository.SmartServerRepositoryGetStream(backing)
1479
1002
        repo, r1, r2 = self.make_two_commit_repo()
1480
1003
        fetch_spec = ['search', '%s %s' % (r1, r2), 'null:', '2']
1481
1004
        lines = '\n'.join(fetch_spec)
1491
1014
    def test_missing_revision(self):
1492
1015
        """For a missing revision, ('no', ) is returned."""
1493
1016
        backing = self.get_transport()
1494
 
        request = smart_repo.SmartServerRequestHasRevision(backing)
 
1017
        request = smart.repository.SmartServerRequestHasRevision(backing)
1495
1018
        self.make_repository('.')
1496
 
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
 
1019
        self.assertEqual(SmartServerResponse(('no', )),
1497
1020
            request.execute('', 'revid'))
1498
1021
 
1499
1022
    def test_present_revision(self):
1500
1023
        """For a present revision, ('yes', ) is returned."""
1501
1024
        backing = self.get_transport()
1502
 
        request = smart_repo.SmartServerRequestHasRevision(backing)
 
1025
        request = smart.repository.SmartServerRequestHasRevision(backing)
1503
1026
        tree = self.make_branch_and_memory_tree('.')
1504
1027
        tree.lock_write()
1505
1028
        tree.add('')
1507
1030
        r1 = tree.commit('a commit', rev_id=rev_id_utf8)
1508
1031
        tree.unlock()
1509
1032
        self.assertTrue(tree.branch.repository.has_revision(rev_id_utf8))
1510
 
        self.assertEqual(smart_req.SmartServerResponse(('yes', )),
 
1033
        self.assertEqual(SmartServerResponse(('yes', )),
1511
1034
            request.execute('', rev_id_utf8))
1512
1035
 
1513
1036
 
1516
1039
    def test_empty_revid(self):
1517
1040
        """With an empty revid, we get only size an number and revisions"""
1518
1041
        backing = self.get_transport()
1519
 
        request = smart_repo.SmartServerRepositoryGatherStats(backing)
 
1042
        request = smart.repository.SmartServerRepositoryGatherStats(backing)
1520
1043
        repository = self.make_repository('.')
1521
1044
        stats = repository.gather_stats()
1522
1045
        expected_body = 'revisions: 0\n'
1523
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), expected_body),
 
1046
        self.assertEqual(SmartServerResponse(('ok', ), expected_body),
1524
1047
                         request.execute('', '', 'no'))
1525
1048
 
1526
1049
    def test_revid_with_committers(self):
1527
1050
        """For a revid we get more infos."""
1528
1051
        backing = self.get_transport()
1529
1052
        rev_id_utf8 = u'\xc8abc'.encode('utf-8')
1530
 
        request = smart_repo.SmartServerRepositoryGatherStats(backing)
 
1053
        request = smart.repository.SmartServerRepositoryGatherStats(backing)
1531
1054
        tree = self.make_branch_and_memory_tree('.')
1532
1055
        tree.lock_write()
1533
1056
        tree.add('')
1541
1064
        expected_body = ('firstrev: 123456.200 3600\n'
1542
1065
                         'latestrev: 654321.400 0\n'
1543
1066
                         'revisions: 2\n')
1544
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), expected_body),
 
1067
        self.assertEqual(SmartServerResponse(('ok', ), expected_body),
1545
1068
                         request.execute('',
1546
1069
                                         rev_id_utf8, 'no'))
1547
1070
 
1549
1072
        """For a revid and requesting committers we get the whole thing."""
1550
1073
        backing = self.get_transport()
1551
1074
        rev_id_utf8 = u'\xc8abc'.encode('utf-8')
1552
 
        request = smart_repo.SmartServerRepositoryGatherStats(backing)
 
1075
        request = smart.repository.SmartServerRepositoryGatherStats(backing)
1553
1076
        tree = self.make_branch_and_memory_tree('.')
1554
1077
        tree.lock_write()
1555
1078
        tree.add('')
1565
1088
                         'firstrev: 123456.200 3600\n'
1566
1089
                         'latestrev: 654321.400 0\n'
1567
1090
                         'revisions: 2\n')
1568
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), expected_body),
 
1091
        self.assertEqual(SmartServerResponse(('ok', ), expected_body),
1569
1092
                         request.execute('',
1570
1093
                                         rev_id_utf8, 'yes'))
1571
1094
 
1575
1098
    def test_is_shared(self):
1576
1099
        """For a shared repository, ('yes', ) is returned."""
1577
1100
        backing = self.get_transport()
1578
 
        request = smart_repo.SmartServerRepositoryIsShared(backing)
 
1101
        request = smart.repository.SmartServerRepositoryIsShared(backing)
1579
1102
        self.make_repository('.', shared=True)
1580
 
        self.assertEqual(smart_req.SmartServerResponse(('yes', )),
 
1103
        self.assertEqual(SmartServerResponse(('yes', )),
1581
1104
            request.execute('', ))
1582
1105
 
1583
1106
    def test_is_not_shared(self):
1584
1107
        """For a shared repository, ('no', ) is returned."""
1585
1108
        backing = self.get_transport()
1586
 
        request = smart_repo.SmartServerRepositoryIsShared(backing)
 
1109
        request = smart.repository.SmartServerRepositoryIsShared(backing)
1587
1110
        self.make_repository('.', shared=False)
1588
 
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
 
1111
        self.assertEqual(SmartServerResponse(('no', )),
1589
1112
            request.execute('', ))
1590
1113
 
1591
1114
 
1592
1115
class TestSmartServerRepositoryLockWrite(tests.TestCaseWithMemoryTransport):
1593
1116
 
 
1117
    def setUp(self):
 
1118
        tests.TestCaseWithMemoryTransport.setUp(self)
 
1119
 
1594
1120
    def test_lock_write_on_unlocked_repo(self):
1595
1121
        backing = self.get_transport()
1596
 
        request = smart_repo.SmartServerRepositoryLockWrite(backing)
 
1122
        request = smart.repository.SmartServerRepositoryLockWrite(backing)
1597
1123
        repository = self.make_repository('.', format='knit')
1598
1124
        response = request.execute('')
1599
1125
        nonce = repository.control_files._lock.peek().get('nonce')
1600
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', nonce)), response)
 
1126
        self.assertEqual(SmartServerResponse(('ok', nonce)), response)
1601
1127
        # The repository is now locked.  Verify that with a new repository
1602
1128
        # object.
1603
1129
        new_repo = repository.bzrdir.open_repository()
1604
1130
        self.assertRaises(errors.LockContention, new_repo.lock_write)
1605
 
        # Cleanup
1606
 
        request = smart_repo.SmartServerRepositoryUnlock(backing)
1607
 
        response = request.execute('', nonce)
1608
1131
 
1609
1132
    def test_lock_write_on_locked_repo(self):
1610
1133
        backing = self.get_transport()
1611
 
        request = smart_repo.SmartServerRepositoryLockWrite(backing)
 
1134
        request = smart.repository.SmartServerRepositoryLockWrite(backing)
1612
1135
        repository = self.make_repository('.', format='knit')
1613
 
        repo_token = repository.lock_write()
 
1136
        repository.lock_write()
1614
1137
        repository.leave_lock_in_place()
1615
1138
        repository.unlock()
1616
1139
        response = request.execute('')
1617
1140
        self.assertEqual(
1618
 
            smart_req.SmartServerResponse(('LockContention',)), response)
1619
 
        # Cleanup
1620
 
        repository.lock_write(repo_token)
1621
 
        repository.dont_leave_lock_in_place()
1622
 
        repository.unlock()
 
1141
            SmartServerResponse(('LockContention',)), response)
1623
1142
 
1624
1143
    def test_lock_write_on_readonly_transport(self):
1625
1144
        backing = self.get_readonly_transport()
1626
 
        request = smart_repo.SmartServerRepositoryLockWrite(backing)
 
1145
        request = smart.repository.SmartServerRepositoryLockWrite(backing)
1627
1146
        repository = self.make_repository('.', format='knit')
1628
1147
        response = request.execute('')
1629
1148
        self.assertFalse(response.is_successful())
1630
1149
        self.assertEqual('LockFailed', response.args[0])
1631
1150
 
1632
1151
 
1633
 
class TestInsertStreamBase(tests.TestCaseWithMemoryTransport):
1634
 
 
1635
 
    def make_empty_byte_stream(self, repo):
1636
 
        byte_stream = smart_repo._stream_to_byte_stream([], repo._format)
1637
 
        return ''.join(byte_stream)
1638
 
 
1639
 
 
1640
 
class TestSmartServerRepositoryInsertStream(TestInsertStreamBase):
1641
 
 
1642
 
    def test_insert_stream_empty(self):
1643
 
        backing = self.get_transport()
1644
 
        request = smart_repo.SmartServerRepositoryInsertStream(backing)
1645
 
        repository = self.make_repository('.')
1646
 
        response = request.execute('', '')
1647
 
        self.assertEqual(None, response)
1648
 
        response = request.do_chunk(self.make_empty_byte_stream(repository))
1649
 
        self.assertEqual(None, response)
1650
 
        response = request.do_end()
1651
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', )), response)
1652
 
 
1653
 
 
1654
 
class TestSmartServerRepositoryInsertStreamLocked(TestInsertStreamBase):
1655
 
 
1656
 
    def test_insert_stream_empty(self):
1657
 
        backing = self.get_transport()
1658
 
        request = smart_repo.SmartServerRepositoryInsertStreamLocked(
1659
 
            backing)
1660
 
        repository = self.make_repository('.', format='knit')
1661
 
        lock_token = repository.lock_write()
1662
 
        response = request.execute('', '', lock_token)
1663
 
        self.assertEqual(None, response)
1664
 
        response = request.do_chunk(self.make_empty_byte_stream(repository))
1665
 
        self.assertEqual(None, response)
1666
 
        response = request.do_end()
1667
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', )), response)
1668
 
        repository.unlock()
1669
 
 
1670
 
    def test_insert_stream_with_wrong_lock_token(self):
1671
 
        backing = self.get_transport()
1672
 
        request = smart_repo.SmartServerRepositoryInsertStreamLocked(
1673
 
            backing)
1674
 
        repository = self.make_repository('.', format='knit')
1675
 
        lock_token = repository.lock_write()
1676
 
        self.assertRaises(
1677
 
            errors.TokenMismatch, request.execute, '', '', 'wrong-token')
1678
 
        repository.unlock()
1679
 
 
1680
 
 
1681
1152
class TestSmartServerRepositoryUnlock(tests.TestCaseWithMemoryTransport):
1682
1153
 
1683
1154
    def setUp(self):
1685
1156
 
1686
1157
    def test_unlock_on_locked_repo(self):
1687
1158
        backing = self.get_transport()
1688
 
        request = smart_repo.SmartServerRepositoryUnlock(backing)
 
1159
        request = smart.repository.SmartServerRepositoryUnlock(backing)
1689
1160
        repository = self.make_repository('.', format='knit')
1690
1161
        token = repository.lock_write()
1691
1162
        repository.leave_lock_in_place()
1692
1163
        repository.unlock()
1693
1164
        response = request.execute('', token)
1694
1165
        self.assertEqual(
1695
 
            smart_req.SmartServerResponse(('ok',)), response)
 
1166
            SmartServerResponse(('ok',)), response)
1696
1167
        # The repository is now unlocked.  Verify that with a new repository
1697
1168
        # object.
1698
1169
        new_repo = repository.bzrdir.open_repository()
1701
1172
 
1702
1173
    def test_unlock_on_unlocked_repo(self):
1703
1174
        backing = self.get_transport()
1704
 
        request = smart_repo.SmartServerRepositoryUnlock(backing)
 
1175
        request = smart.repository.SmartServerRepositoryUnlock(backing)
1705
1176
        repository = self.make_repository('.', format='knit')
1706
1177
        response = request.execute('', 'some token')
1707
1178
        self.assertEqual(
1708
 
            smart_req.SmartServerResponse(('TokenMismatch',)), response)
 
1179
            SmartServerResponse(('TokenMismatch',)), response)
1709
1180
 
1710
1181
 
1711
1182
class TestSmartServerIsReadonly(tests.TestCaseWithMemoryTransport):
1712
1183
 
1713
1184
    def test_is_readonly_no(self):
1714
1185
        backing = self.get_transport()
1715
 
        request = smart_req.SmartServerIsReadonly(backing)
 
1186
        request = smart.request.SmartServerIsReadonly(backing)
1716
1187
        response = request.execute()
1717
1188
        self.assertEqual(
1718
 
            smart_req.SmartServerResponse(('no',)), response)
 
1189
            SmartServerResponse(('no',)), response)
1719
1190
 
1720
1191
    def test_is_readonly_yes(self):
1721
1192
        backing = self.get_readonly_transport()
1722
 
        request = smart_req.SmartServerIsReadonly(backing)
 
1193
        request = smart.request.SmartServerIsReadonly(backing)
1723
1194
        response = request.execute()
1724
1195
        self.assertEqual(
1725
 
            smart_req.SmartServerResponse(('yes',)), response)
1726
 
 
1727
 
 
1728
 
class TestSmartServerRepositorySetMakeWorkingTrees(
1729
 
    tests.TestCaseWithMemoryTransport):
 
1196
            SmartServerResponse(('yes',)), response)
 
1197
 
 
1198
 
 
1199
class TestSmartServerRepositorySetMakeWorkingTrees(tests.TestCaseWithMemoryTransport):
1730
1200
 
1731
1201
    def test_set_false(self):
1732
1202
        backing = self.get_transport()
1733
1203
        repo = self.make_repository('.', shared=True)
1734
1204
        repo.set_make_working_trees(True)
1735
 
        request_class = smart_repo.SmartServerRepositorySetMakeWorkingTrees
 
1205
        request_class = smart.repository.SmartServerRepositorySetMakeWorkingTrees
1736
1206
        request = request_class(backing)
1737
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
 
1207
        self.assertEqual(SuccessfulSmartServerResponse(('ok',)),
1738
1208
            request.execute('', 'False'))
1739
1209
        repo = repo.bzrdir.open_repository()
1740
1210
        self.assertFalse(repo.make_working_trees())
1743
1213
        backing = self.get_transport()
1744
1214
        repo = self.make_repository('.', shared=True)
1745
1215
        repo.set_make_working_trees(False)
1746
 
        request_class = smart_repo.SmartServerRepositorySetMakeWorkingTrees
 
1216
        request_class = smart.repository.SmartServerRepositorySetMakeWorkingTrees
1747
1217
        request = request_class(backing)
1748
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
 
1218
        self.assertEqual(SuccessfulSmartServerResponse(('ok',)),
1749
1219
            request.execute('', 'True'))
1750
1220
        repo = repo.bzrdir.open_repository()
1751
1221
        self.assertTrue(repo.make_working_trees())
1770
1240
        repo.lock_write()
1771
1241
        self.addCleanup(repo.unlock)
1772
1242
        backing = self.get_transport()
1773
 
        request = smart_packrepo.SmartServerPackRepositoryAutopack(
 
1243
        request = smart.packrepository.SmartServerPackRepositoryAutopack(
1774
1244
            backing)
1775
1245
        response = request.execute('')
1776
 
        self.assertEqual(smart_req.SmartServerResponse(('ok',)), response)
 
1246
        self.assertEqual(SmartServerResponse(('ok',)), response)
1777
1247
        repo._pack_collection.reload_pack_names()
1778
1248
        self.assertEqual(1, len(repo._pack_collection.names()))
1779
1249
 
1785
1255
        for x in range(9):
1786
1256
            tree.commit('commit %s' % x)
1787
1257
        backing = self.get_transport()
1788
 
        request = smart_packrepo.SmartServerPackRepositoryAutopack(
 
1258
        request = smart.packrepository.SmartServerPackRepositoryAutopack(
1789
1259
            backing)
1790
1260
        response = request.execute('')
1791
 
        self.assertEqual(smart_req.SmartServerResponse(('ok',)), response)
 
1261
        self.assertEqual(SmartServerResponse(('ok',)), response)
1792
1262
        repo._pack_collection.reload_pack_names()
1793
1263
        self.assertEqual(9, len(repo._pack_collection.names()))
1794
1264
 
1796
1266
        """A request to autopack a non-pack repo is a no-op."""
1797
1267
        repo = self.make_repository('.', format='knit')
1798
1268
        backing = self.get_transport()
1799
 
        request = smart_packrepo.SmartServerPackRepositoryAutopack(
 
1269
        request = smart.packrepository.SmartServerPackRepositoryAutopack(
1800
1270
            backing)
1801
1271
        response = request.execute('')
1802
 
        self.assertEqual(smart_req.SmartServerResponse(('ok',)), response)
1803
 
 
1804
 
 
1805
 
class TestSmartServerVfsGet(tests.TestCaseWithMemoryTransport):
1806
 
 
1807
 
    def test_unicode_path(self):
1808
 
        """VFS requests expect unicode paths to be escaped."""
1809
 
        filename = u'foo\N{INTERROBANG}'
1810
 
        filename_escaped = urlutils.escape(filename)
1811
 
        backing = self.get_transport()
1812
 
        request = vfs.GetRequest(backing)
1813
 
        backing.put_bytes_non_atomic(filename_escaped, 'contents')
1814
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), 'contents'),
1815
 
            request.execute(filename_escaped))
 
1272
        self.assertEqual(SmartServerResponse(('ok',)), response)
1816
1273
 
1817
1274
 
1818
1275
class TestHandlers(tests.TestCase):
1822
1279
        """All registered request_handlers can be found."""
1823
1280
        # If there's a typo in a register_lazy call, this loop will fail with
1824
1281
        # an AttributeError.
1825
 
        for key, item in smart_req.request_handlers.iteritems():
 
1282
        for key, item in smart.request.request_handlers.iteritems():
1826
1283
            pass
1827
1284
 
1828
 
    def assertHandlerEqual(self, verb, handler):
1829
 
        self.assertEqual(smart_req.request_handlers.get(verb), handler)
1830
 
 
1831
1285
    def test_registered_methods(self):
1832
1286
        """Test that known methods are registered to the correct object."""
1833
 
        self.assertHandlerEqual('Branch.get_config_file',
1834
 
            smart_branch.SmartServerBranchGetConfigFile)
1835
 
        self.assertHandlerEqual('Branch.get_parent',
1836
 
            smart_branch.SmartServerBranchGetParent)
1837
 
        self.assertHandlerEqual('Branch.get_tags_bytes',
1838
 
            smart_branch.SmartServerBranchGetTagsBytes)
1839
 
        self.assertHandlerEqual('Branch.lock_write',
1840
 
            smart_branch.SmartServerBranchRequestLockWrite)
1841
 
        self.assertHandlerEqual('Branch.last_revision_info',
1842
 
            smart_branch.SmartServerBranchRequestLastRevisionInfo)
1843
 
        self.assertHandlerEqual('Branch.revision_history',
1844
 
            smart_branch.SmartServerRequestRevisionHistory)
1845
 
        self.assertHandlerEqual('Branch.set_config_option',
1846
 
            smart_branch.SmartServerBranchRequestSetConfigOption)
1847
 
        self.assertHandlerEqual('Branch.set_last_revision',
1848
 
            smart_branch.SmartServerBranchRequestSetLastRevision)
1849
 
        self.assertHandlerEqual('Branch.set_last_revision_info',
1850
 
            smart_branch.SmartServerBranchRequestSetLastRevisionInfo)
1851
 
        self.assertHandlerEqual('Branch.set_last_revision_ex',
1852
 
            smart_branch.SmartServerBranchRequestSetLastRevisionEx)
1853
 
        self.assertHandlerEqual('Branch.set_parent_location',
1854
 
            smart_branch.SmartServerBranchRequestSetParentLocation)
1855
 
        self.assertHandlerEqual('Branch.unlock',
1856
 
            smart_branch.SmartServerBranchRequestUnlock)
1857
 
        self.assertHandlerEqual('BzrDir.find_repository',
1858
 
            smart_dir.SmartServerRequestFindRepositoryV1)
1859
 
        self.assertHandlerEqual('BzrDir.find_repositoryV2',
1860
 
            smart_dir.SmartServerRequestFindRepositoryV2)
1861
 
        self.assertHandlerEqual('BzrDirFormat.initialize',
1862
 
            smart_dir.SmartServerRequestInitializeBzrDir)
1863
 
        self.assertHandlerEqual('BzrDirFormat.initialize_ex_1.16',
1864
 
            smart_dir.SmartServerRequestBzrDirInitializeEx)
1865
 
        self.assertHandlerEqual('BzrDir.cloning_metadir',
1866
 
            smart_dir.SmartServerBzrDirRequestCloningMetaDir)
1867
 
        self.assertHandlerEqual('BzrDir.get_config_file',
1868
 
            smart_dir.SmartServerBzrDirRequestConfigFile)
1869
 
        self.assertHandlerEqual('BzrDir.open_branch',
1870
 
            smart_dir.SmartServerRequestOpenBranch)
1871
 
        self.assertHandlerEqual('BzrDir.open_branchV2',
1872
 
            smart_dir.SmartServerRequestOpenBranchV2)
1873
 
        self.assertHandlerEqual('BzrDir.open_branchV3',
1874
 
            smart_dir.SmartServerRequestOpenBranchV3)
1875
 
        self.assertHandlerEqual('PackRepository.autopack',
1876
 
            smart_packrepo.SmartServerPackRepositoryAutopack)
1877
 
        self.assertHandlerEqual('Repository.gather_stats',
1878
 
            smart_repo.SmartServerRepositoryGatherStats)
1879
 
        self.assertHandlerEqual('Repository.get_parent_map',
1880
 
            smart_repo.SmartServerRepositoryGetParentMap)
1881
 
        self.assertHandlerEqual('Repository.get_rev_id_for_revno',
1882
 
            smart_repo.SmartServerRepositoryGetRevIdForRevno)
1883
 
        self.assertHandlerEqual('Repository.get_revision_graph',
1884
 
            smart_repo.SmartServerRepositoryGetRevisionGraph)
1885
 
        self.assertHandlerEqual('Repository.get_stream',
1886
 
            smart_repo.SmartServerRepositoryGetStream)
1887
 
        self.assertHandlerEqual('Repository.has_revision',
1888
 
            smart_repo.SmartServerRequestHasRevision)
1889
 
        self.assertHandlerEqual('Repository.insert_stream',
1890
 
            smart_repo.SmartServerRepositoryInsertStream)
1891
 
        self.assertHandlerEqual('Repository.insert_stream_locked',
1892
 
            smart_repo.SmartServerRepositoryInsertStreamLocked)
1893
 
        self.assertHandlerEqual('Repository.is_shared',
1894
 
            smart_repo.SmartServerRepositoryIsShared)
1895
 
        self.assertHandlerEqual('Repository.lock_write',
1896
 
            smart_repo.SmartServerRepositoryLockWrite)
1897
 
        self.assertHandlerEqual('Repository.tarball',
1898
 
            smart_repo.SmartServerRepositoryTarball)
1899
 
        self.assertHandlerEqual('Repository.unlock',
1900
 
            smart_repo.SmartServerRepositoryUnlock)
1901
 
        self.assertHandlerEqual('Transport.is_readonly',
1902
 
            smart_req.SmartServerIsReadonly)
 
1287
        self.assertEqual(
 
1288
            smart.request.request_handlers.get('Branch.get_config_file'),
 
1289
            smart.branch.SmartServerBranchGetConfigFile)
 
1290
        self.assertEqual(
 
1291
            smart.request.request_handlers.get('Branch.get_parent'),
 
1292
            smart.branch.SmartServerBranchGetParent)
 
1293
        self.assertEqual(
 
1294
            smart.request.request_handlers.get('Branch.get_tags_bytes'),
 
1295
            smart.branch.SmartServerBranchGetTagsBytes)
 
1296
        self.assertEqual(
 
1297
            smart.request.request_handlers.get('Branch.lock_write'),
 
1298
            smart.branch.SmartServerBranchRequestLockWrite)
 
1299
        self.assertEqual(
 
1300
            smart.request.request_handlers.get('Branch.last_revision_info'),
 
1301
            smart.branch.SmartServerBranchRequestLastRevisionInfo)
 
1302
        self.assertEqual(
 
1303
            smart.request.request_handlers.get('Branch.revision_history'),
 
1304
            smart.branch.SmartServerRequestRevisionHistory)
 
1305
        self.assertEqual(
 
1306
            smart.request.request_handlers.get('Branch.set_last_revision'),
 
1307
            smart.branch.SmartServerBranchRequestSetLastRevision)
 
1308
        self.assertEqual(
 
1309
            smart.request.request_handlers.get('Branch.set_last_revision_info'),
 
1310
            smart.branch.SmartServerBranchRequestSetLastRevisionInfo)
 
1311
        self.assertEqual(
 
1312
            smart.request.request_handlers.get('Branch.unlock'),
 
1313
            smart.branch.SmartServerBranchRequestUnlock)
 
1314
        self.assertEqual(
 
1315
            smart.request.request_handlers.get('BzrDir.find_repository'),
 
1316
            smart.bzrdir.SmartServerRequestFindRepositoryV1)
 
1317
        self.assertEqual(
 
1318
            smart.request.request_handlers.get('BzrDir.find_repositoryV2'),
 
1319
            smart.bzrdir.SmartServerRequestFindRepositoryV2)
 
1320
        self.assertEqual(
 
1321
            smart.request.request_handlers.get('BzrDirFormat.initialize'),
 
1322
            smart.bzrdir.SmartServerRequestInitializeBzrDir)
 
1323
        self.assertEqual(
 
1324
            smart.request.request_handlers.get('BzrDir.cloning_metadir'),
 
1325
            smart.bzrdir.SmartServerBzrDirRequestCloningMetaDir)
 
1326
        self.assertEqual(
 
1327
            smart.request.request_handlers.get('BzrDir.open_branch'),
 
1328
            smart.bzrdir.SmartServerRequestOpenBranch)
 
1329
        self.assertEqual(
 
1330
            smart.request.request_handlers.get('BzrDir.open_branchV2'),
 
1331
            smart.bzrdir.SmartServerRequestOpenBranchV2)
 
1332
        self.assertEqual(
 
1333
            smart.request.request_handlers.get('PackRepository.autopack'),
 
1334
            smart.packrepository.SmartServerPackRepositoryAutopack)
 
1335
        self.assertEqual(
 
1336
            smart.request.request_handlers.get('Repository.gather_stats'),
 
1337
            smart.repository.SmartServerRepositoryGatherStats)
 
1338
        self.assertEqual(
 
1339
            smart.request.request_handlers.get('Repository.get_parent_map'),
 
1340
            smart.repository.SmartServerRepositoryGetParentMap)
 
1341
        self.assertEqual(
 
1342
            smart.request.request_handlers.get(
 
1343
                'Repository.get_revision_graph'),
 
1344
            smart.repository.SmartServerRepositoryGetRevisionGraph)
 
1345
        self.assertEqual(
 
1346
            smart.request.request_handlers.get('Repository.has_revision'),
 
1347
            smart.repository.SmartServerRequestHasRevision)
 
1348
        self.assertEqual(
 
1349
            smart.request.request_handlers.get('Repository.is_shared'),
 
1350
            smart.repository.SmartServerRepositoryIsShared)
 
1351
        self.assertEqual(
 
1352
            smart.request.request_handlers.get('Repository.lock_write'),
 
1353
            smart.repository.SmartServerRepositoryLockWrite)
 
1354
        self.assertEqual(
 
1355
            smart.request.request_handlers.get('Repository.get_stream'),
 
1356
            smart.repository.SmartServerRepositoryGetStream)
 
1357
        self.assertEqual(
 
1358
            smart.request.request_handlers.get('Repository.tarball'),
 
1359
            smart.repository.SmartServerRepositoryTarball)
 
1360
        self.assertEqual(
 
1361
            smart.request.request_handlers.get('Repository.unlock'),
 
1362
            smart.repository.SmartServerRepositoryUnlock)
 
1363
        self.assertEqual(
 
1364
            smart.request.request_handlers.get('Transport.is_readonly'),
 
1365
            smart.request.SmartServerIsReadonly)