← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart.py

  • Committer: John Arbash Meinel
  • Date: 2008-07-08 14:55:19 UTC
  • mfrom: (3530 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3532.
  • Revision ID: john@arbash-meinel.com-20080708145519-paqg4kjwbpgs2xmq
Merge bzr.dev 3530

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 BranchReferenceFormat
 
40
import bzrlib.smart.branch
 
41
import bzrlib.smart.bzrdir
 
42
import bzrlib.smart.repository
 
43
from bzrlib.smart.request import (
 
44
    FailedSmartServerResponse,
 
45
    SmartServerRequest,
 
46
    SmartServerResponse,
 
47
    SuccessfulSmartServerResponse,
 
48
    )
 
49
from bzrlib.tests import (
 
50
    iter_suite_tests,
 
51
    split_suite_by_re,
 
52
    TestScenarioApplier,
 
53
    )
 
54
from bzrlib.transport import chroot, get_transport
 
55
from bzrlib.util import bencode
56
56
 
57
57
 
58
58
def load_tests(standard_tests, module, loader):
59
59
    """Multiply tests version and protocol consistency."""
60
60
    # FindRepository tests.
61
 
    scenarios = [
 
61
    bzrdir_mod = bzrlib.smart.bzrdir
 
62
    applier = TestScenarioApplier()
 
63
    applier.scenarios = [
62
64
        ("find_repository", {
63
 
            "_request_class": smart_dir.SmartServerRequestFindRepositoryV1}),
 
65
            "_request_class":bzrdir_mod.SmartServerRequestFindRepositoryV1}),
64
66
        ("find_repositoryV2", {
65
 
            "_request_class": smart_dir.SmartServerRequestFindRepositoryV2}),
66
 
        ("find_repositoryV3", {
67
 
            "_request_class": smart_dir.SmartServerRequestFindRepositoryV3}),
 
67
            "_request_class":bzrdir_mod.SmartServerRequestFindRepositoryV2}),
68
68
        ]
69
 
    to_adapt, result = tests.split_suite_by_re(standard_tests,
 
69
    to_adapt, result = split_suite_by_re(standard_tests,
70
70
        "TestSmartServerRequestFindRepository")
71
 
    v2_only, v1_and_2 = tests.split_suite_by_re(to_adapt,
 
71
    v2_only, v1_and_2 = split_suite_by_re(to_adapt,
72
72
        "_v2")
73
 
    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)
 
73
    for test in iter_suite_tests(v1_and_2):
 
74
        result.addTests(applier.adapt(test))
 
75
    del applier.scenarios[0]
 
76
    for test in iter_suite_tests(v2_only):
 
77
        result.addTests(applier.adapt(test))
77
78
    return result
78
79
 
79
80
 
80
81
class TestCaseWithChrootedTransport(tests.TestCaseWithTransport):
81
82
 
82
83
    def setUp(self):
83
 
        self.vfs_transport_factory = memory.MemoryServer
84
84
        tests.TestCaseWithTransport.setUp(self)
85
85
        self._chroot_server = None
86
86
 
88
88
        if self._chroot_server is None:
89
89
            backing_transport = tests.TestCaseWithTransport.get_transport(self)
90
90
            self._chroot_server = chroot.ChrootServer(backing_transport)
91
 
            self.start_server(self._chroot_server)
92
 
        t = transport.get_transport(self._chroot_server.get_url())
 
91
            self._chroot_server.setUp()
 
92
            self.addCleanup(self._chroot_server.tearDown)
 
93
        t = get_transport(self._chroot_server.get_url())
93
94
        if relpath is not None:
94
95
            t = t.clone(relpath)
95
96
        return t
96
97
 
97
98
 
98
 
class TestCaseWithSmartMedium(tests.TestCaseWithMemoryTransport):
 
99
class TestCaseWithSmartMedium(tests.TestCaseWithTransport):
99
100
 
100
101
    def setUp(self):
101
102
        super(TestCaseWithSmartMedium, self).setUp()
106
107
        self.transport_server = self.make_transport_server
107
108
 
108
109
    def make_transport_server(self):
109
 
        return test_server.SmartTCPServer_for_testing('-' + self.id())
 
110
        return smart.server.SmartTCPServer_for_testing('-' + self.id())
110
111
 
111
112
    def get_smart_medium(self):
112
113
        """Get a smart medium to use in tests."""
113
114
        return self.get_transport().get_smart_medium()
114
115
 
115
116
 
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
117
class TestSmartServerResponse(tests.TestCase):
136
118
 
137
119
    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', )))
 
120
        self.assertEqual(SmartServerResponse(('ok', )),
 
121
            SmartServerResponse(('ok', )))
 
122
        self.assertEqual(SmartServerResponse(('ok', ), 'body'),
 
123
            SmartServerResponse(('ok', ), 'body'))
 
124
        self.assertNotEqual(SmartServerResponse(('ok', )),
 
125
            SmartServerResponse(('notok', )))
 
126
        self.assertNotEqual(SmartServerResponse(('ok', ), 'body'),
 
127
            SmartServerResponse(('ok', )))
146
128
        self.assertNotEqual(None,
147
 
            smart_req.SmartServerResponse(('ok', )))
 
129
            SmartServerResponse(('ok', )))
148
130
 
149
131
    def test__str__(self):
150
132
        """SmartServerResponses can be stringified."""
151
133
        self.assertEqual(
152
 
            "<SuccessfulSmartServerResponse args=('args',) body='body'>",
153
 
            str(smart_req.SuccessfulSmartServerResponse(('args',), 'body')))
 
134
            "<SmartServerResponse status=OK args=('args',) body='body'>",
 
135
            str(SuccessfulSmartServerResponse(('args',), 'body')))
154
136
        self.assertEqual(
155
 
            "<FailedSmartServerResponse args=('args',) body='body'>",
156
 
            str(smart_req.FailedSmartServerResponse(('args',), 'body')))
 
137
            "<SmartServerResponse status=ERR args=('args',) body='body'>",
 
138
            str(FailedSmartServerResponse(('args',), 'body')))
157
139
 
158
140
 
159
141
class TestSmartServerRequest(tests.TestCaseWithMemoryTransport):
160
142
 
161
143
    def test_translate_client_path(self):
162
144
        transport = self.get_transport()
163
 
        request = smart_req.SmartServerRequest(transport, 'foo/')
 
145
        request = SmartServerRequest(transport, 'foo/')
164
146
        self.assertEqual('./', request.translate_client_path('foo/'))
165
147
        self.assertRaises(
166
148
            errors.InvalidURLJoin, request.translate_client_path, 'foo/..')
169
151
        self.assertRaises(
170
152
            errors.PathNotChild, request.translate_client_path, 'bar/')
171
153
        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
154
 
185
155
    def test_transport_from_client_path(self):
186
156
        transport = self.get_transport()
187
 
        request = smart_req.SmartServerRequest(transport, 'foo/')
 
157
        request = SmartServerRequest(transport, 'foo/')
188
158
        self.assertEqual(
189
159
            transport.base,
190
160
            request.transport_from_client_path('foo/').base)
191
161
 
192
162
 
193
 
class TestSmartServerBzrDirRequestCloningMetaDir(
194
 
    tests.TestCaseWithMemoryTransport):
195
 
    """Tests for BzrDir.cloning_metadir."""
196
 
 
197
 
    def test_cloning_metadir(self):
198
 
        """When there is a bzrdir present, the call succeeds."""
199
 
        backing = self.get_transport()
200
 
        dir = self.make_bzrdir('.')
201
 
        local_result = dir.cloning_metadir()
202
 
        request_class = smart_dir.SmartServerBzrDirRequestCloningMetaDir
203
 
        request = request_class(backing)
