/brz/remove-bazaar

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

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart.py

  • Committer: Aaron Bentley
  • Date: 2009-03-08 01:32:37 UTC
  • mto: This revision was merged to the branch mainline in revision 4095.
  • Revision ID: aaron@aaronbentley.com-20090308013237-1gq0ezk3vej5kr20
Fix progress warning

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
    iter_suite_tests,
 
52
    split_suite_by_re,
 
53
    TestScenarioApplier,
 
54
    )
 
55
from bzrlib.transport import chroot, get_transport
 
56
from bzrlib.util import bencode
56
57
 
57
58
 
58
59
def load_tests(standard_tests, module, loader):
59
60
    """Multiply tests version and protocol consistency."""
60
61
    # FindRepository tests.
61
 
    scenarios = [
 
62
    bzrdir_mod = bzrlib.smart.bzrdir
 
63
    applier = TestScenarioApplier()
 
64
    applier.scenarios = [
62
65
        ("find_repository", {
63
 
            "_request_class": smart_dir.SmartServerRequestFindRepositoryV1}),
 
66
            "_request_class":bzrdir_mod.SmartServerRequestFindRepositoryV1}),
64
67
        ("find_repositoryV2", {
65
 
            "_request_class": smart_dir.SmartServerRequestFindRepositoryV2}),
 
68
            "_request_class":bzrdir_mod.SmartServerRequestFindRepositoryV2}),
66
69
        ("find_repositoryV3", {
67
 
            "_request_class": smart_dir.SmartServerRequestFindRepositoryV3}),
 
70
            "_request_class":bzrdir_mod.SmartServerRequestFindRepositoryV3}),
68
71
        ]
69
 
    to_adapt, result = tests.split_suite_by_re(standard_tests,
 
72
    to_adapt, result = split_suite_by_re(standard_tests,
70
73
        "TestSmartServerRequestFindRepository")
71
 
    v2_only, v1_and_2 = tests.split_suite_by_re(to_adapt,
 
74
    v2_only, v1_and_2 = split_suite_by_re(to_adapt,
72
75
        "_v2")
73
 
    tests.multiply_tests(v1_and_2, scenarios, result)
74
 
    # The first scenario is only applicable to v1 protocols, it is deleted
75
 
    # since.
76
 
    tests.multiply_tests(v2_only, scenarios[1:], result)
 
76
    for test in iter_suite_tests(v1_and_2):
 
77
        result.addTests(applier.adapt(test))
 
78
    del applier.scenarios[0]
 
79
    for test in iter_suite_tests(v2_only):
 
80
        result.addTests(applier.adapt(test))
77
81
    return result
78
82
 
79
83
 
80
84
class TestCaseWithChrootedTransport(tests.TestCaseWithTransport):
81
85
 
82
86
    def setUp(self):
83
 
        self.vfs_transport_factory = memory.MemoryServer
84
87
        tests.TestCaseWithTransport.setUp(self)
85
88
        self._chroot_server = None
86
89
 
88
91
        if self._chroot_server is None:
89
92
            backing_transport = tests.TestCaseWithTransport.get_transport(self)
90
93
            self._chroot_server = chroot.ChrootServer(backing_transport)
91
 
            self.start_server(self._chroot_server)
92
 
        t = transport.get_transport(self._chroot_server.get_url())
 
94
            self._chroot_server.setUp()
 
95
            self.addCleanup(self._chroot_server.tearDown)
 
96
        t = get_transport(self._chroot_server.get_url())
93
97
        if relpath is not None:
94
98
            t = t.clone(relpath)
95
99
        return t
96
100
 
97
101
 
98
 
class TestCaseWithSmartMedium(tests.TestCaseWithMemoryTransport):
 
102
class TestCaseWithSmartMedium(tests.TestCaseWithTransport):
99
103
 
100
104
    def setUp(self):
101
105
        super(TestCaseWithSmartMedium, self).setUp()
106
110
        self.transport_server = self.make_transport_server
107
111
 
108
112
    def make_transport_server(self):
109
 
        return test_server.SmartTCPServer_for_testing('-' + self.id())
 
113
        return smart.server.SmartTCPServer_for_testing('-' + self.id())
110
114
 
111
115
    def get_smart_medium(self):
112
116
        """Get a smart medium to use in tests."""
113
117
        return self.get_transport().get_smart_medium()
114
118
 
115
119
 
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
120
class TestSmartServerResponse(tests.TestCase):
136
121
 
137
122
    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', )))
 
123
        self.assertEqual(SmartServerResponse(('ok', )),
 
124
            SmartServerResponse(('ok', )))
 
125
        self.assertEqual(SmartServerResponse(('ok', ), 'body'),
 
126
            SmartServerResponse(('ok', ), 'body'))
 
127
        self.assertNotEqual(SmartServerResponse(('ok', )),
 
128
            SmartServerResponse(('notok', )))
 
129
        self.assertNotEqual(SmartServerResponse(('ok', ), 'body'),
 
130
            SmartServerResponse(('ok', )))
146
131
        self.assertNotEqual(None,
147
 
            smart_req.SmartServerResponse(('ok', )))
 
132
            SmartServerResponse(('ok', )))
148
133
 
149
134
    def test__str__(self):
150
135
        """SmartServerResponses can be stringified."""
151
136
        self.assertEqual(
152
137
            "<SuccessfulSmartServerResponse args=('args',) body='body'>",
153
 
            str(smart_req.SuccessfulSmartServerResponse(('args',), 'body')))
 
138
            str(SuccessfulSmartServerResponse(('args',), 'body')))
154
139
        self.assertEqual(
155
140
            "<FailedSmartServerResponse args=('args',) body='body'>",
156
 
            str(smart_req.FailedSmartServerResponse(('args',), 'body')))
 
141
            str(FailedSmartServerResponse(('args',), 'body')))
157
142
 
158
143
 
159
144
class TestSmartServerRequest(tests.TestCaseWithMemoryTransport):
160
145
 
161
146
    def test_translate_client_path(self):
162
147
        transport = self.get_transport()
163
 
        request = smart_req.SmartServerRequest(transport, 'foo/')
 
148
        request = SmartServerRequest(transport, 'foo/')
164
149
        self.assertEqual('./', request.translate_client_path('foo/'))
165
150
        self.assertRaises(
166
151
            errors.InvalidURLJoin, request.translate_client_path, 'foo/..')
169
154
        self.assertRaises(
170
155
            errors.PathNotChild, request.translate_client_path, 'bar/')
171
156
        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
157
 
185
158
    def test_transport_from_client_path(self):
186
159
        transport = self.get_transport()
187
 
        request = smart_req.SmartServerRequest(transport, 'foo/')
 
160
        request = SmartServerRequest(transport, 'foo/')
188
161
        self.assertEqual(
189
162
            transport.base,
190
163
            request.transport_from_client_path('foo/').base)
201
174
        local_result = dir.cloning_metadir()
202
175
        request_class = smart_dir.SmartServerBzrDirRequestCloningMetaDir
203
176
        request = request_class(backing)
204
 
        expected = smart_req.SuccessfulSmartServerResponse(
 
177
        expected = SuccessfulSmartServerResponse(
205
178
            (local_result.network_name(),
206
179
            local_result.repository_format.network_name(),
207
 
            ('branch', local_result.get_branch_format().network_name())))
208
 
        self.assertEqual(expected, request.execute('', 'False'))
209
 
 
210
 
    def test_cloning_metadir_reference(self):
211
 
        """The request fails when bzrdir contains a branch reference."""
212
 
        backing = self.get_transport()
213
 
        referenced_branch = self.make_branch('referenced')
214
 
        dir = self.make_bzrdir('.')
215
 
        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)
