/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: Martin Pool
  • Date: 2009-08-14 09:31:37 UTC
  • mto: (4599.4.26 bug-398668)
  • mto: This revision was merged to the branch mainline in revision 4610.
  • Revision ID: mbp@sourcefrog.net-20090814093137-hllvczkxnkp3so48
BadConversionTarget error includes source format

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