204
 
        expected = smart_req.SuccessfulSmartServerResponse(
205
 
            (local_result.network_name(),
206
 
            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',))
225
 
        self.assertEqual(expected, request.execute('', 'False'))
226
 
 
227
 
 
228
 
class TestSmartServerRequestCreateRepository(tests.TestCaseWithMemoryTransport):
229
 
    """Tests for BzrDir.create_repository."""
230
 
 
231
 
    def test_makes_repository(self):
232
 
        """When there is a bzrdir present, the call succeeds."""
233
 
        backing = self.get_transport()
234
 
        self.make_bzrdir('.')
235
 
        request_class = smart_dir.SmartServerRequestCreateRepository
236
 
        request = request_class(backing)
237
 
        reference_bzrdir_format = bzrdir.format_registry.get('pack-0.92')()
238
 
        reference_format = reference_bzrdir_format.repository_format
239
 
        network_name = reference_format.network_name()
240
 
        expected = smart_req.SuccessfulSmartServerResponse(
241
 
            ('ok', 'no', 'no', 'no', network_name))
242
 
        self.assertEqual(expected, request.execute('', network_name, 'True'))
243
 
 
244
 
 
245
163
class TestSmartServerRequestFindRepository(tests.TestCaseWithMemoryTransport):
246
164
    """Tests for BzrDir.find_repository."""
247
165
 
250
168
        backing = self.get_transport()
251
169
        request = self._request_class(backing)
252
170
        self.make_bzrdir('.')
253
 
        self.assertEqual(smart_req.SmartServerResponse(('norepository', )),
 
171
        self.assertEqual(SmartServerResponse(('norepository', )),
254
172
            request.execute(''))
255
173
 
256
174
    def test_nonshared_repository(self):
257
 
        # nonshared repositorys only allow 'find' to return a handle when the
258
 
        # path the repository is being searched on is the same as that that
 
175
        # nonshared repositorys only allow 'find' to return a handle when the 
 
176
        # path the repository is being searched on is the same as that that 
259
177
        # the repository is at.
260
178
        backing = self.get_transport()
261
179
        request = self._request_class(backing)
262
180
        result = self._make_repository_and_result()
263
181
        self.assertEqual(result, request.execute(''))
264
182
        self.make_bzrdir('subdir')
265
 
        self.assertEqual(smart_req.SmartServerResponse(('norepository', )),
 
183
        self.assertEqual(SmartServerResponse(('norepository', )),
266
184
            request.execute('subdir'))
267
185
 
268
186
    def _make_repository_and_result(self, shared=False, format=None):
279
197
            subtrees = 'yes'
280
198
        else:
281
199
            subtrees = 'no'
282
 
        if repo._format.supports_external_lookups:
283
 
            external = 'yes'
284
 
        else:
285
 
            external = 'no'
286
 
        if (smart_dir.SmartServerRequestFindRepositoryV3 ==
287
 
            self._request_class):
288
 
            return smart_req.SuccessfulSmartServerResponse(
289
 
                ('ok', '', rich_root, subtrees, external,
290
 
                 repo._format.network_name()))
291
 
        elif (smart_dir.SmartServerRequestFindRepositoryV2 ==
 
200
        if (smart.bzrdir.SmartServerRequestFindRepositoryV2 ==
292
201
            self._request_class):
293
202
            # All tests so far are on formats, and for non-external
294
203
            # repositories.
295
 
            return smart_req.SuccessfulSmartServerResponse(
296
 
                ('ok', '', rich_root, subtrees, external))
 
204
            return SuccessfulSmartServerResponse(
 
205
                ('ok', '', rich_root, subtrees, 'no'))
297
206
        else:
298
 
            return smart_req.SuccessfulSmartServerResponse(
299
 
                ('ok', '', rich_root, subtrees))
 
207
            return SuccessfulSmartServerResponse(('ok', '', rich_root, subtrees))
300
208
 
301
209
    def test_shared_repository(self):
302
210
        """When there is a shared repository, we get 'ok', 'relpath-to-repo'."""
305
213
        result = self._make_repository_and_result(shared=True)
306
214
        self.assertEqual(result, request.execute(''))
307
215
        self.make_bzrdir('subdir')
308
 
        result2 = smart_req.SmartServerResponse(
309
 
            result.args[0:1] + ('..', ) + result.args[2:])
 
216
        result2 = SmartServerResponse(result.args[0:1] + ('..', ) + result.args[2:])
310
217
        self.assertEqual(result2,
311
218
            request.execute('subdir'))
312
219
        self.make_bzrdir('subdir/deeper')
313
 
        result3 = smart_req.SmartServerResponse(
314
 
            result.args[0:1] + ('../..', ) + result.args[2:])
 
220
        result3 = SmartServerResponse(result.args[0:1] + ('../..', ) + result.args[2:])
315
221
        self.assertEqual(result3,
316
222
            request.execute('subdir/deeper'))
317
223
 
319
225
        """Test for the format attributes for rich root and subtree support."""
320
226
        backing = self.get_transport()
321
227
        request = self._request_class(backing)
322
 
        result = self._make_repository_and_result(
323
 
            format='dirstate-with-subtree')
 
228
        result = self._make_repository_and_result(format='dirstate-with-subtree')
324
229
        # check the test will be valid
325
230
        self.assertEqual('yes', result.args[2])
326
231
        self.assertEqual('yes', result.args[3])
330
235
        """Test for the supports_external_lookups attribute."""
331
236
        backing = self.get_transport()
332
237
        request = self._request_class(backing)
333
 
        result = self._make_repository_and_result(
334
 
            format='dirstate-with-subtree')
 
238
        result = self._make_repository_and_result(format='dirstate-with-subtree')
335
239
        # check the test will be valid
336
240
        self.assertEqual('no', result.args[4])
337
241
        self.assertEqual(result, request.execute(''))
338
242
 
339
243
 
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
244
class TestSmartServerRequestInitializeBzrDir(tests.TestCaseWithMemoryTransport):
364
245
 
365
246
    def test_empty_dir(self):
366
247
        """Initializing an empty dir should succeed and do it."""
367
248
        backing = self.get_transport()
368
 
        request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
369
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', )),
 
249
        request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
 
250
        self.assertEqual(SmartServerResponse(('ok', )),
370
251
            request.execute(''))
371
252
        made_dir = bzrdir.BzrDir.open_from_transport(backing)
372
 
        # no branch, tree or repository is expected with the current
 
253
        # no branch, tree or repository is expected with the current 
373
254
        # default formart.
374
255
        self.assertRaises(errors.NoWorkingTree, made_dir.open_workingtree)
375
256
        self.assertRaises(errors.NotBranchError, made_dir.open_branch)
378
259
    def test_missing_dir(self):
379
260
        """Initializing a missing directory should fail like the bzrdir api."""
380
261
        backing = self.get_transport()
381
 
        request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
 
262
        request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
382
263
        self.assertRaises(errors.NoSuchFile,
383
264
            request.execute, 'subdir')
384
265
 
385
266
    def test_initialized_dir(self):
386
267
        """Initializing an extant bzrdir should fail like the bzrdir api."""
387
268
        backing = self.get_transport()
388
 
        request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
 
269
        request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
389
270
        self.make_bzrdir('subdir')
390
271
        self.assertRaises(errors.FileExists,
391
272
            request.execute, 'subdir')
392
273
 
393
274
 
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
275
class TestSmartServerRequestOpenBranch(TestCaseWithChrootedTransport):
504
276
 
505
277
    def test_no_branch(self):
506
278
        """When there is no branch, ('nobranch', ) is returned."""
507
279
        backing = self.get_transport()
508
 
        request = smart_dir.SmartServerRequestOpenBranch(backing)
 
280
        request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
509
281
        self.make_bzrdir('.')
510
 
        self.assertEqual(smart_req.SmartServerResponse(('nobranch', )),
 
282
        self.assertEqual(SmartServerResponse(('nobranch', )),
511
283
            request.execute(''))
512
284
 
513
285
    def test_branch(self):
514
286
        """When there is a branch, 'ok' is returned."""
515
287
        backing = self.get_transport()
516
 
        request = smart_dir.SmartServerRequestOpenBranch(backing)
 
288
        request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
517
289
        self.make_branch('.')
518
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', '')),
 
290
        self.assertEqual(SmartServerResponse(('ok', '')),
519
291
            request.execute(''))
520
292
 
521
293
    def test_branch_reference(self):
522
294
        """When there is a branch reference, the reference URL is returned."""
523
 
        self.vfs_transport_factory = test_server.LocalURLServer
524
295
        backing = self.get_transport()
525
 
        request = smart_dir.SmartServerRequestOpenBranch(backing)
 
296
        request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
526
297
        branch = self.make_branch('branch')
527
298
        checkout = branch.create_checkout('reference',lightweight=True)
528
 
        reference_url = _mod_branch.BranchReferenceFormat().get_reference(
529
 
            checkout.bzrdir)
 
299
        reference_url = BranchReferenceFormat().get_reference(checkout.bzrdir)
530
300
        self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
531
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', reference_url)),
 
301
        self.assertEqual(SmartServerResponse(('ok', reference_url)),
532
302
            request.execute('reference'))
533
303
 
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
304
 
670
305
class TestSmartServerRequestRevisionHistory(tests.TestCaseWithMemoryTransport):
671
306
 
672
307
    def test_empty(self):
673
308
        """For an empty branch, the body is empty."""
674
309
        backing = self.get_transport()
675
 
        request = smart_branch.SmartServerRequestRevisionHistory(backing)
 
310
        request = smart.branch.SmartServerRequestRevisionHistory(backing)
676
311
        self.make_branch('.')
677
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), ''),
 
312
        self.assertEqual(SmartServerResponse(('ok', ), ''),
678
313
            request.execute(''))
679
314
 
680
315
    def test_not_empty(self):
681
316
        """For a non-empty branch, the body is empty."""
682
317
        backing = self.get_transport()
683
 
        request = smart_branch.SmartServerRequestRevisionHistory(backing)
 
318
        request = smart.branch.SmartServerRequestRevisionHistory(backing)
684
319
        tree = self.make_branch_and_memory_tree('.')
685
320
        tree.lock_write()
686
321
        tree.add('')
688
323
        r2 = tree.commit('2nd commit', rev_id=u'\xc8'.encode('utf-8'))
689
324
        tree.unlock()
690
325
        self.assertEqual(
691
 
            smart_req.SmartServerResponse(('ok', ), ('\x00'.join([r1, r2]))),
 
326
            SmartServerResponse(('ok', ), ('\x00'.join([r1, r2]))),
692
327
            request.execute(''))
693
328
 
694
329
 
697
332
    def test_no_branch(self):
698
333
        """When there is a bzrdir and no branch, NotBranchError is raised."""
699
334
        backing = self.get_transport()
700
 
        request = smart_branch.SmartServerBranchRequest(backing)
 
335
        request = smart.branch.SmartServerBranchRequest(backing)
701
336
        self.make_bzrdir('.')
702
337
        self.assertRaises(errors.NotBranchError,
703
338
            request.execute, '')
705
340
    def test_branch_reference(self):
706
341
        """When there is a branch reference, NotBranchError is raised."""
707
342
        backing = self.get_transport()
708
 
        request = smart_branch.SmartServerBranchRequest(backing)
 
343
        request = smart.branch.SmartServerBranchRequest(backing)
709
344
        branch = self.make_branch('branch')
710
345
        checkout = branch.create_checkout('reference',lightweight=True)
711
346
        self.assertRaises(errors.NotBranchError,
712
347
            request.execute, 'checkout')
713
348
 
714
349
 
715
 
class TestSmartServerBranchRequestLastRevisionInfo(
716
 
    tests.TestCaseWithMemoryTransport):
 
350
class TestSmartServerBranchRequestLastRevisionInfo(tests.TestCaseWithMemoryTransport):
717
351
 
718
352
    def test_empty(self):
719
353
        """For an empty branch, the result is ('ok', '0', 'null:')."""
720
354
        backing = self.get_transport()
721
 
        request = smart_branch.SmartServerBranchRequestLastRevisionInfo(backing)
 
355
        request = smart.branch.SmartServerBranchRequestLastRevisionInfo(backing)
722
356
        self.make_branch('.')
723
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', '0', 'null:')),
 
357
        self.assertEqual(SmartServerResponse(('ok', '0', 'null:')),
724
358
            request.execute(''))
725
359
 
726
360
    def test_not_empty(self):
727
361
        """For a non-empty branch, the result is ('ok', 'revno', 'revid')."""
728
362
        backing = self.get_transport()
729
 
        request = smart_branch.SmartServerBranchRequestLastRevisionInfo(backing)
 
363
        request = smart.branch.SmartServerBranchRequestLastRevisionInfo(backing)
730
364
        tree = self.make_branch_and_memory_tree('.')
731
365
        tree.lock_write()
732
366
        tree.add('')
735
369
        r2 = tree.commit('2nd commit', rev_id=rev_id_utf8)
736
370
        tree.unlock()
737
371
        self.assertEqual(
738
 
            smart_req.SmartServerResponse(('ok', '2', rev_id_utf8)),
 
372
            SmartServerResponse(('ok', '2', rev_id_utf8)),
739
373
            request.execute(''))
740
374
 
741
375
 
742
 
class TestSmartServerBranchRequestGetConfigFile(
743
 
    tests.TestCaseWithMemoryTransport):
 
376
class TestSmartServerBranchRequestGetConfigFile(tests.TestCaseWithMemoryTransport):
744
377
 
745
378
    def test_default(self):
746
379
        """With no file, we get empty content."""
747
380
        backing = self.get_transport()
748
 
        request = smart_branch.SmartServerBranchGetConfigFile(backing)
 
381
        request = smart.branch.SmartServerBranchGetConfigFile(backing)
749
382
        branch = self.make_branch('.')
750
383
        # there should be no file by default
751
384
        content = ''
752
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), content),
 
385
        self.assertEqual(SmartServerResponse(('ok', ), content),
753
386
            request.execute(''))
754
387
 
755
388
    def test_with_content(self):
756
389
        # SmartServerBranchGetConfigFile should return the content from
757
390
        # branch.control_files.get('branch.conf') for now - in the future it may
758
 
        # perform more complex processing.
 
391
        # perform more complex processing. 
759
392
        backing = self.get_transport()
760
 
        request = smart_branch.SmartServerBranchGetConfigFile(backing)
 
393
        request = smart.branch.SmartServerBranchGetConfigFile(backing)
761
394
        branch = self.make_branch('.')
762
395
        branch._transport.put_bytes('branch.conf', 'foo bar baz')
763
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), 'foo bar baz'),
 