219
 
        # The server shouldn't try to follow the branch reference, so it's fine
220
 
        # if the referenced branch isn't reachable.
221
 
        backing.rename('referenced', 'moved')
222
 
        request_class = smart_dir.SmartServerBzrDirRequestCloningMetaDir
223
 
        request = request_class(backing)
224
 
        expected = smart_req.FailedSmartServerResponse(('BranchReference',))
 
180
            local_result.get_branch_format().network_name()))
225
181
        self.assertEqual(expected, request.execute('', 'False'))
226
182
 
227
183
 
232
188
        """When there is a bzrdir present, the call succeeds."""
233
189
        backing = self.get_transport()
234
190
        self.make_bzrdir('.')
235
 
        request_class = smart_dir.SmartServerRequestCreateRepository
 
191
        request_class = bzrlib.smart.bzrdir.SmartServerRequestCreateRepository
236
192
        request = request_class(backing)
237
 
        reference_bzrdir_format = bzrdir.format_registry.get('pack-0.92')()
 
193
        reference_bzrdir_format = bzrdir.format_registry.get('default')()
238
194
        reference_format = reference_bzrdir_format.repository_format
239
195
        network_name = reference_format.network_name()
240
 
        expected = smart_req.SuccessfulSmartServerResponse(
 
196
        expected = SuccessfulSmartServerResponse(
241
197
            ('ok', 'no', 'no', 'no', network_name))
242
198
        self.assertEqual(expected, request.execute('', network_name, 'True'))
243
199
 
250
206
        backing = self.get_transport()
251
207
        request = self._request_class(backing)
252
208
        self.make_bzrdir('.')
253
 
        self.assertEqual(smart_req.SmartServerResponse(('norepository', )),
 
209
        self.assertEqual(SmartServerResponse(('norepository', )),
254
210
            request.execute(''))
255
211
 
256
212
    def test_nonshared_repository(self):
262
218
        result = self._make_repository_and_result()
263
219
        self.assertEqual(result, request.execute(''))
264
220
        self.make_bzrdir('subdir')
265
 
        self.assertEqual(smart_req.SmartServerResponse(('norepository', )),
 
221
        self.assertEqual(SmartServerResponse(('norepository', )),
266
222
            request.execute('subdir'))
267
223
 
268
224
    def _make_repository_and_result(self, shared=False, format=None):
279
235
            subtrees = 'yes'
280
236
        else:
281
237
            subtrees = 'no'
282
 
        if repo._format.supports_external_lookups:
283
 
            external = 'yes'
284
 
        else:
285
 
            external = 'no'
286
 
        if (smart_dir.SmartServerRequestFindRepositoryV3 ==
 
238
        if (smart.bzrdir.SmartServerRequestFindRepositoryV3 ==
287
239
            self._request_class):
288
 
            return smart_req.SuccessfulSmartServerResponse(
289
 
                ('ok', '', rich_root, subtrees, external,
 
240
            return SuccessfulSmartServerResponse(
 
241
                ('ok', '', rich_root, subtrees, 'no',
290
242
                 repo._format.network_name()))
291
 
        elif (smart_dir.SmartServerRequestFindRepositoryV2 ==
 
243
        elif (smart.bzrdir.SmartServerRequestFindRepositoryV2 ==
292
244
            self._request_class):
293
245
            # All tests so far are on formats, and for non-external
294
246
            # repositories.
295
 
            return smart_req.SuccessfulSmartServerResponse(
296
 
                ('ok', '', rich_root, subtrees, external))
 
247
            return SuccessfulSmartServerResponse(
 
248
                ('ok', '', rich_root, subtrees, 'no'))
297
249
        else:
298
 
            return smart_req.SuccessfulSmartServerResponse(
299
 
                ('ok', '', rich_root, subtrees))
 
250
            return SuccessfulSmartServerResponse(('ok', '', rich_root, subtrees))
300
251
 
301
252
    def test_shared_repository(self):
302
253
        """When there is a shared repository, we get 'ok', 'relpath-to-repo'."""
305
256
        result = self._make_repository_and_result(shared=True)
306
257
        self.assertEqual(result, request.execute(''))
307
258
        self.make_bzrdir('subdir')
308
 
        result2 = smart_req.SmartServerResponse(
309
 
            result.args[0:1] + ('..', ) + result.args[2:])
 
259
        result2 = SmartServerResponse(result.args[0:1] + ('..', ) + result.args[2:])
310
260
        self.assertEqual(result2,
311
261
            request.execute('subdir'))
312
262
        self.make_bzrdir('subdir/deeper')
313
 
        result3 = smart_req.SmartServerResponse(
314
 
            result.args[0:1] + ('../..', ) + result.args[2:])
 
263
        result3 = SmartServerResponse(result.args[0:1] + ('../..', ) + result.args[2:])
315
264
        self.assertEqual(result3,
316
265
            request.execute('subdir/deeper'))
317
266
 
319
268
        """Test for the format attributes for rich root and subtree support."""
320
269
        backing = self.get_transport()
321
270
        request = self._request_class(backing)
322
 
        result = self._make_repository_and_result(
323
 
            format='dirstate-with-subtree')
 
271
        result = self._make_repository_and_result(format='dirstate-with-subtree')
324
272
        # check the test will be valid
325
273
        self.assertEqual('yes', result.args[2])
326
274
        self.assertEqual('yes', result.args[3])
330
278
        """Test for the supports_external_lookups attribute."""
331
279
        backing = self.get_transport()
332
280
        request = self._request_class(backing)
333
 
        result = self._make_repository_and_result(
334
 
            format='dirstate-with-subtree')
 
281
        result = self._make_repository_and_result(format='dirstate-with-subtree')
335
282
        # check the test will be valid
336
283
        self.assertEqual('no', result.args[4])
337
284
        self.assertEqual(result, request.execute(''))
338
285
 
339
286
 
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
287
class TestSmartServerRequestInitializeBzrDir(tests.TestCaseWithMemoryTransport):
364
288
 
365
289
    def test_empty_dir(self):
366
290
        """Initializing an empty dir should succeed and do it."""
367
291
        backing = self.get_transport()
368
 
        request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
369
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', )),
 
292
        request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
 
293
        self.assertEqual(SmartServerResponse(('ok', )),
370
294
            request.execute(''))
371
295
        made_dir = bzrdir.BzrDir.open_from_transport(backing)
372
296
        # no branch, tree or repository is expected with the current
378
302
    def test_missing_dir(self):
379
303
        """Initializing a missing directory should fail like the bzrdir api."""
380
304
        backing = self.get_transport()
381
 
        request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
 
305
        request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
382
306
        self.assertRaises(errors.NoSuchFile,
383
307
            request.execute, 'subdir')
384
308
 
385
309
    def test_initialized_dir(self):
386
310
        """Initializing an extant bzrdir should fail like the bzrdir api."""
387
311
        backing = self.get_transport()
388
 
        request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
 
312
        request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
389
313
        self.make_bzrdir('subdir')
390
314
        self.assertRaises(errors.FileExists,
391
315
            request.execute, 'subdir')
392
316
 
393
317
 
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
318
class TestSmartServerRequestOpenBranch(TestCaseWithChrootedTransport):
504
319
 
505
320
    def test_no_branch(self):
506
321
        """When there is no branch, ('nobranch', ) is returned."""
507
322
        backing = self.get_transport()
508
 
        request = smart_dir.SmartServerRequestOpenBranch(backing)
 
323
        request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
509
324
        self.make_bzrdir('.')
510
 
        self.assertEqual(smart_req.SmartServerResponse(('nobranch', )),
 
325
        self.assertEqual(SmartServerResponse(('nobranch', )),
511
326
            request.execute(''))
512
327
 
513
328
    def test_branch(self):
514
329
        """When there is a branch, 'ok' is returned."""
515
330
        backing = self.get_transport()
516
 
        request = smart_dir.SmartServerRequestOpenBranch(backing)
 
331
        request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
517
332
        self.make_branch('.')
518
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', '')),
 
333
        self.assertEqual(SmartServerResponse(('ok', '')),
519
334
            request.execute(''))
520
335
 
521
336
    def test_branch_reference(self):
522
337
        """When there is a branch reference, the reference URL is returned."""
523
 
        self.vfs_transport_factory = test_server.LocalURLServer
524
338
        backing = self.get_transport()
525
 
        request = smart_dir.SmartServerRequestOpenBranch(backing)
 
339
        request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
526
340
        branch = self.make_branch('branch')
527
341
        checkout = branch.create_checkout('reference',lightweight=True)
528
 
        reference_url = _mod_branch.BranchReferenceFormat().get_reference(
529
 
            checkout.bzrdir)
 
342
        reference_url = BranchReferenceFormat().get_reference(checkout.bzrdir)
530
343
        self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
531
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', reference_url)),
 
344
        self.assertEqual(SmartServerResponse(('ok', reference_url)),
532
345
            request.execute('reference'))
533
346
 
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
 
 
543
 
class TestSmartServerRequestOpenBranchV2(TestCaseWithChrootedTransport):
544
 
 
545
 
    def test_no_branch(self):
546
 
        """When there is no branch, ('nobranch', ) is returned."""
547
 
        backing = self.get_transport()
548
 
        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(''))
668
 
 
669
347
 
670
348
class TestSmartServerRequestRevisionHistory(tests.TestCaseWithMemoryTransport):
671
349
 
672
350
    def test_empty(self):
673
351
        """For an empty branch, the body is empty."""
674
352
        backing = self.get_transport()
675
 
        request = smart_branch.SmartServerRequestRevisionHistory(backing)
 
353
        request = smart.branch.SmartServerRequestRevisionHistory(backing)
676
354
        self.make_branch('.')
677
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), ''),
 
355
        self.assertEqual(SmartServerResponse(('ok', ), ''),
678
356
            request.execute(''))
679
357
 
680
358
    def test_not_empty(self):
681
359
        """For a non-empty branch, the body is empty."""
682
360
        backing = self.get_transport()
683
 
        request = smart_branch.SmartServerRequestRevisionHistory(backing)
 
361
        request = smart.branch.SmartServerRequestRevisionHistory(backing)
684
362
        tree = self.make_branch_and_memory_tree('.')
685
363
        tree.lock_write()
686
364
        tree.add('')
688
366
        r2 = tree.commit('2nd commit', rev_id=u'\xc8'.encode('utf-8'))
689
367
        tree.unlock()
690
368
        self.assertEqual(
691
 
            smart_req.SmartServerResponse(('ok', ), ('\x00'.join([r1, r2]))),
 
369
            SmartServerResponse(('ok', ), ('\x00'.join([r1, r2]))),
692
370
            request.execute(''))
693
371
 
694
372
 
697
375
    def test_no_branch(self):
698
376
        """When there is a bzrdir and no branch, NotBranchError is raised."""
699
377
        backing = self.get_transport()
700
 
        request = smart_branch.SmartServerBranchRequest(backing)
 
378
        request = smart.branch.SmartServerBranchRequest(backing)
701
379
        self.make_bzrdir('.')
702
380
        self.assertRaises(errors.NotBranchError,
703
381
            request.execute, '')
705
383
    def test_branch_reference(self):
706
384
        """When there is a branch reference, NotBranchError is raised."""
707
385
        backing = self.get_transport()
708
 
        request = smart_branch.SmartServerBranchRequest(backing)
 
386
        request = smart.branch.SmartServerBranchRequest(backing)
709
387
        branch = self.make_branch('branch')
710
388
        checkout = branch.create_checkout('reference',lightweight=True)
711
389
        self.assertRaises(errors.NotBranchError,
712
390
            request.execute, 'checkout')
713
391
 
714
392
 
715
 
class TestSmartServerBranchRequestLastRevisionInfo(
716
 
    tests.TestCaseWithMemoryTransport):
 
393
class TestSmartServerBranchRequestLastRevisionInfo(tests.TestCaseWithMemoryTransport):
717
394
 
718
395
    def test_empty(self):
719
396
        """For an empty branch, the result is ('ok', '0', 'null:')."""
720
397
        backing = self.get_transport()
721
 
        request = smart_branch.SmartServerBranchRequestLastRevisionInfo(backing)
 
398
        request = smart.branch.SmartServerBranchRequestLastRevisionInfo(backing)
722
399
        self.make_branch('.')
723
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', '0', 'null:')),
 
400
        self.assertEqual(SmartServerResponse(('ok', '0', 'null:')),
724
401
            request.execute(''))
725
402
 
726
403
    def test_not_empty(self):
727
404
        """For a non-empty branch, the result is ('ok', 'revno', 'revid')."""
728
405
        backing = self.get_transport()
729
 
        request = smart_branch.SmartServerBranchRequestLastRevisionInfo(backing)
 
406
        request = smart.branch.SmartServerBranchRequestLastRevisionInfo(backing)
730
407
        tree = self.make_branch_and_memory_tree('.')
731
408
        tree.lock_write()
732
409
        tree.add('')
735
412
        r2 = tree.commit('2nd commit', rev_id=rev_id_utf8)
736
413
        tree.unlock()
737
414
        self.assertEqual(
738
 
            smart_req.SmartServerResponse(('ok', '2', rev_id_utf8)),
 
415
            SmartServerResponse(('ok', '2', rev_id_utf8)),
739
416
            request.execute(''))
740
417
 
741
418
 
742
 
class TestSmartServerBranchRequestGetConfigFile(
743
 
    tests.TestCaseWithMemoryTransport):
 
419
class TestSmartServerBranchRequestGetConfigFile(tests.TestCaseWithMemoryTransport):
744
420
 
745
421
    def test_default(self):
746
422
        """With no file, we get empty content."""
747
423
        backing = self.get_transport()
748
 
        request = smart_branch.SmartServerBranchGetConfigFile(backing)
 
424
        request = smart.branch.SmartServerBranchGetConfigFile(backing)
749
425
        branch = self.make_branch('.')
750
426
        # there should be no file by default
751
427
        content = ''
752
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), content),
 
428
        self.assertEqual(SmartServerResponse(('ok', ), content),
753
429
            request.execute(''))
754
430
 
755
431
    def test_with_content(self):
757
433
        # branch.control_files.get('branch.conf') for now - in the future it may
758
434
        # perform more complex processing.
759
435
        backing = self.get_transport()
760
 
        request = smart_branch.SmartServerBranchGetConfigFile(backing)
 
436
        request = smart.branch.SmartServerBranchGetConfigFile(backing)
761
437
        branch = self.make_branch('.')
762
438
        branch._transport.put_bytes('branch.conf', 'foo bar baz')
763
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), 'foo bar baz'),
 
439
        self.assertEqual(SmartServerResponse(('ok', ), 'foo bar baz'),
764
440
            request.execute(''))
765
441
 
766
442
 
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):
 
