← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart.py

  • Committer: John Arbash Meinel
  • Date: 2009-08-13 21:54:04 UTC
  • mto: This revision was merged to the branch mainline in revision 4629.
  • Revision ID: john@arbash-meinel.com-20090813215404-f1e6vemv7vxyivoe
Create the crude merge_sort implementation that just thunks over to the old implementation.
The main win here is that we get to copy across all the tests so far, and they all pass. :)

Show diffs side-by-side

added added

removed removed

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