396
        self.assertEqual(SmartServerResponse(('ok', ), 'foo bar baz'),
764
397
            request.execute(''))
765
398
 
766
399
 
767
 
class TestLockedBranch(tests.TestCaseWithMemoryTransport):
768
 
 
769
 
    def get_lock_tokens(self, branch):
770
 
        branch_token = branch.lock_write().branch_token
771
 
        repo_token = branch.repository.lock_write().repository_token
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):
 
400
class SetLastRevisionTestBase(tests.TestCaseWithMemoryTransport):
843
401
    """Base test case for verbs that implement set_last_revision."""
844
402
 
845
403
    def setUp(self):
849
407
        self.tree = self.make_branch_and_memory_tree('.')
850
408
 
851
409
    def lock_branch(self):
852
 
        return self.get_lock_tokens(self.tree.branch)
 
410
        b = self.tree.branch
 
411
        branch_token = b.lock_write()
 
412
        repo_token = b.repository.lock_write()
 
413
        b.repository.unlock()
 
414
        return branch_token, repo_token
853
415
 
854
416
    def unlock_branch(self):
855
417
        self.tree.branch.unlock()
856
 
 
 
418
        
857
419
    def set_last_revision(self, revision_id, revno):
858
420
        branch_token, repo_token = self.lock_branch()
859
421
        response = self._set_last_revision(
863
425
 
864
426
    def assertRequestSucceeds(self, revision_id, revno):
865
427
        response = self.set_last_revision(revision_id, revno)
866
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
867
 
                         response)
868
 
 
869
 
 
 
428
        self.assertEqual(SuccessfulSmartServerResponse(('ok',)), response)
 
429
 
 
430
        
870
431
class TestSetLastRevisionVerbMixin(object):
871
432
    """Mixin test case for verbs that implement set_last_revision."""
872
433
 
878
439
        """If the revision_id is not present, the verb returns NoSuchRevision.
879
440
        """
880
441
        revision_id = 'non-existent revision'
881
 
        self.assertEqual(smart_req.FailedSmartServerResponse(('NoSuchRevision',
882
 
                                                              revision_id)),
883
 
                         self.set_last_revision(revision_id, 1))
 
442
        self.assertEqual(
 
443
            FailedSmartServerResponse(('NoSuchRevision', revision_id)),
 
444
            self.set_last_revision(revision_id, 1))
884
445
 
885
446
    def make_tree_with_two_commits(self):
886
447
        self.tree.lock_write()
919
480
        self.assertEqual(
920
481
            (1, rev_id_utf8), self.tree.branch.last_revision_info())
921
482
 
922
 
    def test_TipChangeRejected(self):
923
 
        """If a pre_change_branch_tip hook raises TipChangeRejected, the verb
924
 
        returns TipChangeRejected.
925
 
        """
926
 
        rejection_message = u'rejection message\N{INTERROBANG}'
927
 
        def hook_that_rejects(params):
928
 
            raise errors.TipChangeRejected(rejection_message)
929
 
        _mod_branch.Branch.hooks.install_named_hook(
930
 
            'pre_change_branch_tip', hook_that_rejects, None)
931
 
        self.assertEqual(
932
 
            smart_req.FailedSmartServerResponse(
933
 
                ('TipChangeRejected', rejection_message.encode('utf-8'))),
934
 
            self.set_last_revision('null:', 0))
935
 
 
936
483
 