443
class SetLastRevisionTestBase(tests.TestCaseWithMemoryTransport):
843
444
    """Base test case for verbs that implement set_last_revision."""
844
445
 
845
446
    def setUp(self):
849
450
        self.tree = self.make_branch_and_memory_tree('.')
850
451
 
851
452
    def lock_branch(self):
852
 
        return self.get_lock_tokens(self.tree.branch)
 
453
        b = self.tree.branch
 
454
        branch_token = b.lock_write()
 
455
        repo_token = b.repository.lock_write()
 
456
        b.repository.unlock()
 
457
        return branch_token, repo_token
853
458
 
854
459
    def unlock_branch(self):
855
460
        self.tree.branch.unlock()
863
468
 
864
469
    def assertRequestSucceeds(self, revision_id, revno):
865
470
        response = self.set_last_revision(revision_id, revno)
866
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
867
 
                         response)
 
471
        self.assertEqual(SuccessfulSmartServerResponse(('ok',)), response)
868
472
 
869
473
 
870
474
class TestSetLastRevisionVerbMixin(object):
878
482
        """If the revision_id is not present, the verb returns NoSuchRevision.
879
483
        """
880
484
        revision_id = 'non-existent revision'
881
 
        self.assertEqual(smart_req.FailedSmartServerResponse(('NoSuchRevision',
882
 
                                                              revision_id)),
883
 
                         self.set_last_revision(revision_id, 1))
 
