← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart.py

  • Committer: Martin Pool
  • Date: 2010-04-01 04:41:18 UTC
  • mto: This revision was merged to the branch mainline in revision 5128.
  • Revision ID: mbp@sourcefrog.net-20100401044118-shyctqc02ob08ngz
ignore .testrepository

Show diffs side-by-side

added added

removed removed

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