937
484
class TestSmartServerBranchRequestSetLastRevision(
938
485
        SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
939
486
    """Tests for Branch.set_last_revision verb."""
940
487
 
941
 
    request_class = smart_branch.SmartServerBranchRequestSetLastRevision
 
488
    request_class = smart.branch.SmartServerBranchRequestSetLastRevision
942
489
 
943
490
    def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
944
491
        return self.request.execute(
949
496
        SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
950
497
    """Tests for Branch.set_last_revision_info verb."""
951
498
 
952
 
    request_class = smart_branch.SmartServerBranchRequestSetLastRevisionInfo
 
499
    request_class = smart.branch.SmartServerBranchRequestSetLastRevisionInfo
953
500
 
954
501
    def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
955
502
        return self.request.execute(
966
513
        SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
967
514
    """Tests for Branch.set_last_revision_ex verb."""
968
515
 
969
 
    request_class = smart_branch.SmartServerBranchRequestSetLastRevisionEx
 
516
    request_class = smart.branch.SmartServerBranchRequestSetLastRevisionEx
970
517
 
971
518
    def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
972
519
        return self.request.execute(
975
522
    def assertRequestSucceeds(self, revision_id, revno):
976
523
        response = self.set_last_revision(revision_id, revno)
977
524
        self.assertEqual(
978
 
            smart_req.SuccessfulSmartServerResponse(('ok', revno, revision_id)),
 
525
            SuccessfulSmartServerResponse(('ok', revno, revision_id)),
979
526
            response)
980
 
 
 
527
        
981
528
    def test_branch_last_revision_info_rewind(self):
982
529
        """A branch's tip can be set to a revision that is an ancestor of the
983
530
        current tip, but only if allow_overwrite_descendant is passed.
992
539
        response = self.request.execute(
993
540
            '', branch_token, repo_token, rev_id_utf8, 0, 0)
994
541
        self.assertEqual(
995
 
            smart_req.SuccessfulSmartServerResponse(('ok', 2, 'rev-2')),
 
542
            SuccessfulSmartServerResponse(('ok', 2, 'rev-2')),
996
543
            response)
997
544
        self.assertEqual(
998
545
            (2, 'rev-2'), self.tree.branch.last_revision_info())
1002
549
        response = self.request.execute(
1003
550
            '', branch_token, repo_token, rev_id_utf8, 0, 1)
1004
551
        self.assertEqual(
1005
 
            smart_req.SuccessfulSmartServerResponse(('ok', 1, rev_id_utf8)),
 
552
            SuccessfulSmartServerResponse(('ok', 1, rev_id_utf8)),
1006
553
            response)
1007
554
        self.unlock_branch()
1008
555
        self.assertEqual(
1026
573
        # child-1.
1027
574
        new_r2 = self.tree.commit('2nd commit', rev_id='child-2')
1028
575
        self.tree.unlock()
1029
 
 
 
576
        
1030
577
    def test_not_allow_diverged(self):
1031
578
        """If allow_diverged is not passed, then setting a divergent history
1032
579
        returns a Diverged error.
1033
580
        """
1034
581
        self.make_branch_with_divergent_history()
1035
582
        self.assertEqual(
1036
 
            smart_req.FailedSmartServerResponse(('Diverged',)),
 
583
            FailedSmartServerResponse(('Diverged',)),
1037
584
            self.set_last_revision('child-1', 2))
1038
585
        # The branch tip was not changed.
1039
586
        self.assertEqual('child-2', self.tree.branch.last_revision())
1047
594
        response = self.request.execute(
1048
595
            '', branch_token, repo_token, 'child-1', 1, 0)
1049
596
        self.assertEqual(
1050
 
            smart_req.SuccessfulSmartServerResponse(('ok', 2, 'child-1')),
 
597
            SuccessfulSmartServerResponse(('ok', 2, 'child-1')),
1051
598
            response)
1052
599
        self.unlock_branch()
1053
600
        # The branch tip was changed.
1054
601
        self.assertEqual('child-1', self.tree.branch.last_revision())
1055
602
 
1056
603
 
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(TestLockedBranch):
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, repo_token = self.get_lock_tokens(branch)
1086
 
        try:
1087
 
            response = request.execute('base', branch_token, repo_token, '')
1088
 
        finally:
1089
 
            branch.unlock()
1090
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), response)
1091
 
        self.assertEqual(None, branch.get_parent())
1092
 
 
1093
 
    def test_set_parent_something(self):
1094
 
        branch = self.make_branch('base', format="1.9")
1095
 
        request = smart_branch.SmartServerBranchRequestSetParentLocation(
1096
 
            self.get_transport())
1097
 
        branch_token, repo_token = self.get_lock_tokens(branch)
1098
 
        try:
1099
 
            response = request.execute('base', branch_token, repo_token,
1100
 
            'http://bar/')
1101
 
        finally:
1102
 
            branch.unlock()
1103
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), response)
1104
 
        self.assertEqual('http://bar/', branch.get_parent())
1105
 
 
1106
 
 
1107
 
class TestSmartServerBranchRequestGetTagsBytes(
1108
 
    tests.TestCaseWithMemoryTransport):
1109
 
    # Only called when the branch format and tags match [yay factory
1110
 
    # methods] so only need to test straight forward cases.
1111
 
 
1112
 
    def test_get_bytes(self):
1113
 
        base_branch = self.make_branch('base')
1114
 
        request = smart_branch.SmartServerBranchGetTagsBytes(
1115
 
            self.get_transport())
1116
 
        response = request.execute('base')
1117
 
        self.assertEquals(
1118
 
            smart_req.SuccessfulSmartServerResponse(('',)), response)
1119
 
 
1120
 
 
1121
 
class TestSmartServerBranchRequestGetStackedOnURL(tests.TestCaseWithMemoryTransport):
1122
 
 
1123
 
    def test_get_stacked_on_url(self):
1124
 
        base_branch = self.make_branch('base', format='1.6')
1125
 
        stacked_branch = self.make_branch('stacked', format='1.6')
1126
 
        # typically should be relative
1127
 
        stacked_branch.set_stacked_on_url('../base')
1128
 
        request = smart_branch.SmartServerBranchRequestGetStackedOnURL(
1129
 
            self.get_transport())
1130
 
        response = request.execute('stacked')
1131
 
        self.assertEquals(
1132
 
            smart_req.SmartServerResponse(('ok', '../base')),
1133
 
            response)
1134
 
 
1135
 
 
1136
 
class TestSmartServerBranchRequestLockWrite(TestLockedBranch):
 
604
class TestSmartServerBranchRequestLockWrite(tests.TestCaseWithMemoryTransport):
1137
605
 
1138
606
    def setUp(self):
1139
607
        tests.TestCaseWithMemoryTransport.setUp(self)
1140
608
 
1141
609
    def test_lock_write_on_unlocked_branch(self):
1142
610
        backing = self.get_transport()
1143
 
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
 
611
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1144
612
        branch = self.make_branch('.', format='knit')
1145
613
        repository = branch.repository
1146
614
        response = request.execute('')
1147
615
        branch_nonce = branch.control_files._lock.peek().get('nonce')
1148
616
        repository_nonce = repository.control_files._lock.peek().get('nonce')
1149
 
        self.assertEqual(smart_req.SmartServerResponse(
1150
 
                ('ok', branch_nonce, repository_nonce)),
1151
 
                         response)
 
617
        self.assertEqual(
 
618
            SmartServerResponse(('ok', branch_nonce, repository_nonce)),
 
619
            response)
1152
620
        # The branch (and associated repository) is now locked.  Verify that
1153
621
        # with a new branch object.
1154
622
        new_branch = repository.bzrdir.open_branch()
1155
623
        self.assertRaises(errors.LockContention, new_branch.lock_write)
1156
 
        # Cleanup
1157
 
        request = smart_branch.SmartServerBranchRequestUnlock(backing)
1158
 
        response = request.execute('', branch_nonce, repository_nonce)
1159
624
 
1160
625
    def test_lock_write_on_locked_branch(self):
1161
626
        backing = self.get_transport()
1162
 
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
 
627
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1163
628
        branch = self.make_branch('.')
1164
 
        branch_token = branch.lock_write().branch_token
 
629
        branch.lock_write()
1165
630
        branch.leave_lock_in_place()
1166
631
        branch.unlock()
1167
632
        response = request.execute('')
1168
633
        self.assertEqual(
1169
 
            smart_req.SmartServerResponse(('LockContention',)), response)
1170
 
        # Cleanup
1171
 
        branch.lock_write(branch_token)
1172
 
        branch.dont_leave_lock_in_place()
1173
 
        branch.unlock()
 
634
            SmartServerResponse(('LockContention',)), response)
1174
635
 
1175
636
    def test_lock_write_with_tokens_on_locked_branch(self):
1176
637
        backing = self.get_transport()
1177
 
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
 
638
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1178
639
        branch = self.make_branch('.', format='knit')
1179
 
        branch_token, repo_token = self.get_lock_tokens(branch)
 
640
        branch_token = branch.lock_write()
 
641
        repo_token = branch.repository.lock_write()
 
642
        branch.repository.unlock()
1180
643
        branch.leave_lock_in_place()
1181
644
        branch.repository.leave_lock_in_place()
1182
645
        branch.unlock()
1183
646
        response = request.execute('',
1184
647
                                   branch_token, repo_token)
1185
648
        self.assertEqual(
1186
 
            smart_req.SmartServerResponse(('ok', branch_token, repo_token)),
1187
 
            response)
1188
 
        # Cleanup
1189
 
        branch.repository.lock_write(repo_token)
1190
 
        branch.repository.dont_leave_lock_in_place()
1191
 
        branch.repository.unlock()
1192
 
        branch.lock_write(branch_token)
1193
 
        branch.dont_leave_lock_in_place()
1194
 
        branch.unlock()
 
649
            SmartServerResponse(('ok', branch_token, repo_token)), response)
1195
650
 
1196
651
    def test_lock_write_with_mismatched_tokens_on_locked_branch(self):
1197
652
        backing = self.get_transport()
1198
 
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
 
653
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1199
654
        branch = self.make_branch('.', format='knit')
1200
 
        branch_token, repo_token = self.get_lock_tokens(branch)
 
655
        branch_token = branch.lock_write()
 
656
        repo_token = branch.repository.lock_write()
 
657
        branch.repository.unlock()
1201
658
        branch.leave_lock_in_place()
1202
659
        branch.repository.leave_lock_in_place()
1203
660
        branch.unlock()
1204
661
        response = request.execute('',
1205
662
                                   branch_token+'xxx', repo_token)
1206
663
        self.assertEqual(
1207
 
            smart_req.SmartServerResponse(('TokenMismatch',)), response)
1208
 
        # Cleanup
1209
 
        branch.repository.lock_write(repo_token)
1210
 
        branch.repository.dont_leave_lock_in_place()
1211
 
        branch.repository.unlock()
1212
 
        branch.lock_write(branch_token)
1213
 
        branch.dont_leave_lock_in_place()
1214
 
        branch.unlock()
 
664
            SmartServerResponse(('TokenMismatch',)), response)
1215
665
 
1216
666
    def test_lock_write_on_locked_repo(self):
1217
667
        backing = self.get_transport()
1218
 
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
 
668
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1219
669
        branch = self.make_branch('.', format='knit')
1220
 
        repo = branch.repository
1221
 
        repo_token = repo.lock_write().repository_token
1222
 
        repo.leave_lock_in_place()
1223
 
        repo.unlock()
 
670
        branch.repository.lock_write()
 
671
        branch.repository.leave_lock_in_place()
 
672
        branch.repository.unlock()
1224
673
        response = request.execute('')
1225
674
        self.assertEqual(
1226
 
            smart_req.SmartServerResponse(('LockContention',)), response)
1227
 
        # Cleanup
1228
 
        repo.lock_write(repo_token)
1229
 
        repo.dont_leave_lock_in_place()
1230
 
        repo.unlock()
 
675
            SmartServerResponse(('LockContention',)), response)
1231
676
 
1232
677
    def test_lock_write_on_readonly_transport(self):
1233
678
        backing = self.get_readonly_transport()
1234
 
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
 
679
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1235
680
        branch = self.make_branch('.')
1236
681
        root = self.get_transport().clone('/')
1237
682
        path = urlutils.relative_url(root.base, self.get_transport().base)
1241
686
        self.assertEqual('LockFailed', error_name)
1242
687
 
1243
688
 
1244
 
class TestSmartServerBranchRequestUnlock(TestLockedBranch):
 
689
class TestSmartServerBranchRequestUnlock(tests.TestCaseWithMemoryTransport):
1245
690
 
1246
691
    def setUp(self):
1247
692
        tests.TestCaseWithMemoryTransport.setUp(self)
1248
693
 
1249
694
    def test_unlock_on_locked_branch_and_repo(self):
1250
695
        backing = self.get_transport()
1251
 
        request = smart_branch.SmartServerBranchRequestUnlock(backing)
 
696
        request = smart.branch.SmartServerBranchRequestUnlock(backing)
1252
697
        branch = self.make_branch('.', format='knit')
1253
698
        # Lock the branch
1254
 
        branch_token, repo_token = self.get_lock_tokens(branch)
 
699
        branch_token = branch.lock_write()
 
700
        repo_token = branch.repository.lock_write()
 
701
        branch.repository.unlock()
1255
702
        # Unlock the branch (and repo) object, leaving the physical locks
1256
703
        # in place.
1257
704
        branch.leave_lock_in_place()
1260
707
        response = request.execute('',
1261
708
                                   branch_token, repo_token)
1262
709
        self.assertEqual(
1263
 
            smart_req.SmartServerResponse(('ok',)), response)
 
710
            SmartServerResponse(('ok',)), response)
1264
711
        # The branch is now unlocked.  Verify that with a new branch
1265
712
        # object.
1266
713
        new_branch = branch.bzrdir.open_branch()
1269
716
 
1270
717
    def test_unlock_on_unlocked_branch_unlocked_repo(self):
1271
718
        backing = self.get_transport()
1272
 
        request = smart_branch.SmartServerBranchRequestUnlock(backing)
 
719
        request = smart.branch.SmartServerBranchRequestUnlock(backing)
1273
720
        branch = self.make_branch('.', format='knit')
1274
721
        response = request.execute(
1275
722
            '', 'branch token', 'repo token')
1276
723
        self.assertEqual(
1277
 
            smart_req.SmartServerResponse(('TokenMismatch',)), response)
 
724
            SmartServerResponse(('TokenMismatch',)), response)
1278
725
 
1279
726
    def test_unlock_on_unlocked_branch_locked_repo(self):
1280
727
        backing = self.get_transport()
1281
 
        request = smart_branch.SmartServerBranchRequestUnlock(backing)
 
728
        request = smart.branch.SmartServerBranchRequestUnlock(backing)
1282
729
        branch = self.make_branch('.', format='knit')
1283
730
        # Lock the repository.
1284
 
        repo_token = branch.repository.lock_write().repository_token
 
731
        repo_token = branch.repository.lock_write()
1285
732
        branch.repository.leave_lock_in_place()
1286
733
        branch.repository.unlock()
1287
734
        # Issue branch lock_write request on the unlocked branch (with locked
1288
735
        # repo).
1289
 
        response = request.execute('', 'branch token', repo_token)
 
736
        response = request.execute(
 
737
            '', 'branch token', repo_token)
1290
738
        self.assertEqual(
1291
 
            smart_req.SmartServerResponse(('TokenMismatch',)), response)
1292
 
        # Cleanup
1293
 
        branch.repository.lock_write(repo_token)
1294
 
        branch.repository.dont_leave_lock_in_place()
1295
 
        branch.repository.unlock()
 
739
            SmartServerResponse(('TokenMismatch',)), response)
1296
740
 
1297
741
 
1298
742
class TestSmartServerRepositoryRequest(tests.TestCaseWithMemoryTransport):
1304
748
        # its the exact path being looked at and the server is not
1305
749
        # searching.
1306
750
        backing = self.get_transport()
1307
 
        request = smart_repo.SmartServerRepositoryRequest(backing)
 
751
        request = smart.repository.SmartServerRepositoryRequest(backing)
1308
752
        self.make_repository('.', shared=True)
1309
753
        self.make_bzrdir('subdir')
1310
754
        self.assertRaises(errors.NoRepositoryPresent,
1316
760
    def test_trivial_bzipped(self):
1317
761
        # This tests that the wire encoding is actually bzipped
1318
762
        backing = self.get_transport()
1319
 
        request = smart_repo.SmartServerRepositoryGetParentMap(backing)
 
763
        request = smart.repository.SmartServerRepositoryGetParentMap(backing)
1320
764
        tree = self.make_branch_and_memory_tree('.')
1321
765
 
1322
766
        self.assertEqual(None,
1323
767
            request.execute('', 'missing-id'))
1324
 
        # Note that it returns a body that is bzipped.
1325
 
        self.assertEqual(
1326
 
            smart_req.SuccessfulSmartServerResponse(('ok', ), bz2.compress('')),
1327
 
            request.do_body('\n\n0\n'))
1328
 
 
1329
 
    def test_trivial_include_missing(self):
1330
 
        backing = self.get_transport()
1331
 
        request = smart_repo.SmartServerRepositoryGetParentMap(backing)
1332
 
        tree = self.make_branch_and_memory_tree('.')
1333
 
 
1334
 
        self.assertEqual(None,
1335
 
            request.execute('', 'missing-id', 'include-missing:'))
1336
 
        self.assertEqual(
1337
 
            smart_req.SuccessfulSmartServerResponse(('ok', ),
1338
 
                bz2.compress('missing:missing-id')),
1339
 
            request.do_body('\n\n0\n'))
1340
 
 
1341
 
 
1342
 
class TestSmartServerRepositoryGetRevisionGraph(
1343
 
    tests.TestCaseWithMemoryTransport):
 
768
        # Note that it returns a body (of '' bzipped).
 
769
        self.assertEqual(
 
770
            SuccessfulSmartServerResponse(('ok', ), bz2.compress('')),
 
771
            request.do_body('\n\n0\n'))
 
772
 
 
773
 
 
774
class TestSmartServerRepositoryGetRevisionGraph(tests.TestCaseWithMemoryTransport):
1344
775
 
1345
776
    def test_none_argument(self):
1346
777
        backing = self.get_transport()
1347
 
        request = smart_repo.SmartServerRepositoryGetRevisionGraph(backing)
 
778
        request = smart.repository.SmartServerRepositoryGetRevisionGraph(backing)
1348
779
        tree = self.make_branch_and_memory_tree('.')
1349
780
        tree.lock_write()
1350
781
        tree.add('')
1359
790
        response.body = '\n'.join(sorted(response.body.split('\n')))
1360
791
 
1361
792
        self.assertEqual(
1362
 
            smart_req.SmartServerResponse(('ok', ), '\n'.join(lines)), response)
 
793
            SmartServerResponse(('ok', ), '\n'.join(lines)), response)
1363
794
 
1364
795
    def test_specific_revision_argument(self):
1365
796
        backing = self.get_transport()
1366
 
        request = smart_repo.SmartServerRepositoryGetRevisionGraph(backing)
 
797
        request = smart.repository.SmartServerRepositoryGetRevisionGraph(backing)
1367
798
        tree = self.make_branch_and_memory_tree('.')
1368
799
        tree.lock_write()
1369
800
        tree.add('')
1372
803
        r2 = tree.commit('2nd commit', rev_id=u'\xc8'.encode('utf-8'))
1373
804
        tree.unlock()
1374
805
 
1375
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), rev_id_utf8),
 
806
        self.assertEqual(SmartServerResponse(('ok', ), rev_id_utf8),
1376
807
            request.execute('', rev_id_utf8))
1377
 
 
 
808
    
1378
809
    def test_no_such_revision(self):
1379
810
        backing = self.get_transport()
1380
 
        request = smart_repo.SmartServerRepositoryGetRevisionGraph(backing)
 
811
        request = smart.repository.SmartServerRepositoryGetRevisionGraph(backing)
1381
812
        tree = self.make_branch_and_memory_tree('.')
1382
813
        tree.lock_write()
1383
814
        tree.add('')
1385
816
        tree.unlock()
1386
817
 
1387
818
        # Note that it still returns body (of zero bytes).
1388
 
        self.assertEqual(smart_req.SmartServerResponse(
1389
 
                ('nosuchrevision', 'missingrevision', ), ''),
1390
 
                         request.execute('', 'missingrevision'))
1391
 
 
1392
 
 
1393
 
class TestSmartServerRepositoryGetRevIdForRevno(
1394
 
    tests.TestCaseWithMemoryTransport):
1395
 
 
1396
 
    def test_revno_found(self):
1397
 
        backing = self.get_transport()
1398
 
        request = smart_repo.SmartServerRepositoryGetRevIdForRevno(backing)
1399
 
        tree = self.make_branch_and_memory_tree('.')
1400
 
        tree.lock_write()
1401
 
        tree.add('')
1402
 
        rev1_id_utf8 = u'\xc8'.encode('utf-8')
1403
 
        rev2_id_utf8 = u'\xc9'.encode('utf-8')
1404
 
        tree.commit('1st commit', rev_id=rev1_id_utf8)
1405
 
        tree.commit('2nd commit', rev_id=rev2_id_utf8)
1406
 
        tree.unlock()
1407
 
 
1408
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', rev1_id_utf8)),
1409
 
            request.execute('', 1, (2, rev2_id_utf8)))
1410
 
 
1411
 
    def test_known_revid_missing(self):
1412
 
        backing = self.get_transport()
1413
 
        request = smart_repo.SmartServerRepositoryGetRevIdForRevno(backing)
1414
 
        repo = self.make_repository('.')
1415
 
        self.assertEqual(
1416
 
            smart_req.FailedSmartServerResponse(('nosuchrevision', 'ghost')),
1417
 
            request.execute('', 1, (2, 'ghost')))
1418
 
 
1419
 
    def test_history_incomplete(self):
1420
 
        backing = self.get_transport()
1421
 
        request = smart_repo.SmartServerRepositoryGetRevIdForRevno(backing)
1422
 
        parent = self.make_branch_and_memory_tree('parent', format='1.9')
1423
 
        parent.lock_write()
1424
 
        parent.add([''], ['TREE_ROOT'])
1425
 
        r1 = parent.commit(message='first commit')
1426
 
        r2 = parent.commit(message='second commit')
1427
 
        parent.unlock()
1428
 
        local = self.make_branch_and_memory_tree('local', format='1.9')
1429
 
        local.branch.pull(parent.branch)
1430
 
        local.set_parent_ids([r2])
1431
 
        r3 = local.commit(message='local commit')
1432
 
        local.branch.create_clone_on_transport(
1433
 
            self.get_transport('stacked'), stacked_on=self.get_url('parent'))
1434
 
        self.assertEqual(
1435
 
            smart_req.SmartServerResponse(('history-incomplete', 2, r2)),
1436
 
            request.execute('stacked', 1, (3, r3)))
1437
 
 
1438
 
 
1439
 
class TestSmartServerRepositoryGetStream(tests.TestCaseWithMemoryTransport):
1440
 
 
1441
 
    def make_two_commit_repo(self):
1442
 
        tree = self.make_branch_and_memory_tree('.')
1443
 
        tree.lock_write()
1444
 
        tree.add('')
1445
 
        r1 = tree.commit('1st commit')
1446
 
        r2 = tree.commit('2nd commit', rev_id=u'\xc8'.encode('utf-8'))
1447
 
        tree.unlock()
1448
 
        repo = tree.branch.repository
1449
 
        return repo, r1, r2
1450
 
 
1451
 
    def test_ancestry_of(self):
1452
 
        """The search argument may be a 'ancestry-of' some heads'."""
1453
 
        backing = self.get_transport()
1454
 
        request = smart_repo.SmartServerRepositoryGetStream(backing)
1455
 
        repo, r1, r2 = self.make_two_commit_repo()
1456
 
        fetch_spec = ['ancestry-of', r2]
1457
 
        lines = '\n'.join(fetch_spec)
1458
 
        request.execute('', repo._format.network_name())
1459
 
        response = request.do_body(lines)
1460
 
        self.assertEqual(('ok',), response.args)
1461
 
        stream_bytes = ''.join(response.body_stream)
1462
 
        self.assertStartsWith(stream_bytes, 'Bazaar pack format 1')
1463
 
 
1464
 
    def test_search(self):
1465
 
        """The search argument may be a 'search' of some explicit keys."""
1466
 
        backing = self.get_transport()
1467
 
        request = smart_repo.SmartServerRepositoryGetStream(backing)
1468
 
        repo, r1, r2 = self.make_two_commit_repo()
1469
 
        fetch_spec = ['search', '%s %s' % (r1, r2), 'null:', '2']
1470
 
        lines = '\n'.join(fetch_spec)
1471
 
        request.execute('', repo._format.network_name())
1472
 
        response = request.do_body(lines)
1473
 
        self.assertEqual(('ok',), response.args)
1474
 
        stream_bytes = ''.join(response.body_stream)
1475
 
        self.assertStartsWith(stream_bytes, 'Bazaar pack format 1')
 
819
        self.assertEqual(
 
820
            SmartServerResponse(('nosuchrevision', 'missingrevision', ), ''),
 
821
            request.execute('', 'missingrevision'))
1476
822
 
1477
823
 
1478
824
class TestSmartServerRequestHasRevision(tests.TestCaseWithMemoryTransport):
1480
826
    def test_missing_revision(self):
1481
827
        """For a missing revision, ('no', ) is returned."""
1482
828
        backing = self.get_transport()
1483
 
        request = smart_repo.SmartServerRequestHasRevision(backing)
 
829
        request = smart.repository.SmartServerRequestHasRevision(backing)
1484
830
        self.make_repository('.')
1485
 
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
 
831
        self.assertEqual(SmartServerResponse(('no', )),
1486
832
            request.execute('', 'revid'))
1487
833
 
1488
834
    def test_present_revision(self):
1489
835
        """For a present revision, ('yes', ) is returned."""
1490
836
        backing = self.get_transport()
1491
 
        request = smart_repo.SmartServerRequestHasRevision(backing)
 
837
        request = smart.repository.SmartServerRequestHasRevision(backing)
1492
838
        tree = self.make_branch_and_memory_tree('.')
1493
839
        tree.lock_write()
1494
840
        tree.add('')
1496
842
        r1 = tree.commit('a commit', rev_id=rev_id_utf8)
1497
843
        tree.unlock()
1498
844
        self.assertTrue(tree.branch.repository.has_revision(rev_id_utf8))
1499
 
        self.assertEqual(smart_req.SmartServerResponse(('yes', )),
 
845
        self.assertEqual(SmartServerResponse(('yes', )),
1500
846
            request.execute('', rev_id_utf8))
1501
847
 
1502
848
 
1505
851
    def test_empty_revid(self):
1506
852
        """With an empty revid, we get only size an number and revisions"""
1507
853
        backing = self.get_transport()
1508
 
        request = smart_repo.SmartServerRepositoryGatherStats(backing)
 
854
        request = smart.repository.SmartServerRepositoryGatherStats(backing)
1509
855
        repository = self.make_repository('.')
1510
856
        stats = repository.gather_stats()
1511
857
        expected_body = 'revisions: 0\n'
1512
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), expected_body),
 
858
        self.assertEqual(SmartServerResponse(('ok', ), expected_body),
1513
859
                         request.execute('', '', 'no'))
1514
860
 
1515
861
    def test_revid_with_committers(self):
1516
862
        """For a revid we get more infos."""
1517
863
        backing = self.get_transport()
1518
864
        rev_id_utf8 = u'\xc8abc'.encode('utf-8')
1519
 
        request = smart_repo.SmartServerRepositoryGatherStats(backing)
 
865
        request = smart.repository.SmartServerRepositoryGatherStats(backing)
1520
866
        tree = self.make_branch_and_memory_tree('.')
1521
867
        tree.lock_write()
1522
868
        tree.add('')
1530
876
        expected_body = ('firstrev: 123456.200 3600\n'
1531
877
                         'latestrev: 654321.400 0\n'
1532
878
                         'revisions: 2\n')
1533
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), expected_body),
 
879
        self.assertEqual(SmartServerResponse(('ok', ), expected_body),
1534
880
                         request.execute('',
1535
881
                                         rev_id_utf8, 'no'))
1536
882
 
1538
884
        """For a revid and requesting committers we get the whole thing."""
1539
885
        backing = self.get_transport()
1540
886
        rev_id_utf8 = u'\xc8abc'.encode('utf-8')
1541
 
        request = smart_repo.SmartServerRepositoryGatherStats(backing)
 
887
        request = smart.repository.SmartServerRepositoryGatherStats(backing)
1542
888
        tree = self.make_branch_and_memory_tree('.')
1543
889
        tree.lock_write()
1544
890
        tree.add('')
1554
900
                         'firstrev: 123456.200 3600\n'
1555
901
                         'latestrev: 654321.400 0\n'
1556
902
                         'revisions: 2\n')