485
        self.assertEqual(
 
486
            FailedSmartServerResponse(('NoSuchRevision', revision_id)),
 
487
            self.set_last_revision(revision_id, 1))
884
488
 
885
489
    def make_tree_with_two_commits(self):
886
490
        self.tree.lock_write()
926
530
        rejection_message = u'rejection message\N{INTERROBANG}'
927
531
        def hook_that_rejects(params):
928
532
            raise errors.TipChangeRejected(rejection_message)
929
 
        _mod_branch.Branch.hooks.install_named_hook(
 
533
        Branch.hooks.install_named_hook(
930
534
            'pre_change_branch_tip', hook_that_rejects, None)
931
535
        self.assertEqual(
932
 
            smart_req.FailedSmartServerResponse(
 
536
            FailedSmartServerResponse(
933
537
                ('TipChangeRejected', rejection_message.encode('utf-8'))),
934
538
            self.set_last_revision('null:', 0))
935
539
 
938
542
        SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
939
543
    """Tests for Branch.set_last_revision verb."""
940
544
 
941
 
    request_class = smart_branch.SmartServerBranchRequestSetLastRevision
 
545
    request_class = smart.branch.SmartServerBranchRequestSetLastRevision
942
546
 
943
547
    def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
944
548
        return self.request.execute(
949
553
        SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
950
554
    """Tests for Branch.set_last_revision_info verb."""
951
555
 
952
 
    request_class = smart_branch.SmartServerBranchRequestSetLastRevisionInfo
 
556
    request_class = smart.branch.SmartServerBranchRequestSetLastRevisionInfo
953
557
 
954
558
    def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
955
559
        return self.request.execute(
966
570
        SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
967
571
    """Tests for Branch.set_last_revision_ex verb."""
968
572
 
969
 
    request_class = smart_branch.SmartServerBranchRequestSetLastRevisionEx
 
573
    request_class = smart.branch.SmartServerBranchRequestSetLastRevisionEx
970
574
 
971
575
    def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
972
576
        return self.request.execute(
975
579
    def assertRequestSucceeds(self, revision_id, revno):
976
580
        response = self.set_last_revision(revision_id, revno)
977
581
        self.assertEqual(
978
 
            smart_req.SuccessfulSmartServerResponse(('ok', revno, revision_id)),
 
582
            SuccessfulSmartServerResponse(('ok', revno, revision_id)),
979
583
            response)
980
584
 
981
585
    def test_branch_last_revision_info_rewind(self):
992
596
        response = self.request.execute(
993
597
            '', branch_token, repo_token, rev_id_utf8, 0, 0)
994
598
        self.assertEqual(
995
 
            smart_req.SuccessfulSmartServerResponse(('ok', 2, 'rev-2')),
 
599
            SuccessfulSmartServerResponse(('ok', 2, 'rev-2')),
996
600
            response)
997
601
        self.assertEqual(
998
602
            (2, 'rev-2'), self.tree.branch.last_revision_info())
1002
606
        response = self.request.execute(
1003
607
            '', branch_token, repo_token, rev_id_utf8, 0, 1)
1004
608
        self.assertEqual(
1005
 
            smart_req.SuccessfulSmartServerResponse(('ok', 1, rev_id_utf8)),
 
609
            SuccessfulSmartServerResponse(('ok', 1, rev_id_utf8)),
1006
610
            response)
1007
611
        self.unlock_branch()
1008
612
        self.assertEqual(
1033
637
        """
1034
638
        self.make_branch_with_divergent_history()
1035
639
        self.assertEqual(
1036
 
            smart_req.FailedSmartServerResponse(('Diverged',)),
 
640
            FailedSmartServerResponse(('Diverged',)),
1037
641
            self.set_last_revision('child-1', 2))
1038
642
        # The branch tip was not changed.
1039
643
        self.assertEqual('child-2', self.tree.branch.last_revision())
1047
651
        response = self.request.execute(
1048
652
            '', branch_token, repo_token, 'child-1', 1, 0)
1049
653
        self.assertEqual(
1050
 
            smart_req.SuccessfulSmartServerResponse(('ok', 2, 'child-1')),
 
654
            SuccessfulSmartServerResponse(('ok', 2, 'child-1')),
1051
655
            response)
1052
656
        self.unlock_branch()
1053
657
        # The branch tip was changed.
1054
658
        self.assertEqual('child-1', self.tree.branch.last_revision())
1055
659
 
1056
660
 
1057
 
class TestSmartServerBranchRequestGetParent(tests.TestCaseWithMemoryTransport):
1058
 
 
1059
 
    def test_get_parent_none(self):
1060
 
        base_branch = self.make_branch('base')
1061
 
        request = smart_branch.SmartServerBranchGetParent(self.get_transport())
1062
 
        response = request.execute('base')
1063
 
        self.assertEquals(
1064
 
            smart_req.SuccessfulSmartServerResponse(('',)), response)
1065
 
 
1066
 
    def test_get_parent_something(self):
1067
 
        base_branch = self.make_branch('base')
1068
 
        base_branch.set_parent(self.get_url('foo'))
1069
 
        request = smart_branch.SmartServerBranchGetParent(self.get_transport())
1070
 
        response = request.execute('base')
1071
 
        self.assertEquals(
1072
 
            smart_req.SuccessfulSmartServerResponse(("../foo",)),
1073
 
            response)
1074
 
 
1075
 
 
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.
1115
 
 
1116
 
    def test_get_bytes(self):
1117
 
        base_branch = self.make_branch('base')
1118
 
        request = smart_branch.SmartServerBranchGetTagsBytes(
1119
 
            self.get_transport())
1120
 
        response = request.execute('base')
1121
 
        self.assertEquals(
1122
 
            smart_req.SuccessfulSmartServerResponse(('',)), response)
1123
 
 
1124
 
 
1125
661
class TestSmartServerBranchRequestGetStackedOnURL(tests.TestCaseWithMemoryTransport):
1126
662
 
1127
663
    def test_get_stacked_on_url(self):
1129
665
        stacked_branch = self.make_branch('stacked', format='1.6')
1130
666
        # typically should be relative
1131
667
        stacked_branch.set_stacked_on_url('../base')
1132
 
        request = smart_branch.SmartServerBranchRequestGetStackedOnURL(
 
668
        request = smart.branch.SmartServerBranchRequestGetStackedOnURL(
1133
669
            self.get_transport())
1134
670
        response = request.execute('stacked')
1135
671
        self.assertEquals(
1136
 
            smart_req.SmartServerResponse(('ok', '../base')),
 
672
            SmartServerResponse(('ok', '../base')),
1137
673
            response)
1138
674
 
1139
675
 
1144
680
 
1145
681
    def test_lock_write_on_unlocked_branch(self):
1146
682
        backing = self.get_transport()
1147
 
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
 
683
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1148
684
        branch = self.make_branch('.', format='knit')
1149
685
        repository = branch.repository
1150
686
        response = request.execute('')
1151
687
        branch_nonce = branch.control_files._lock.peek().get('nonce')
1152
688
        repository_nonce = repository.control_files._lock.peek().get('nonce')
1153
 
        self.assertEqual(smart_req.SmartServerResponse(
1154
 
                ('ok', branch_nonce, repository_nonce)),
1155
 
                         response)
 
689
        self.assertEqual(
 
690
            SmartServerResponse(('ok', branch_nonce, repository_nonce)),
 
691
            response)
1156
692
        # The branch (and associated repository) is now locked.  Verify that
1157
693
        # with a new branch object.
1158
694
        new_branch = repository.bzrdir.open_branch()
1159
695
        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
696
 
1164
697
    def test_lock_write_on_locked_branch(self):
1165
698
        backing = self.get_transport()
1166
 
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
 
699
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1167
700
        branch = self.make_branch('.')
1168
 
        branch_token = branch.lock_write()
 
701
        branch.lock_write()
1169
702
        branch.leave_lock_in_place()
1170
703
        branch.unlock()
1171
704
        response = request.execute('')
1172
705
        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()
 
706
            SmartServerResponse(('LockContention',)), response)
1178
707
 
1179
708
    def test_lock_write_with_tokens_on_locked_branch(self):
1180
709
        backing = self.get_transport()
1181
 
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
 
710
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1182
711
        branch = self.make_branch('.', format='knit')
1183
712
        branch_token = branch.lock_write()
1184
713
        repo_token = branch.repository.lock_write()
1189
718
        response = request.execute('',
1190
719
                                   branch_token, repo_token)
1191
720
        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()
 
721
            SmartServerResponse(('ok', branch_token, repo_token)), response)
1201
722
 
1202
723
    def test_lock_write_with_mismatched_tokens_on_locked_branch(self):
1203
724
        backing = self.get_transport()
1204
 
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
 
725
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1205
726
        branch = self.make_branch('.', format='knit')
1206
727
        branch_token = branch.lock_write()
1207
728
        repo_token = branch.repository.lock_write()
1212
733
        response = request.execute('',
1213
734
                                   branch_token+'xxx', repo_token)
1214
735
        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()
 
736
            SmartServerResponse(('TokenMismatch',)), response)
1223
737
 
1224
738
    def test_lock_write_on_locked_repo(self):
1225
739
        backing = self.get_transport()
1226
 
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
 
740
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1227
741
        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()
 
742
        branch.repository.lock_write()
 
743
        branch.repository.leave_lock_in_place()
 
744
        branch.repository.unlock()
1232
745
        response = request.execute('')
1233
746
        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()
 
747
            SmartServerResponse(('LockContention',)), response)
1239
748
 
1240
749
    def test_lock_write_on_readonly_transport(self):
1241
750
        backing = self.get_readonly_transport()
1242
 
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
 
751
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1243
752
        branch = self.make_branch('.')
1244
753
        root = self.get_transport().clone('/')
1245
754
        path = urlutils.relative_url(root.base, self.get_transport().base)
1256
765
 
1257
766
    def test_unlock_on_locked_branch_and_repo(self):
1258
767
        backing = self.get_transport()
1259
 
        request = smart_branch.SmartServerBranchRequestUnlock(backing)
 
768
        request = smart.branch.SmartServerBranchRequestUnlock(backing)
1260
769
        branch = self.make_branch('.', format='knit')
1261
770
        # Lock the branch
1262
771
        branch_token = branch.lock_write()
1270
779
        response = request.execute('',
1271
780
                                   branch_token, repo_token)
1272
781
        self.assertEqual(
1273
 
            smart_req.SmartServerResponse(('ok',)), response)
 
782
            SmartServerResponse(('ok',)), response)
1274
783
        # The branch is now unlocked.  Verify that with a new branch
1275
784
        # object.
1276
785
        new_branch = branch.bzrdir.open_branch()
1279
788
 
1280
789
    def test_unlock_on_unlocked_branch_unlocked_repo(self):
1281
790
        backing = self.get_transport()
1282
 
        request = smart_branch.SmartServerBranchRequestUnlock(backing)
 
791
        request = smart.branch.SmartServerBranchRequestUnlock(backing)
1283
792
        branch = self.make_branch('.', format='knit')
1284
793
        response = request.execute(
1285
794
            '', 'branch token', 'repo token')
1286
795
        self.assertEqual(
1287
 
            smart_req.SmartServerResponse(('TokenMismatch',)), response)
 
796
            SmartServerResponse(('TokenMismatch',)), response)
1288
797
 
1289
798
    def test_unlock_on_unlocked_branch_locked_repo(self):
1290
799
        backing = self.get_transport()
1291
 
        request = smart_branch.SmartServerBranchRequestUnlock(backing)
 
800
        request = smart.branch.SmartServerBranchRequestUnlock(backing)
1292
801
        branch = self.make_branch('.', format='knit')
1293
802
        # Lock the repository.
1294
803
        repo_token = branch.repository.lock_write()
1299
808
        response = request.execute(
1300
809
            '', 'branch token', repo_token)
1301
810
        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()
 
811
            SmartServerResponse(('TokenMismatch',)), response)
1307
812
 
1308
813
 
1309
814
class TestSmartServerRepositoryRequest(tests.TestCaseWithMemoryTransport):
1315
820
        # its the exact path being looked at and the server is not
1316
821
        # searching.
1317
822
        backing = self.get_transport()
1318
 
        request = smart_repo.SmartServerRepositoryRequest(backing)
 
823
        request = smart.repository.SmartServerRepositoryRequest(backing)
1319
824
        self.make_repository('.', shared=True)
1320
825
        self.make_bzrdir('subdir')
1321
826
        self.assertRaises(errors.NoRepositoryPresent,
1327
832
    def test_trivial_bzipped(self):
1328
833
        # This tests that the wire encoding is actually bzipped
1329
834
        backing = self.get_transport()
1330
 
        request = smart_repo.SmartServerRepositoryGetParentMap(backing)
 
835
        request = smart.repository.SmartServerRepositoryGetParentMap(backing)
1331
836
        tree = self.make_branch_and_memory_tree('.')
1332
837
 
1333
838
        self.assertEqual(None,
1334
839
            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):
 
840
        # Note that it returns a body (of '' bzipped).
 
841
        self.assertEqual(
 
842
            SuccessfulSmartServerResponse(('ok', ), bz2.compress('')),
 
843
            request.do_body('\n\n0\n'))
 
844
 
 
845
 
 
846
class TestSmartServerRepositoryGetRevisionGraph(tests.TestCaseWithMemoryTransport):
1355
847
 
1356
848
    def test_none_argument(self):
1357
849
        backing = self.get_transport()
1358
 
        request = smart_repo.SmartServerRepositoryGetRevisionGraph(backing)
 
850
        request = smart.repository.SmartServerRepositoryGetRevisionGraph(backing)
1359
851
        tree = self.make_branch_and_memory_tree('.')
1360
852
        tree.lock_write()
1361
853
        tree.add('')
1370
862
        response.body = '\n'.join(sorted(response.body.split('\n')))
1371
863
 
1372
864
        self.assertEqual(
1373
 
            smart_req.SmartServerResponse(('ok', ), '\n'.join(lines)), response)
 
865
            SmartServerResponse(('ok', ), '\n'.join(lines)), response)
1374
866
 
1375
867
    def test_specific_revision_argument(self):
1376
868
        backing = self.get_transport()
1377
 
        request = smart_repo.SmartServerRepositoryGetRevisionGraph(backing)
 
869
        request = smart.repository.SmartServerRepositoryGetRevisionGraph(backing)
1378
870
        tree = self.make_branch_and_memory_tree('.')
1379
871
        tree.lock_write()
1380
872
        tree.add('')
1383
875
        r2 = tree.commit('2nd commit', rev_id=u'\xc8'.encode('utf-8'))
1384
876
        tree.unlock()
1385
877
 
1386
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), rev_id_utf8),
 
878
        self.assertEqual(SmartServerResponse(('ok', ), rev_id_utf8),
1387
879
            request.execute('', rev_id_utf8))
1388
880
 
1389
881
    def test_no_such_revision(self):
1390
882
        backing = self.get_transport()
1391
 
        request = smart_repo.SmartServerRepositoryGetRevisionGraph(backing)
 
883
        request = smart.repository.SmartServerRepositoryGetRevisionGraph(backing)
1392
884
        tree = self.make_branch_and_memory_tree('.')
1393
885
        tree.lock_write()
1394
886
        tree.add('')
1396
888
        tree.unlock()
1397
889
 
1398
890
        # 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)))
1448
 
 
1449
 
 
1450
 
class TestSmartServerRepositoryGetStream(tests.TestCaseWithMemoryTransport):
1451
 
 
1452
 
    def make_two_commit_repo(self):
1453
 
        tree = self.make_branch_and_memory_tree('.')
1454
 
        tree.lock_write()
1455
 
        tree.add('')
1456
 
        r1 = tree.commit('1st commit')
1457
 
        r2 = tree.commit('2nd commit', rev_id=u'\xc8'.encode('utf-8'))
1458
 
        tree.unlock()
1459
 
        repo = tree.branch.repository
1460
 
        return repo, r1, r2
1461
 
 
1462
 
    def test_ancestry_of(self):
1463
 
        """The search argument may be a 'ancestry-of' some heads'."""
1464
 
        backing = self.get_transport()
1465
 
        request = smart_repo.SmartServerRepositoryGetStream(backing)
1466
 
        repo, r1, r2 = self.make_two_commit_repo()
1467
 
        fetch_spec = ['ancestry-of', r2]
1468
 
        lines = '\n'.join(fetch_spec)
1469
 
        request.execute('', repo._format.network_name())
1470
 
        response = request.do_body(lines)
1471
 
        self.assertEqual(('ok',), response.args)
1472
 
        stream_bytes = ''.join(response.body_stream)
1473
 
        self.assertStartsWith(stream_bytes, 'Bazaar pack format 1')
1474
 
 
1475
 
    def test_search(self):
1476
 
        """The search argument may be a 'search' of some explicit keys."""
1477
 
        backing = self.get_transport()
1478
 
        request = smart_repo.SmartServerRepositoryGetStream(backing)
1479
 
        repo, r1, r2 = self.make_two_commit_repo()
1480
 
        fetch_spec = ['search', '%s %s' % (r1, r2), 'null:', '2']
1481
 
        lines = '\n'.join(fetch_spec)
1482
 
        request.execute('', repo._format.network_name())
1483
 
        response = request.do_body(lines)
1484
 
        self.assertEqual(('ok',), response.args)
1485
 
        stream_bytes = ''.join(response.body_stream)
1486
 
        self.assertStartsWith(stream_bytes, 'Bazaar pack format 1')
 
891
        self.assertEqual(
 
892
            SmartServerResponse(('nosuchrevision', 'missingrevision', ), ''),
 
893
            request.execute('', 'missingrevision'))
1487
894
 
1488
895
 
1489
896
class TestSmartServerRequestHasRevision(tests.TestCaseWithMemoryTransport):
1491
898
    def test_missing_revision(self):
1492
899
        """For a missing revision, ('no', ) is returned."""
1493
900
        backing = self.get_transport()
1494
 
        request = smart_repo.SmartServerRequestHasRevision(backing)
 
901
        request = smart.repository.SmartServerRequestHasRevision(backing)
1495
902
        self.make_repository('.')
1496
 
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
 
903
        self.assertEqual(SmartServerResponse(('no', )),
1497
904
            request.execute('', 'revid'))
1498
905
 
1499
906
    def test_present_revision(self):
1500
907
        """For a present revision, ('yes', ) is returned."""
1501
908
        backing = self.get_transport()
1502
 
        request = smart_repo.SmartServerRequestHasRevision(backing)
 
909
        request = smart.repository.SmartServerRequestHasRevision(backing)
1503
910
        tree = self.make_branch_and_memory_tree('.')
1504
911
        tree.lock_write()
1505
912
        tree.add('')
1507
914
        r1 = tree.commit('a commit', rev_id=rev_id_utf8)
1508
915
        tree.unlock()
1509
916
        self.assertTrue(tree.branch.repository.has_revision(rev_id_utf8))
1510
 
        self.assertEqual(smart_req.SmartServerResponse(('yes', )),
 
917
        self.assertEqual(SmartServerResponse(('yes', )),
1511
918
            request.execute('', rev_id_utf8))
1512
919
 
1513
920
 
1516
923
    def test_empty_revid(self):
1517
924
        """With an empty revid, we get only size an number and revisions"""
1518
925
        backing = self.get_transport()
1519
 
        request = smart_repo.SmartServerRepositoryGatherStats(backing)
 
926
        request = smart.repository.SmartServerRepositoryGatherStats(backing)
1520
927
        repository = self.make_repository('.')
1521
928
        stats = repository.gather_stats()
1522
929
        expected_body = 'revisions: 0\n'
1523
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), expected_body),
 
930
        self.assertEqual(SmartServerResponse(('ok', ), expected_body),
1524
931
                         request.execute('', '', 'no'))
1525
932
 
1526
933
    def test_revid_with_committers(self):
1527
934
        """For a revid we get more infos."""
1528
935
        backing = self.get_transport()
1529
936
        rev_id_utf8 = u'\xc8abc'.encode('utf-8')
1530
 
        request = smart_repo.SmartServerRepositoryGatherStats(backing)
 
937
        request = smart.repository.SmartServerRepositoryGatherStats(backing)
1531
938
        tree = self.make_branch_and_memory_tree('.')
1532
939
        tree.lock_write()
1533
940
        tree.add('')
1541
948
        expected_body = ('firstrev: 123456.200 3600\n'
1542
949
                         'latestrev: 654321.400 0\n'
1543
950
                         'revisions: 2\n')
1544
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), expected_body),
 
951
        self.assertEqual(SmartServerResponse(('ok', ), expected_body),
1545
952
                         request.execute('',
1546
953
                                         rev_id_utf8, 'no'))
1547
954
 
1549
956
        """For a revid and requesting committers we get the whole thing."""
1550
957
        backing = self.get_transport()
1551
958
        rev_id_utf8 = u'\xc8abc'.encode('utf-8')
1552
 
        request = smart_repo.SmartServerRepositoryGatherStats(backing)
 
959
        request = smart.repository.SmartServerRepositoryGatherStats(backing)
1553
960
        tree = self.make_branch_and_memory_tree('.')
1554
961
        tree.lock_write()
1555
962
        tree.add('')
1565
972
                         'firstrev: 123456.200 3600\n'
1566
973
                         'latestrev: 654321.400 0\n'
1567
974
                         'revisions: 2\n')
1568
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), expected_body),
 
