/brz/remove-bazaar

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

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart.py

  • Committer: John Arbash Meinel
  • Date: 2010-01-13 16:27:22 UTC
  • mfrom: (4634.119.6 2.0)
  • mto: (4634.119.7 2.0)
  • mto: This revision was merged to the branch mainline in revision 4959.
  • Revision ID: john@arbash-meinel.com-20100113162722-c177orxwb4fo19xe
Merge bzr/2.0@4725, resolve NEWS

Show diffs side-by-side

added added

removed removed

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