1557
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), expected_body),
 
903
        self.assertEqual(SmartServerResponse(('ok', ), expected_body),
1558
904
                         request.execute('',
1559
905
                                         rev_id_utf8, 'yes'))
1560
906
 
1564
910
    def test_is_shared(self):
1565
911
        """For a shared repository, ('yes', ) is returned."""
1566
912
        backing = self.get_transport()
1567
 
        request = smart_repo.SmartServerRepositoryIsShared(backing)
 
913
        request = smart.repository.SmartServerRepositoryIsShared(backing)
1568
914
        self.make_repository('.', shared=True)
1569
 
        self.assertEqual(smart_req.SmartServerResponse(('yes', )),
 
915
        self.assertEqual(SmartServerResponse(('yes', )),
1570
916
            request.execute('', ))
1571
917
 
1572
918
    def test_is_not_shared(self):
1573
919
        """For a shared repository, ('no', ) is returned."""
1574
920
        backing = self.get_transport()
1575
 
        request = smart_repo.SmartServerRepositoryIsShared(backing)
 
921
        request = smart.repository.SmartServerRepositoryIsShared(backing)
1576
922
        self.make_repository('.', shared=False)
1577
 
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
 
923
        self.assertEqual(SmartServerResponse(('no', )),
1578
924
            request.execute('', ))
1579
925
 
1580
926
 
1581
927
class TestSmartServerRepositoryLockWrite(tests.TestCaseWithMemoryTransport):
1582
928
 
 
929
    def setUp(self):
 
930
        tests.TestCaseWithMemoryTransport.setUp(self)
 
931
 
1583
932
    def test_lock_write_on_unlocked_repo(self):
1584
933
        backing = self.get_transport()
1585
 
        request = smart_repo.SmartServerRepositoryLockWrite(backing)
 
934
        request = smart.repository.SmartServerRepositoryLockWrite(backing)
1586
935
        repository = self.make_repository('.', format='knit')
1587
936
        response = request.execute('')
1588
937
        nonce = repository.control_files._lock.peek().get('nonce')
1589
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', nonce)), response)
 
938
        self.assertEqual(SmartServerResponse(('ok', nonce)), response)
1590
939
        # The repository is now locked.  Verify that with a new repository
1591
940
        # object.
1592
941
        new_repo = repository.bzrdir.open_repository()
1593
942
        self.assertRaises(errors.LockContention, new_repo.lock_write)
1594
 
        # Cleanup
1595
 
        request = smart_repo.SmartServerRepositoryUnlock(backing)
1596
 
        response = request.execute('', nonce)
1597
943
 
1598
944
    def test_lock_write_on_locked_repo(self):
1599
945
        backing = self.get_transport()
1600
 
        request = smart_repo.SmartServerRepositoryLockWrite(backing)
 
946
        request = smart.repository.SmartServerRepositoryLockWrite(backing)
1601
947
        repository = self.make_repository('.', format='knit')
1602
 
        repo_token = repository.lock_write().repository_token
 
948
        repository.lock_write()
1603
949
        repository.leave_lock_in_place()
1604
950
        repository.unlock()
1605
951
        response = request.execute('')
1606
952
        self.assertEqual(
1607
 
            smart_req.SmartServerResponse(('LockContention',)), response)
1608
 
        # Cleanup
1609
 
        repository.lock_write(repo_token)
1610
 
        repository.dont_leave_lock_in_place()
1611
 
        repository.unlock()
 
953
            SmartServerResponse(('LockContention',)), response)