975
        self.assertEqual(SmartServerResponse(('ok', ), expected_body),
1569
976
                         request.execute('',
1570
977
                                         rev_id_utf8, 'yes'))
1571
978
 
1575
982
    def test_is_shared(self):
1576
983
        """For a shared repository, ('yes', ) is returned."""
1577
984
        backing = self.get_transport()
1578
 
        request = smart_repo.SmartServerRepositoryIsShared(backing)
 
985
        request = smart.repository.SmartServerRepositoryIsShared(backing)
1579
986
        self.make_repository('.', shared=True)
1580
 
        self.assertEqual(smart_req.SmartServerResponse(('yes', )),
 
987
        self.assertEqual(SmartServerResponse(('yes', )),
1581
988
            request.execute('', ))
1582
989
 
1583
990
    def test_is_not_shared(self):
1584
991
        """For a shared repository, ('no', ) is returned."""
1585
992
        backing = self.get_transport()
1586
 
        request = smart_repo.SmartServerRepositoryIsShared(backing)
 
993
        request = smart.repository.SmartServerRepositoryIsShared(backing)
1587
994
        self.make_repository('.', shared=False)
1588
 
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
 
995
        self.assertEqual(SmartServerResponse(('no', )),
1589
996
            request.execute('', ))
1590
997
 
1591
998
 
1592
999
class TestSmartServerRepositoryLockWrite(tests.TestCaseWithMemoryTransport):
1593
1000
 
 
1001
    def setUp(self):
 
1002
        tests.TestCaseWithMemoryTransport.setUp(self)
 
1003
 
1594
1004
    def test_lock_write_on_unlocked_repo(self):
1595
1005
        backing = self.get_transport()
1596
 
        request = smart_repo.SmartServerRepositoryLockWrite(backing)
 
1006
        request = smart.repository.SmartServerRepositoryLockWrite(backing)
1597
1007
        repository = self.make_repository('.', format='knit')
1598
1008
        response = request.execute('')
1599
1009
        nonce = repository.control_files._lock.peek().get('nonce')
1600
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', nonce)), response)
 
1010
        self.assertEqual(SmartServerResponse(('ok', nonce)), response)
1601
1011
        # The repository is now locked.  Verify that with a new repository
1602
1012
        # object.
1603
1013
        new_repo = repository.bzrdir.open_repository()
1604
1014
        self.assertRaises(errors.LockContention, new_repo.lock_write)
1605
 
        # Cleanup
1606
 
        request = smart_repo.SmartServerRepositoryUnlock(backing)
1607
 
        response = request.execute('', nonce)
1608
1015
 
1609
1016
    def test_lock_write_on_locked_repo(self):
1610
1017
        backing = self.get_transport()
1611
 
        request = smart_repo.SmartServerRepositoryLockWrite(backing)
 
1018
        request = smart.repository.SmartServerRepositoryLockWrite(backing)
1612
1019
        repository = self.make_repository('.', format='knit')
1613
 
        repo_token = repository.lock_write()
 
1020
        repository.lock_write()
1614
1021
        repository.leave_lock_in_place()
1615
1022
        repository.unlock()
1616
1023
        response = request.execute('')
1617
1024
        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()
 
1025
            SmartServerResponse(('LockContention',)), response)
1623
1026
 
1624
1027
    def test_lock_write_on_readonly_transport(self):
1625
1028
        backing = self.get_readonly_transport()
1626
 
        request = smart_repo.SmartServerRepositoryLockWrite(backing)
 
1029
        request = smart.repository.SmartServerRepositoryLockWrite(backing)
1627
1030
        repository = self.make_repository('.', format='knit')
1628
1031
        response = request.execute('')
1629
1032
        self.assertFalse(response.is_successful())
1630
1033
        self.assertEqual('LockFailed', response.args[0])
1631
1034
 
1632
1035
 
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
1036
class TestSmartServerRepositoryUnlock(tests.TestCaseWithMemoryTransport):
1682
1037
 
1683
1038
    def setUp(self):
1685
1040
 
1686
1041
    def test_unlock_on_locked_repo(self):
1687
1042
        backing = self.get_transport()
1688
 
        request = smart_repo.SmartServerRepositoryUnlock(backing)
 
1043
        request = smart.repository.SmartServerRepositoryUnlock(backing)
1689
1044
        repository = self.make_repository('.', format='knit')
1690
1045
        token = repository.lock_write()
1691
1046
        repository.leave_lock_in_place()
1692
1047
        repository.unlock()
1693
1048
        response = request.execute('', token)