1612
954
 
1613
955
    def test_lock_write_on_readonly_transport(self):
1614
956
        backing = self.get_readonly_transport()
1615
 
        request = smart_repo.SmartServerRepositoryLockWrite(backing)
 
957
        request = smart.repository.SmartServerRepositoryLockWrite(backing)
1616
958
        repository = self.make_repository('.', format='knit')
1617
959
        response = request.execute('')
1618
960
        self.assertFalse(response.is_successful())
1619
961
        self.assertEqual('LockFailed', response.args[0])
1620
962
 
1621
963
 
1622
 
class TestInsertStreamBase(tests.TestCaseWithMemoryTransport):
1623
 
 
1624
 
    def make_empty_byte_stream(self, repo):
1625
 
        byte_stream = smart_repo._stream_to_byte_stream([], repo._format)
1626
 
        return ''.join(byte_stream)
1627
 
 
1628
 
 
1629
 
class TestSmartServerRepositoryInsertStream(TestInsertStreamBase):
1630
 
 
1631
 
    def test_insert_stream_empty(self):
1632
 
        backing = self.get_transport()
1633
 
        request = smart_repo.SmartServerRepositoryInsertStream(backing)
1634
 
        repository = self.make_repository('.')
1635
 
        response = request.execute('', '')
1636
 
        self.assertEqual(None, response)
1637
 
        response = request.do_chunk(self.make_empty_byte_stream(repository))
1638
 
        self.assertEqual(None, response)
1639
 
        response = request.do_end()
1640
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', )), response)
1641
 
 
1642
 
 
1643
 
class TestSmartServerRepositoryInsertStreamLocked(TestInsertStreamBase):
1644
 
 
1645
 
    def test_insert_stream_empty(self):
1646
 
        backing = self.get_transport()
1647
 
        request = smart_repo.SmartServerRepositoryInsertStreamLocked(
1648
 
            backing)
1649
 
        repository = self.make_repository('.', format='knit')
1650
 
        lock_token = repository.lock_write().repository_token
1651
 
        response = request.execute('', '', lock_token)
1652
 
        self.assertEqual(None, response)
1653
 
        response = request.do_chunk(self.make_empty_byte_stream(repository))
1654
 
        self.assertEqual(None, response)
1655
 
        response = request.do_end()
1656
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', )), response)
1657
 
        repository.unlock()
1658
 
 
1659
 
    def test_insert_stream_with_wrong_lock_token(self):
1660
 
        backing = self.get_transport()
1661
 
        request = smart_repo.SmartServerRepositoryInsertStreamLocked(
1662
 
            backing)
1663
 
        repository = self.make_repository('.', format='knit')
1664
 
        lock_token = repository.lock_write().repository_token
1665
 
        self.assertRaises(
1666
 
            errors.TokenMismatch, request.execute, '', '', 'wrong-token')
1667
 
        repository.unlock()
1668
 
 
1669
 
 
1670
964
class TestSmartServerRepositoryUnlock(tests.TestCaseWithMemoryTransport):
1671
965
 
1672
966
    def setUp(self):
1674
968
 
1675
969
    def test_unlock_on_locked_repo(self):
1676
970
        backing = self.get_transport()
1677
 
        request = smart_repo.SmartServerRepositoryUnlock(backing)
 
971
        request = smart.repository.SmartServerRepositoryUnlock(backing)
1678
972
        repository = self.make_repository('.', format='knit')
1679
 
        token = repository.lock_write().repository_token
 
973
        token = repository.lock_write()
1680
974
        repository.leave_lock_in_place()
1681
975
        repository.unlock()
1682
976
        response = request.execute('', token)
1683
977
        self.assertEqual(
1684
 
            smart_req.SmartServerResponse(('ok',)), response)
 
978
            SmartServerResponse(('ok',)), response)
1685
979
        # The repository is now unlocked.  Verify that with a new repository
1686
980
        # object.
1687
981
        new_repo = repository.bzrdir.open_repository()
1690
984
 
1691
985
    def test_unlock_on_unlocked_repo(self):
1692
986
        backing = self.get_transport()
1693
 
        request = smart_repo.SmartServerRepositoryUnlock(backing)
 
987
        request = smart.repository.SmartServerRepositoryUnlock(backing)
1694
988
        repository = self.make_repository('.', format='knit')
1695
989
        response = request.execute('', 'some token')
1696
990
        self.assertEqual(
1697
 
            smart_req.SmartServerResponse(('TokenMismatch',)), response)
 
991
            SmartServerResponse(('TokenMismatch',)), response)
1698
992
 
1699
993
 
1700
994
class TestSmartServerIsReadonly(tests.TestCaseWithMemoryTransport):
1701
995
 
1702
996
    def test_is_readonly_no(self):
1703
997
        backing = self.get_transport()
1704
 
        request = smart_req.SmartServerIsReadonly(backing)
 
998
        request = smart.request.SmartServerIsReadonly(backing)
1705
999
        response = request.execute()
1706
1000
        self.assertEqual(
1707
 
            smart_req.SmartServerResponse(('no',)), response)
 
1001
            SmartServerResponse(('no',)), response)
1708
1002
 
1709
1003
    def test_is_readonly_yes(self):
1710
1004
        backing = self.get_readonly_transport()
1711
 
        request = smart_req.SmartServerIsReadonly(backing)
 
1005
        request = smart.request.SmartServerIsReadonly(backing)
1712
1006
        response = request.execute()
1713
1007
        self.assertEqual(
1714
 
            smart_req.SmartServerResponse(('yes',)), response)
1715
 
 
1716
 
 
1717
 
class TestSmartServerRepositorySetMakeWorkingTrees(
1718
 
    tests.TestCaseWithMemoryTransport):
1719
 
 
1720
 
    def test_set_false(self):
1721
 
        backing = self.get_transport()
1722
 
        repo = self.make_repository('.', shared=True)
1723
 
        repo.set_make_working_trees(True)
1724
 
        request_class = smart_repo.SmartServerRepositorySetMakeWorkingTrees
1725
 
        request = request_class(backing)
1726
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
1727
 
            request.execute('', 'False'))
1728
 
        repo = repo.bzrdir.open_repository()
1729
 
        self.assertFalse(repo.make_working_trees())
1730
 
 
1731
 
    def test_set_true(self):
1732
 
        backing = self.get_transport()
1733
 
        repo = self.make_repository('.', shared=True)
1734
 
        repo.set_make_working_trees(False)
1735
 
        request_class = smart_repo.SmartServerRepositorySetMakeWorkingTrees
1736
 
        request = request_class(backing)
1737
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
1738
 
            request.execute('', 'True'))
1739
 
        repo = repo.bzrdir.open_repository()
1740
 
        self.assertTrue(repo.make_working_trees())
1741
 
 
1742
 
 
1743
 
class TestSmartServerPackRepositoryAutopack(tests.TestCaseWithTransport):
1744
 
 
1745
 
    def make_repo_needing_autopacking(self, path='.'):
1746
 
        # Make a repo in need of autopacking.
1747
 
        tree = self.make_branch_and_tree('.', format='pack-0.92')
1748
 
        repo = tree.branch.repository
1749
 
        # monkey-patch the pack collection to disable autopacking
1750
 
        repo._pack_collection._max_pack_count = lambda count: count
1751
 
        for x in range(10):
1752
 
            tree.commit('commit %s' % x)
1753
 
        self.assertEqual(10, len(repo._pack_collection.names()))
1754
 
        del repo._pack_collection._max_pack_count
1755
 
        return repo
1756
 
 
1757
 
    def test_autopack_needed(self):
1758
 
        repo = self.make_repo_needing_autopacking()
1759
 
        repo.lock_write()
1760
 
        self.addCleanup(repo.unlock)
1761
 
        backing = self.get_transport()
1762
 
        request = smart_packrepo.SmartServerPackRepositoryAutopack(
1763
 
            backing)
1764
 
        response = request.execute('')
1765
 
        self.assertEqual(smart_req.SmartServerResponse(('ok',)), response)
1766
 
        repo._pack_collection.reload_pack_names()
1767
 
        self.assertEqual(1, len(repo._pack_collection.names()))
1768
 
 
1769
 
    def test_autopack_not_needed(self):
1770
 
        tree = self.make_branch_and_tree('.', format='pack-0.92')
1771
 
        repo = tree.branch.repository
1772
 
        repo.lock_write()
1773
 
        self.addCleanup(repo.unlock)
1774
 
        for x in range(9):
1775
 
            tree.commit('commit %s' % x)
1776
 
        backing = self.get_transport()
1777
 
        request = smart_packrepo.SmartServerPackRepositoryAutopack(
1778
 
            backing)
1779
 
        response = request.execute('')
1780
 
        self.assertEqual(smart_req.SmartServerResponse(('ok',)), response)
1781
 
        repo._pack_collection.reload_pack_names()
1782
 
        self.assertEqual(9, len(repo._pack_collection.names()))
1783
 
 
1784
 
    def test_autopack_on_nonpack_format(self):
1785
 
        """A request to autopack a non-pack repo is a no-op."""
1786
 
        repo = self.make_repository('.', format='knit')
1787
 
        backing = self.get_transport()
1788
 
        request = smart_packrepo.SmartServerPackRepositoryAutopack(
1789
 
            backing)
1790
 
        response = request.execute('')
1791
 
        self.assertEqual(smart_req.SmartServerResponse(('ok',)), response)
1792
 
 
1793
 
 
1794
 
class TestSmartServerVfsGet(tests.TestCaseWithMemoryTransport):
1795
 
 
1796
 
    def test_unicode_path(self):
1797
 
        """VFS requests expect unicode paths to be escaped."""
1798
 
        filename = u'foo\N{INTERROBANG}'
1799
 
        filename_escaped = urlutils.escape(filename)
1800
 
        backing = self.get_transport()
1801
 
        request = vfs.GetRequest(backing)
1802
 
        backing.put_bytes_non_atomic(filename_escaped, 'contents')
1803
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), 'contents'),
1804
 
            request.execute(filename_escaped))
 
1008
            SmartServerResponse(('yes',)), response)