1694
1049
        self.assertEqual(
1695
 
            smart_req.SmartServerResponse(('ok',)), response)
 
1050
            SmartServerResponse(('ok',)), response)
1696
1051
        # The repository is now unlocked.  Verify that with a new repository
1697
1052
        # object.
1698
1053
        new_repo = repository.bzrdir.open_repository()
1701
1056
 
1702
1057
    def test_unlock_on_unlocked_repo(self):
1703
1058
        backing = self.get_transport()
1704
 
        request = smart_repo.SmartServerRepositoryUnlock(backing)
 
1059
        request = smart.repository.SmartServerRepositoryUnlock(backing)
1705
1060
        repository = self.make_repository('.', format='knit')
1706
1061
        response = request.execute('', 'some token')
1707
1062
        self.assertEqual(
1708
 
            smart_req.SmartServerResponse(('TokenMismatch',)), response)
 
1063
            SmartServerResponse(('TokenMismatch',)), response)
1709
1064
 
1710
1065
 
1711
1066
class TestSmartServerIsReadonly(tests.TestCaseWithMemoryTransport):
1712
1067
 
1713
1068
    def test_is_readonly_no(self):
1714
1069
        backing = self.get_transport()
1715
 
        request = smart_req.SmartServerIsReadonly(backing)
 
1070
        request = smart.request.SmartServerIsReadonly(backing)
1716
1071
        response = request.execute()
1717
1072
        self.assertEqual(
1718
 
            smart_req.SmartServerResponse(('no',)), response)
 
1073
            SmartServerResponse(('no',)), response)
1719
1074
 
1720
1075
    def test_is_readonly_yes(self):
1721
1076
        backing = self.get_readonly_transport()
1722
 
        request = smart_req.SmartServerIsReadonly(backing)
 
1077
        request = smart.request.SmartServerIsReadonly(backing)
1723
1078
        response = request.execute()
1724
1079
        self.assertEqual(
1725
 
            smart_req.SmartServerResponse(('yes',)), response)
1726
 
 
1727
 
 
1728
 
class TestSmartServerRepositorySetMakeWorkingTrees(
1729
 
    tests.TestCaseWithMemoryTransport):
 
1080
            SmartServerResponse(('yes',)), response)
 
1081
 
 
1082
 
 
1083
class TestSmartServerRepositorySetMakeWorkingTrees(tests.TestCaseWithMemoryTransport):
1730
1084
 
1731
1085
    def test_set_false(self):
1732
1086
        backing = self.get_transport()
1733
1087
        repo = self.make_repository('.', shared=True)
1734
1088
        repo.set_make_working_trees(True)
1735
 
        request_class = smart_repo.SmartServerRepositorySetMakeWorkingTrees
 
1089
        request_class = smart.repository.SmartServerRepositorySetMakeWorkingTrees
1736
1090
        request = request_class(backing)
1737
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
 
1091
        self.assertEqual(SuccessfulSmartServerResponse(('ok',)),
1738
1092
            request.execute('', 'False'))
1739
1093
        repo = repo.bzrdir.open_repository()
1740
1094
        self.assertFalse(repo.make_working_trees())
1743
1097
        backing = self.get_transport()
1744
1098
        repo = self.make_repository('.', shared=True)
1745
1099
        repo.set_make_working_trees(False)
1746
 
        request_class = smart_repo.SmartServerRepositorySetMakeWorkingTrees
 
1100
        request_class = smart.repository.SmartServerRepositorySetMakeWorkingTrees
1747
1101
        request = request_class(backing)
1748
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
 
1102
        self.assertEqual(SuccessfulSmartServerResponse(('ok',)),
1749
1103
            request.execute('', 'True'))
1750
1104
        repo = repo.bzrdir.open_repository()
1751
1105
        self.assertTrue(repo.make_working_trees())
1767
1121
 
1768
1122
    def test_autopack_needed(self):
1769
1123
        repo = self.make_repo_needing_autopacking()
1770
 
        repo.lock_write()
1771
 
        self.addCleanup(repo.unlock)
1772
1124
        backing = self.get_transport()
1773
 
        request = smart_packrepo.SmartServerPackRepositoryAutopack(
 
1125
        request = smart.packrepository.SmartServerPackRepositoryAutopack(
1774
1126
            backing)
1775
1127
        response = request.execute('')
1776
 
        self.assertEqual(smart_req.SmartServerResponse(('ok',)), response)
 
1128
        self.assertEqual(SmartServerResponse(('ok',)), response)
1777
1129
        repo._pack_collection.reload_pack_names()
1778
1130
        self.assertEqual(1, len(repo._pack_collection.names()))
1779
1131
 
1780
1132
    def test_autopack_not_needed(self):
1781
1133
        tree = self.make_branch_and_tree('.', format='pack-0.92')
1782
1134
        repo = tree.branch.repository
1783
 
        repo.lock_write()
1784
 
        self.addCleanup(repo.unlock)
1785
1135
        for x in range(9):
1786
1136
            tree.commit('commit %s' % x)
1787
1137
        backing = self.get_transport()
1788
 
        request = smart_packrepo.SmartServerPackRepositoryAutopack(
 
1138
        request = smart.packrepository.SmartServerPackRepositoryAutopack(
1789
1139
            backing)
1790
1140
        response = request.execute('')
1791
 
        self.assertEqual(smart_req.SmartServerResponse(('ok',)), response)
 
1141
        self.assertEqual(SmartServerResponse(('ok',)), response)
1792
1142
        repo._pack_collection.reload_pack_names()
1793
1143
        self.assertEqual(9, len(repo._pack_collection.names()))
1794
1144
 
1796
1146
        """A request to autopack a non-pack repo is a no-op."""
1797
1147
        repo = self.make_repository('.', format='knit')
1798
1148
        backing = self.get_transport()
1799
 
        request = smart_packrepo.SmartServerPackRepositoryAutopack(
 
1149
        request = smart.packrepository.SmartServerPackRepositoryAutopack(
1800
1150
            backing)
1801
1151
        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))
 
1152
        self.assertEqual(SmartServerResponse(('ok',)), response)
1816
1153
 
1817
1154
 
1818
1155
class TestHandlers(tests.TestCase):
1822
1159
        """All registered request_handlers can be found."""
1823
1160
        # If there's a typo in a register_lazy call, this loop will fail with
1824
1161
        # an AttributeError.
1825
 
        for key, item in smart_req.request_handlers.iteritems():
 
1162
        for key, item in smart.request.request_handlers.iteritems():
1826
1163
            pass
1827
1164
 
1828
 
    def assertHandlerEqual(self, verb, handler):
1829
 
        self.assertEqual(smart_req.request_handlers.get(verb), handler)
1830
 
 
1831
1165
    def test_registered_methods(self):
1832
1166
        """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)
 
1167
        self.assertEqual(
 
1168
            smart.request.request_handlers.get('Branch.get_config_file'),
 
1169
            smart.branch.SmartServerBranchGetConfigFile)
 
1170
        self.assertEqual(
 
1171
            smart.request.request_handlers.get('Branch.lock_write'),
 
1172
            smart.branch.SmartServerBranchRequestLockWrite)
 
1173
        self.assertEqual(
 
1174
            smart.request.request_handlers.get('Branch.last_revision_info'),
 
1175
            smart.branch.SmartServerBranchRequestLastRevisionInfo)
 
1176
        self.assertEqual(
 
1177
            smart.request.request_handlers.get('Branch.revision_history'),
 
1178
            smart.branch.SmartServerRequestRevisionHistory)
 
1179
        self.assertEqual(
 
1180
            smart.request.request_handlers.get('Branch.set_last_revision'),
 
1181
            smart.branch.SmartServerBranchRequestSetLastRevision)
 
1182
        self.assertEqual(
 
1183
            smart.request.request_handlers.get('Branch.set_last_revision_info'),
 
1184
            smart.branch.SmartServerBranchRequestSetLastRevisionInfo)
 
1185
        self.assertEqual(
 
1186
            smart.request.request_handlers.get('Branch.unlock'),
 
1187
            smart.branch.SmartServerBranchRequestUnlock)
 
1188
        self.assertEqual(
 
1189
            smart.request.request_handlers.get('BzrDir.find_repository'),
 
1190
            smart.bzrdir.SmartServerRequestFindRepositoryV1)
 
1191
        self.assertEqual(
 
1192
            smart.request.request_handlers.get('BzrDir.find_repositoryV2'),
 
1193
            smart.bzrdir.SmartServerRequestFindRepositoryV2)
 
1194
        self.assertEqual(
 
1195
            smart.request.request_handlers.get('BzrDirFormat.initialize'),
 
1196
            smart.bzrdir.SmartServerRequestInitializeBzrDir)
 
1197
        self.assertEqual(
 
1198
            smart.request.request_handlers.get('BzrDir.cloning_metadir'),
 
1199
            smart.bzrdir.SmartServerBzrDirRequestCloningMetaDir)
 
1200
        self.assertEqual(
 
1201
            smart.request.request_handlers.get('BzrDir.open_branch'),
 
1202
            smart.bzrdir.SmartServerRequestOpenBranch)
 
1203
        self.assertEqual(
 
1204
            smart.request.request_handlers.get('PackRepository.autopack'),
 
1205
            smart.packrepository.SmartServerPackRepositoryAutopack)
 
1206
        self.assertEqual(
 
1207
            smart.request.request_handlers.get('Repository.gather_stats'),
 
1208
            smart.repository.SmartServerRepositoryGatherStats)
 
1209
        self.assertEqual(
 
1210
            smart.request.request_handlers.get('Repository.get_parent_map'),
 
1211
            smart.repository.SmartServerRepositoryGetParentMap)
 
1212
        self.assertEqual(
 
1213
            smart.request.request_handlers.get(
 
1214
                'Repository.get_revision_graph'),
 
1215
            smart.repository.SmartServerRepositoryGetRevisionGraph)
 
1216
        self.assertEqual(
 
1217
            smart.request.request_handlers.get('Repository.has_revision'),
 
1218
            smart.repository.SmartServerRequestHasRevision)
 
1219
        self.assertEqual(
 
1220
            smart.request.request_handlers.get('Repository.is_shared'),
 
1221
            smart.repository.SmartServerRepositoryIsShared)
 
1222
        self.assertEqual(
 
1223
            smart.request.request_handlers.get('Repository.lock_write'),
 
1224
            smart.repository.SmartServerRepositoryLockWrite)
 
1225
        self.assertEqual(
 
1226
            smart.request.request_handlers.get('Repository.get_stream'),
 
1227
            smart.repository.SmartServerRepositoryGetStream)
 
1228
        self.assertEqual(
 
1229
            smart.request.request_handlers.get('Repository.tarball'),
 
1230
            smart.repository.SmartServerRepositoryTarball)
 
1231
        self.assertEqual(
 
1232
            smart.request.request_handlers.get('Repository.unlock'),
 
1233
            smart.repository.SmartServerRepositoryUnlock)
 
1234
        self.assertEqual(
 
1235
            smart.request.request_handlers.get('Transport.is_readonly'),
 
1236
            smart.request.SmartServerIsReadonly)