1805
1009
 
1806
1010
 
1807
1011
class TestHandlers(tests.TestCase):
1811
1015
        """All registered request_handlers can be found."""
1812
1016
        # If there's a typo in a register_lazy call, this loop will fail with
1813
1017
        # an AttributeError.
1814
 
        for key, item in smart_req.request_handlers.iteritems():
 
1018
        for key, item in smart.request.request_handlers.iteritems():
1815
1019
            pass
1816
1020
 
1817
 
    def assertHandlerEqual(self, verb, handler):
1818
 
        self.assertEqual(smart_req.request_handlers.get(verb), handler)
1819
 
 
1820
1021
    def test_registered_methods(self):
1821
1022
        """Test that known methods are registered to the correct object."""
1822
 
        self.assertHandlerEqual('Branch.get_config_file',
1823
 
            smart_branch.SmartServerBranchGetConfigFile)
1824
 
        self.assertHandlerEqual('Branch.get_parent',
1825
 
            smart_branch.SmartServerBranchGetParent)
1826
 
        self.assertHandlerEqual('Branch.get_tags_bytes',
1827
 
            smart_branch.SmartServerBranchGetTagsBytes)
1828
 
        self.assertHandlerEqual('Branch.lock_write',
1829
 
            smart_branch.SmartServerBranchRequestLockWrite)
1830
 
        self.assertHandlerEqual('Branch.last_revision_info',
1831
 
            smart_branch.SmartServerBranchRequestLastRevisionInfo)
1832
 
        self.assertHandlerEqual('Branch.revision_history',
1833
 
            smart_branch.SmartServerRequestRevisionHistory)
1834
 
        self.assertHandlerEqual('Branch.set_config_option',
1835
 
            smart_branch.SmartServerBranchRequestSetConfigOption)
1836
 
        self.assertHandlerEqual('Branch.set_last_revision',
1837
 
            smart_branch.SmartServerBranchRequestSetLastRevision)
1838
 
        self.assertHandlerEqual('Branch.set_last_revision_info',
1839
 
            smart_branch.SmartServerBranchRequestSetLastRevisionInfo)
1840
 
        self.assertHandlerEqual('Branch.set_last_revision_ex',
1841
 
            smart_branch.SmartServerBranchRequestSetLastRevisionEx)
1842
 
        self.assertHandlerEqual('Branch.set_parent_location',
1843
 
            smart_branch.SmartServerBranchRequestSetParentLocation)
1844
 
        self.assertHandlerEqual('Branch.unlock',
1845
 
            smart_branch.SmartServerBranchRequestUnlock)
1846
 
        self.assertHandlerEqual('BzrDir.find_repository',
1847
 
            smart_dir.SmartServerRequestFindRepositoryV1)
1848
 
        self.assertHandlerEqual('BzrDir.find_repositoryV2',
1849
 
            smart_dir.SmartServerRequestFindRepositoryV2)
1850
 
        self.assertHandlerEqual('BzrDirFormat.initialize',
1851
 
            smart_dir.SmartServerRequestInitializeBzrDir)
1852
 
        self.assertHandlerEqual('BzrDirFormat.initialize_ex_1.16',
1853
 
            smart_dir.SmartServerRequestBzrDirInitializeEx)
1854
 
        self.assertHandlerEqual('BzrDir.cloning_metadir',
1855
 
            smart_dir.SmartServerBzrDirRequestCloningMetaDir)
1856
 
        self.assertHandlerEqual('BzrDir.get_config_file',
1857
 
            smart_dir.SmartServerBzrDirRequestConfigFile)
1858
 
        self.assertHandlerEqual('BzrDir.open_branch',
1859
 
            smart_dir.SmartServerRequestOpenBranch)
1860
 
        self.assertHandlerEqual('BzrDir.open_branchV2',
1861
 
            smart_dir.SmartServerRequestOpenBranchV2)
1862
 
        self.assertHandlerEqual('BzrDir.open_branchV3',
1863
 
            smart_dir.SmartServerRequestOpenBranchV3)
1864
 
        self.assertHandlerEqual('PackRepository.autopack',
1865
 
            smart_packrepo.SmartServerPackRepositoryAutopack)
1866
 
        self.assertHandlerEqual('Repository.gather_stats',
1867
 
            smart_repo.SmartServerRepositoryGatherStats)
1868
 
        self.assertHandlerEqual('Repository.get_parent_map',
1869
 
            smart_repo.SmartServerRepositoryGetParentMap)
1870
 
        self.assertHandlerEqual('Repository.get_rev_id_for_revno',
1871
 
            smart_repo.SmartServerRepositoryGetRevIdForRevno)
1872
 
        self.assertHandlerEqual('Repository.get_revision_graph',
1873
 
            smart_repo.SmartServerRepositoryGetRevisionGraph)
1874
 
        self.assertHandlerEqual('Repository.get_stream',
1875
 
            smart_repo.SmartServerRepositoryGetStream)
1876
 
        self.assertHandlerEqual('Repository.has_revision',
1877
 
            smart_repo.SmartServerRequestHasRevision)
1878
 
        self.assertHandlerEqual('Repository.insert_stream',
1879
 
            smart_repo.SmartServerRepositoryInsertStream)
1880
 
        self.assertHandlerEqual('Repository.insert_stream_locked',
1881
 
            smart_repo.SmartServerRepositoryInsertStreamLocked)
1882
 
        self.assertHandlerEqual('Repository.is_shared',
1883
 
            smart_repo.SmartServerRepositoryIsShared)
1884
 
        self.assertHandlerEqual('Repository.lock_write',
1885
 
            smart_repo.SmartServerRepositoryLockWrite)
1886
 
        self.assertHandlerEqual('Repository.tarball',
1887
 
            smart_repo.SmartServerRepositoryTarball)
1888
 
        self.assertHandlerEqual('Repository.unlock',
1889
 
            smart_repo.SmartServerRepositoryUnlock)
1890
 
        self.assertHandlerEqual('Transport.is_readonly',
1891
 
            smart_req.SmartServerIsReadonly)
 
1023
        self.assertEqual(
 
1024
            smart.request.request_handlers.get('Branch.get_config_file'),
 
1025
            smart.branch.SmartServerBranchGetConfigFile)
 
1026
        self.assertEqual(
 
1027
            smart.request.request_handlers.get('Branch.lock_write'),
 
1028
            smart.branch.SmartServerBranchRequestLockWrite)
 
1029
        self.assertEqual(
 
1030
            smart.request.request_handlers.get('Branch.last_revision_info'),
 
1031
            smart.branch.SmartServerBranchRequestLastRevisionInfo)
 
1032
        self.assertEqual(
 
1033
            smart.request.request_handlers.get('Branch.revision_history'),
 
1034
            smart.branch.SmartServerRequestRevisionHistory)
 
1035
        self.assertEqual(
 
1036
            smart.request.request_handlers.get('Branch.set_last_revision'),
 
1037
            smart.branch.SmartServerBranchRequestSetLastRevision)
 
1038
        self.assertEqual(
 
1039
            smart.request.request_handlers.get('Branch.set_last_revision_info'),
 
1040
            smart.branch.SmartServerBranchRequestSetLastRevisionInfo)
 
1041
        self.assertEqual(
 
1042
            smart.request.request_handlers.get('Branch.unlock'),
 
1043
            smart.branch.SmartServerBranchRequestUnlock)
 
1044
        self.assertEqual(
 
1045
            smart.request.request_handlers.get('BzrDir.find_repository'),
 
1046
            smart.bzrdir.SmartServerRequestFindRepositoryV1)
 
1047
        self.assertEqual(
 
1048
            smart.request.request_handlers.get('BzrDir.find_repositoryV2'),
 
1049
            smart.bzrdir.SmartServerRequestFindRepositoryV2)
 
1050
        self.assertEqual(
 
1051
            smart.request.request_handlers.get('BzrDirFormat.initialize'),
 
1052
            smart.bzrdir.SmartServerRequestInitializeBzrDir)
 
1053
        self.assertEqual(
 
1054
            smart.request.request_handlers.get('BzrDir.open_branch'),
 
1055
            smart.bzrdir.SmartServerRequestOpenBranch)
 
1056
        self.assertEqual(
 
1057
            smart.request.request_handlers.get('Repository.gather_stats'),
 
1058
            smart.repository.SmartServerRepositoryGatherStats)
 
1059
        self.assertEqual(
 
1060
            smart.request.request_handlers.get('Repository.get_parent_map'),
 
1061
            smart.repository.SmartServerRepositoryGetParentMap)
 
1062
        self.assertEqual(
 
1063
            smart.request.request_handlers.get(
 
1064
                'Repository.get_revision_graph'),
 
1065
            smart.repository.SmartServerRepositoryGetRevisionGraph)
 
1066
        self.assertEqual(
 
1067
            smart.request.request_handlers.get('Repository.has_revision'),
 
1068
            smart.repository.SmartServerRequestHasRevision)
 
1069
        self.assertEqual(
 
1070
            smart.request.request_handlers.get('Repository.is_shared'),
 
1071
            smart.repository.SmartServerRepositoryIsShared)
 
1072
        self.assertEqual(
 
1073
            smart.request.request_handlers.get('Repository.lock_write'),
 
1074
            smart.repository.SmartServerRepositoryLockWrite)
 
1075
        self.assertEqual(
 
1076
            smart.request.request_handlers.get('Repository.tarball'),
 
1077
            smart.repository.SmartServerRepositoryTarball)
 
1078
        self.assertEqual(
 
1079
            smart.request.request_handlers.get('Repository.unlock'),
 
1080
            smart.repository.SmartServerRepositoryUnlock)
 
1081
        self.assertEqual(
 
1082
            smart.request.request_handlers.get('Transport.is_readonly'),
 
1083
            smart.request.SmartServerIsReadonly)