31
31
from bzrlib import (
33
branch as _mod_branch,
42
from bzrlib.smart import (
43
branch as smart_branch,
45
repository as smart_repo,
46
packrepository as smart_packrepo,
51
from bzrlib.tests import test_server
52
from bzrlib.transport import (
39
from bzrlib.branch import Branch, BranchReferenceFormat
40
import bzrlib.smart.branch
41
import bzrlib.smart.bzrdir, bzrlib.smart.bzrdir as smart_dir
42
import bzrlib.smart.packrepository
43
import bzrlib.smart.repository
44
from bzrlib.smart.request import (
45
FailedSmartServerResponse,
48
SuccessfulSmartServerResponse,
50
from bzrlib.tests import (
53
from bzrlib.transport import chroot, get_transport
54
from bzrlib.util import bencode
58
57
def load_tests(standard_tests, module, loader):
59
58
"""Multiply tests version and protocol consistency."""
60
59
# FindRepository tests.
60
bzrdir_mod = bzrlib.smart.bzrdir
62
62
("find_repository", {
63
"_request_class": smart_dir.SmartServerRequestFindRepositoryV1}),
63
"_request_class":bzrdir_mod.SmartServerRequestFindRepositoryV1}),
64
64
("find_repositoryV2", {
65
"_request_class": smart_dir.SmartServerRequestFindRepositoryV2}),
65
"_request_class":bzrdir_mod.SmartServerRequestFindRepositoryV2}),
66
66
("find_repositoryV3", {
67
"_request_class": smart_dir.SmartServerRequestFindRepositoryV3}),
67
"_request_class":bzrdir_mod.SmartServerRequestFindRepositoryV3}),
69
to_adapt, result = tests.split_suite_by_re(standard_tests,
69
to_adapt, result = split_suite_by_re(standard_tests,
70
70
"TestSmartServerRequestFindRepository")
71
v2_only, v1_and_2 = tests.split_suite_by_re(to_adapt,
71
v2_only, v1_and_2 = split_suite_by_re(to_adapt,
73
73
tests.multiply_tests(v1_and_2, scenarios, result)
74
74
# The first scenario is only applicable to v1 protocols, it is deleted
106
106
self.transport_server = self.make_transport_server
108
108
def make_transport_server(self):
109
return test_server.SmartTCPServer_for_testing('-' + self.id())
109
return smart.server.SmartTCPServer_for_testing('-' + self.id())
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()
116
class TestByteStreamToStream(tests.TestCase):
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)
126
# Iterate the resulting iterable; checking that we get only one stream
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])
135
116
class TestSmartServerResponse(tests.TestCase):
137
118
def test__eq__(self):
138
self.assertEqual(smart_req.SmartServerResponse(('ok', )),
139
smart_req.SmartServerResponse(('ok', )))
140
self.assertEqual(smart_req.SmartServerResponse(('ok', ), 'body'),
141
smart_req.SmartServerResponse(('ok', ), 'body'))
142
self.assertNotEqual(smart_req.SmartServerResponse(('ok', )),
143
smart_req.SmartServerResponse(('notok', )))
144
self.assertNotEqual(smart_req.SmartServerResponse(('ok', ), 'body'),
145
smart_req.SmartServerResponse(('ok', )))
119
self.assertEqual(SmartServerResponse(('ok', )),
120
SmartServerResponse(('ok', )))
121
self.assertEqual(SmartServerResponse(('ok', ), 'body'),
122
SmartServerResponse(('ok', ), 'body'))
123
self.assertNotEqual(SmartServerResponse(('ok', )),
124
SmartServerResponse(('notok', )))
125
self.assertNotEqual(SmartServerResponse(('ok', ), 'body'),
126
SmartServerResponse(('ok', )))
146
127
self.assertNotEqual(None,
147
smart_req.SmartServerResponse(('ok', )))
128
SmartServerResponse(('ok', )))
149
130
def test__str__(self):
150
131
"""SmartServerResponses can be stringified."""
151
132
self.assertEqual(
152
133
"<SuccessfulSmartServerResponse args=('args',) body='body'>",
153
str(smart_req.SuccessfulSmartServerResponse(('args',), 'body')))
134
str(SuccessfulSmartServerResponse(('args',), 'body')))
154
135
self.assertEqual(
155
136
"<FailedSmartServerResponse args=('args',) body='body'>",
156
str(smart_req.FailedSmartServerResponse(('args',), 'body')))
137
str(FailedSmartServerResponse(('args',), 'body')))
159
140
class TestSmartServerRequest(tests.TestCaseWithMemoryTransport):
161
142
def test_translate_client_path(self):
162
143
transport = self.get_transport()
163
request = smart_req.SmartServerRequest(transport, 'foo/')
144
request = SmartServerRequest(transport, 'foo/')
164
145
self.assertEqual('./', request.translate_client_path('foo/'))
165
146
self.assertRaises(
166
147
errors.InvalidURLJoin, request.translate_client_path, 'foo/..')
282
if repo._format.supports_external_lookups:
286
if (smart_dir.SmartServerRequestFindRepositoryV3 ==
250
if (smart.bzrdir.SmartServerRequestFindRepositoryV3 ==
287
251
self._request_class):
288
return smart_req.SuccessfulSmartServerResponse(
289
('ok', '', rich_root, subtrees, external,
252
return SuccessfulSmartServerResponse(
253
('ok', '', rich_root, subtrees, 'no',
290
254
repo._format.network_name()))
291
elif (smart_dir.SmartServerRequestFindRepositoryV2 ==
255
elif (smart.bzrdir.SmartServerRequestFindRepositoryV2 ==
292
256
self._request_class):
293
257
# All tests so far are on formats, and for non-external
295
return smart_req.SuccessfulSmartServerResponse(
296
('ok', '', rich_root, subtrees, external))
259
return SuccessfulSmartServerResponse(
260
('ok', '', rich_root, subtrees, 'no'))
298
return smart_req.SuccessfulSmartServerResponse(
299
('ok', '', rich_root, subtrees))
262
return SuccessfulSmartServerResponse(('ok', '', rich_root, subtrees))
301
264
def test_shared_repository(self):
302
265
"""When there is a shared repository, we get 'ok', 'relpath-to-repo'."""
330
290
"""Test for the supports_external_lookups attribute."""
331
291
backing = self.get_transport()
332
292
request = self._request_class(backing)
333
result = self._make_repository_and_result(
334
format='dirstate-with-subtree')
293
result = self._make_repository_and_result(format='dirstate-with-subtree')
335
294
# check the test will be valid
336
295
self.assertEqual('no', result.args[4])
337
296
self.assertEqual(result, request.execute(''))
340
class TestSmartServerBzrDirRequestGetConfigFile(
341
tests.TestCaseWithMemoryTransport):
342
"""Tests for BzrDir.get_config_file."""
344
def test_present(self):
345
backing = self.get_transport()
346
dir = self.make_bzrdir('.')
347
dir.get_config().set_default_stack_on("/")
348
local_result = dir._get_config()._get_config_file().read()
349
request_class = smart_dir.SmartServerBzrDirRequestConfigFile
350
request = request_class(backing)
351
expected = smart_req.SuccessfulSmartServerResponse((), local_result)
352
self.assertEqual(expected, request.execute(''))
354
def test_missing(self):
355
backing = self.get_transport()
356
dir = self.make_bzrdir('.')
357
request_class = smart_dir.SmartServerBzrDirRequestConfigFile
358
request = request_class(backing)
359
expected = smart_req.SuccessfulSmartServerResponse((), '')
360
self.assertEqual(expected, request.execute(''))
363
299
class TestSmartServerRequestInitializeBzrDir(tests.TestCaseWithMemoryTransport):
365
301
def test_empty_dir(self):
366
302
"""Initializing an empty dir should succeed and do it."""
367
303
backing = self.get_transport()
368
request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
369
self.assertEqual(smart_req.SmartServerResponse(('ok', )),
304
request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
305
self.assertEqual(SmartServerResponse(('ok', )),
370
306
request.execute(''))
371
307
made_dir = bzrdir.BzrDir.open_from_transport(backing)
372
308
# no branch, tree or repository is expected with the current
378
314
def test_missing_dir(self):
379
315
"""Initializing a missing directory should fail like the bzrdir api."""
380
316
backing = self.get_transport()
381
request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
317
request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
382
318
self.assertRaises(errors.NoSuchFile,
383
319
request.execute, 'subdir')
385
321
def test_initialized_dir(self):
386
322
"""Initializing an extant bzrdir should fail like the bzrdir api."""
387
323
backing = self.get_transport()
388
request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
324
request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
389
325
self.make_bzrdir('subdir')
390
326
self.assertRaises(errors.FileExists,
391
327
request.execute, 'subdir')
394
class TestSmartServerRequestBzrDirInitializeEx(
395
tests.TestCaseWithMemoryTransport):
396
"""Basic tests for BzrDir.initialize_ex_1.16 in the smart server.
398
The main unit tests in test_bzrdir exercise the API comprehensively.
401
def test_empty_dir(self):
402
"""Initializing an empty dir should succeed and do it."""
403
backing = self.get_transport()
404
name = self.make_bzrdir('reference')._format.network_name()
405
request = smart_dir.SmartServerRequestBzrDirInitializeEx(backing)
407
smart_req.SmartServerResponse(('', '', '', '', '', '', name,
408
'False', '', '', '')),
409
request.execute(name, '', 'True', 'False', 'False', '', '', '', '',
411
made_dir = bzrdir.BzrDir.open_from_transport(backing)
412
# no branch, tree or repository is expected with the current
414
self.assertRaises(errors.NoWorkingTree, made_dir.open_workingtree)
415
self.assertRaises(errors.NotBranchError, made_dir.open_branch)
416
self.assertRaises(errors.NoRepositoryPresent, made_dir.open_repository)
418
def test_missing_dir(self):
419
"""Initializing a missing directory should fail like the bzrdir api."""
420
backing = self.get_transport()
421
name = self.make_bzrdir('reference')._format.network_name()
422
request = smart_dir.SmartServerRequestBzrDirInitializeEx(backing)
423
self.assertRaises(errors.NoSuchFile, request.execute, name,
424
'subdir/dir', 'False', 'False', 'False', '', '', '', '', 'False')
426
def test_initialized_dir(self):
427
"""Initializing an extant directory should fail like the bzrdir api."""
428
backing = self.get_transport()
429
name = self.make_bzrdir('reference')._format.network_name()
430
request = smart_dir.SmartServerRequestBzrDirInitializeEx(backing)
431
self.make_bzrdir('subdir')
432
self.assertRaises(errors.FileExists, request.execute, name, 'subdir',
433
'False', 'False', 'False', '', '', '', '', 'False')
436
class TestSmartServerRequestOpenBzrDir(tests.TestCaseWithMemoryTransport):
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'))
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'))
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'))
459
class TestSmartServerRequestOpenBzrDir_2_1(tests.TestCaseWithMemoryTransport):
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'))
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'))
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')),
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'))
489
class TestSmartServerRequestOpenBzrDir_2_1_disk(TestCaseWithChrootedTransport):
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()
498
bd.create_workingtree()
499
self.assertEqual(smart_req.SmartServerResponse(('yes', 'yes')),
503
330
class TestSmartServerRequestOpenBranch(TestCaseWithChrootedTransport):
505
332
def test_no_branch(self):
506
333
"""When there is no branch, ('nobranch', ) is returned."""
507
334
backing = self.get_transport()
508
request = smart_dir.SmartServerRequestOpenBranch(backing)
335
request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
509
336
self.make_bzrdir('.')
510
self.assertEqual(smart_req.SmartServerResponse(('nobranch', )),
337
self.assertEqual(SmartServerResponse(('nobranch', )),
511
338
request.execute(''))
513
340
def test_branch(self):
514
341
"""When there is a branch, 'ok' is returned."""
515
342
backing = self.get_transport()
516
request = smart_dir.SmartServerRequestOpenBranch(backing)
343
request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
517
344
self.make_branch('.')
518
self.assertEqual(smart_req.SmartServerResponse(('ok', '')),
345
self.assertEqual(SmartServerResponse(('ok', '')),
519
346
request.execute(''))
521
348
def test_branch_reference(self):
522
349
"""When there is a branch reference, the reference URL is returned."""
523
self.vfs_transport_factory = test_server.LocalURLServer
524
350
backing = self.get_transport()
525
request = smart_dir.SmartServerRequestOpenBranch(backing)
351
request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
526
352
branch = self.make_branch('branch')
527
353
checkout = branch.create_checkout('reference',lightweight=True)
528
reference_url = _mod_branch.BranchReferenceFormat().get_reference(
354
reference_url = BranchReferenceFormat().get_reference(checkout.bzrdir)
530
355
self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
531
self.assertEqual(smart_req.SmartServerResponse(('ok', reference_url)),
356
self.assertEqual(SmartServerResponse(('ok', reference_url)),
532
357
request.execute('reference'))
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',)),
543
360
class TestSmartServerRequestOpenBranchV2(TestCaseWithChrootedTransport):
546
363
"""When there is no branch, ('nobranch', ) is returned."""
547
364
backing = self.get_transport()
548
365
self.make_bzrdir('.')
549
request = smart_dir.SmartServerRequestOpenBranchV2(backing)
550
self.assertEqual(smart_req.SmartServerResponse(('nobranch', )),
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)),
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(
571
self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
572
self.assertEqual(smart_req.SuccessfulSmartServerResponse(
573
('ref', reference_url)),
574
request.execute('reference'))
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)
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)
588
response = request.execute('feature')
590
request.teardown_jail()
591
expected_format = feature._format.network_name()
592
self.assertEqual(smart_req.SuccessfulSmartServerResponse(
593
('branch', expected_format)),
595
self.assertLength(1, opened_branches)
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',)),
606
class TestSmartServerRequestOpenBranchV3(TestCaseWithChrootedTransport):
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',)),
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)),
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(
634
self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
635
self.assertEqual(smart_req.SuccessfulSmartServerResponse(
636
('ref', reference_url)),
637
request.execute('reference'))
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)
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)
651
response = request.execute('feature')
653
request.teardown_jail()
654
expected_format = feature._format.network_name()
655
self.assertEqual(smart_req.SuccessfulSmartServerResponse(
656
('branch', expected_format)),
658
self.assertLength(1, opened_branches)
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')),
366
request = smart.bzrdir.SmartServerRequestOpenBranchV2(backing)
367
self.assertEqual(SmartServerResponse(('nobranch', )),
370
def test_branch(self):
371
"""When there is a branch, 'ok' is returned."""
372
backing = self.get_transport()
373
expected = self.make_branch('.')._format.network_name()
374
request = smart.bzrdir.SmartServerRequestOpenBranchV2(backing)
375
self.assertEqual(SuccessfulSmartServerResponse(('branch', expected)),
378
def test_branch_reference(self):
379
"""When there is a branch reference, the reference URL is returned."""
380
backing = self.get_transport()
381
request = smart.bzrdir.SmartServerRequestOpenBranchV2(backing)
382
branch = self.make_branch('branch')
383
checkout = branch.create_checkout('reference',lightweight=True)
384
reference_url = BranchReferenceFormat().get_reference(checkout.bzrdir)
385
self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
386
self.assertEqual(SuccessfulSmartServerResponse(('ref', reference_url)),
387
request.execute('reference'))
389
def test_stacked_branch(self):
390
"""Opening a stacked branch does not open the stacked-on branch."""
391
trunk = self.make_branch('trunk')
392
feature = self.make_branch('feature', format='1.9')
393
feature.set_stacked_on_url(trunk.base)
395
Branch.hooks.install_named_hook('open', opened_branches.append, None)
396
backing = self.get_transport()
397
request = smart.bzrdir.SmartServerRequestOpenBranchV2(backing)
400
response = request.execute('feature')
402
request.teardown_jail()
403
expected_format = feature._format.network_name()
405
SuccessfulSmartServerResponse(('branch', expected_format)),
407
self.assertLength(1, opened_branches)
670
410
class TestSmartServerRequestRevisionHistory(tests.TestCaseWithMemoryTransport):
705
445
def test_branch_reference(self):
706
446
"""When there is a branch reference, NotBranchError is raised."""
707
447
backing = self.get_transport()
708
request = smart_branch.SmartServerBranchRequest(backing)
448
request = smart.branch.SmartServerBranchRequest(backing)
709
449
branch = self.make_branch('branch')
710
450
checkout = branch.create_checkout('reference',lightweight=True)
711
451
self.assertRaises(errors.NotBranchError,
712
452
request.execute, 'checkout')
715
class TestSmartServerBranchRequestLastRevisionInfo(
716
tests.TestCaseWithMemoryTransport):
455
class TestSmartServerBranchRequestLastRevisionInfo(tests.TestCaseWithMemoryTransport):
718
457
def test_empty(self):
719
458
"""For an empty branch, the result is ('ok', '0', 'null:')."""
720
459
backing = self.get_transport()
721
request = smart_branch.SmartServerBranchRequestLastRevisionInfo(backing)
460
request = smart.branch.SmartServerBranchRequestLastRevisionInfo(backing)
722
461
self.make_branch('.')
723
self.assertEqual(smart_req.SmartServerResponse(('ok', '0', 'null:')),
462
self.assertEqual(SmartServerResponse(('ok', '0', 'null:')),
724
463
request.execute(''))
726
465
def test_not_empty(self):
727
466
"""For a non-empty branch, the result is ('ok', 'revno', 'revid')."""
728
467
backing = self.get_transport()
729
request = smart_branch.SmartServerBranchRequestLastRevisionInfo(backing)
468
request = smart.branch.SmartServerBranchRequestLastRevisionInfo(backing)
730
469
tree = self.make_branch_and_memory_tree('.')
731
470
tree.lock_write()
757
495
# branch.control_files.get('branch.conf') for now - in the future it may
758
496
# perform more complex processing.
759
497
backing = self.get_transport()
760
request = smart_branch.SmartServerBranchGetConfigFile(backing)
498
request = smart.branch.SmartServerBranchGetConfigFile(backing)
761
499
branch = self.make_branch('.')
762
500
branch._transport.put_bytes('branch.conf', 'foo bar baz')
763
self.assertEqual(smart_req.SmartServerResponse(('ok', ), 'foo bar baz'),
501
self.assertEqual(SmartServerResponse(('ok', ), 'foo bar baz'),
764
502
request.execute(''))
767
class TestLockedBranch(tests.TestCaseWithMemoryTransport):
769
def get_lock_tokens(self, branch):
770
branch_token = branch.lock_write().branch_token
771
repo_token = branch.repository.lock_write().repository_token
772
branch.repository.unlock()
773
return branch_token, repo_token
776
class TestSmartServerBranchRequestSetConfigOption(TestLockedBranch):
778
def test_value_name(self):
779
branch = self.make_branch('.')
780
request = smart_branch.SmartServerBranchRequestSetConfigOption(
781
branch.bzrdir.root_transport)
782
branch_token, repo_token = self.get_lock_tokens(branch)
783
config = branch._get_config()
784
result = request.execute('', branch_token, repo_token, 'bar', 'foo',
786
self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), result)
787
self.assertEqual('bar', config.get_option('foo'))
791
def test_value_name_section(self):
792
branch = self.make_branch('.')
793
request = smart_branch.SmartServerBranchRequestSetConfigOption(
794
branch.bzrdir.root_transport)
795
branch_token, repo_token = self.get_lock_tokens(branch)
796
config = branch._get_config()
797
result = request.execute('', branch_token, repo_token, 'bar', 'foo',
799
self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), result)
800
self.assertEqual('bar', config.get_option('foo', 'gam'))
805
class TestSmartServerBranchRequestSetTagsBytes(TestLockedBranch):
806
# Only called when the branch format and tags match [yay factory
807
# methods] so only need to test straight forward cases.
809
def test_set_bytes(self):
810
base_branch = self.make_branch('base')
811
tag_bytes = base_branch._get_tags_bytes()
812
# get_lock_tokens takes out a lock.
813
branch_token, repo_token = self.get_lock_tokens(base_branch)
814
request = smart_branch.SmartServerBranchSetTagsBytes(
815
self.get_transport())
816
response = request.execute('base', branch_token, repo_token)
817
self.assertEqual(None, response)
818
response = request.do_chunk(tag_bytes)
819
self.assertEqual(None, response)
820
response = request.do_end()
822
smart_req.SuccessfulSmartServerResponse(()), response)
825
def test_lock_failed(self):
826
base_branch = self.make_branch('base')
827
base_branch.lock_write()
828
tag_bytes = base_branch._get_tags_bytes()
829
request = smart_branch.SmartServerBranchSetTagsBytes(
830
self.get_transport())
831
self.assertRaises(errors.TokenMismatch, request.execute,
832
'base', 'wrong token', 'wrong token')
833
# The request handler will keep processing the message parts, so even
834
# if the request fails immediately do_chunk and do_end are still
836
request.do_chunk(tag_bytes)
842
class SetLastRevisionTestBase(TestLockedBranch):
505
class SetLastRevisionTestBase(tests.TestCaseWithMemoryTransport):
843
506
"""Base test case for verbs that implement set_last_revision."""
1059
725
def test_get_parent_none(self):
1060
726
base_branch = self.make_branch('base')
1061
request = smart_branch.SmartServerBranchGetParent(self.get_transport())
727
request = smart.branch.SmartServerBranchGetParent(self.get_transport())
1062
728
response = request.execute('base')
1063
729
self.assertEquals(
1064
smart_req.SuccessfulSmartServerResponse(('',)), response)
730
SuccessfulSmartServerResponse(('',)), response)
1066
732
def test_get_parent_something(self):
1067
733
base_branch = self.make_branch('base')
1068
734
base_branch.set_parent(self.get_url('foo'))
1069
request = smart_branch.SmartServerBranchGetParent(self.get_transport())
735
request = smart.branch.SmartServerBranchGetParent(self.get_transport())
1070
736
response = request.execute('base')
1071
737
self.assertEquals(
1072
smart_req.SuccessfulSmartServerResponse(("../foo",)),
738
SuccessfulSmartServerResponse(("../foo",)),
1076
class TestSmartServerBranchRequestSetParent(TestLockedBranch):
1078
def test_set_parent_none(self):
1079
branch = self.make_branch('base', format="1.9")
1081
branch._set_parent_location('foo')
1083
request = smart_branch.SmartServerBranchRequestSetParentLocation(
1084
self.get_transport())
1085
branch_token, repo_token = self.get_lock_tokens(branch)
1087
response = request.execute('base', branch_token, repo_token, '')
1090
self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), response)
1091
self.assertEqual(None, branch.get_parent())
1093
def test_set_parent_something(self):
1094
branch = self.make_branch('base', format="1.9")
1095
request = smart_branch.SmartServerBranchRequestSetParentLocation(
1096
self.get_transport())
1097
branch_token, repo_token = self.get_lock_tokens(branch)
1099
response = request.execute('base', branch_token, repo_token,
1103
self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), response)
1104
self.assertEqual('http://bar/', branch.get_parent())
1107
class TestSmartServerBranchRequestGetTagsBytes(
1108
tests.TestCaseWithMemoryTransport):
1109
# Only called when the branch format and tags match [yay factory
1110
# methods] so only need to test straight forward cases.
742
class TestSmartServerBranchRequestGetTagsBytes(tests.TestCaseWithMemoryTransport):
743
# Only called when the branch format and tags match [yay factory
744
# methods] so only need to test straight forward cases.
1112
746
def test_get_bytes(self):
1113
747
base_branch = self.make_branch('base')
1114
request = smart_branch.SmartServerBranchGetTagsBytes(
748
request = smart.branch.SmartServerBranchGetTagsBytes(
1115
749
self.get_transport())
1116
750
response = request.execute('base')
1117
751
self.assertEquals(
1118
smart_req.SuccessfulSmartServerResponse(('',)), response)
752
SuccessfulSmartServerResponse(('',)), response)
1121
755
class TestSmartServerBranchRequestGetStackedOnURL(tests.TestCaseWithMemoryTransport):
1125
759
stacked_branch = self.make_branch('stacked', format='1.6')
1126
760
# typically should be relative
1127
761
stacked_branch.set_stacked_on_url('../base')
1128
request = smart_branch.SmartServerBranchRequestGetStackedOnURL(
762
request = smart.branch.SmartServerBranchRequestGetStackedOnURL(
1129
763
self.get_transport())
1130
764
response = request.execute('stacked')
1131
765
self.assertEquals(
1132
smart_req.SmartServerResponse(('ok', '../base')),
766
SmartServerResponse(('ok', '../base')),
1136
class TestSmartServerBranchRequestLockWrite(TestLockedBranch):
770
class TestSmartServerBranchRequestLockWrite(tests.TestCaseWithMemoryTransport):
1138
772
def setUp(self):
1139
773
tests.TestCaseWithMemoryTransport.setUp(self)
1141
775
def test_lock_write_on_unlocked_branch(self):
1142
776
backing = self.get_transport()
1143
request = smart_branch.SmartServerBranchRequestLockWrite(backing)
777
request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1144
778
branch = self.make_branch('.', format='knit')
1145
779
repository = branch.repository
1146
780
response = request.execute('')
1147
781
branch_nonce = branch.control_files._lock.peek().get('nonce')
1148
782
repository_nonce = repository.control_files._lock.peek().get('nonce')
1149
self.assertEqual(smart_req.SmartServerResponse(
1150
('ok', branch_nonce, repository_nonce)),
784
SmartServerResponse(('ok', branch_nonce, repository_nonce)),
1152
786
# The branch (and associated repository) is now locked. Verify that
1153
787
# with a new branch object.
1154
788
new_branch = repository.bzrdir.open_branch()
1155
789
self.assertRaises(errors.LockContention, new_branch.lock_write)
1157
request = smart_branch.SmartServerBranchRequestUnlock(backing)
1158
response = request.execute('', branch_nonce, repository_nonce)
1160
791
def test_lock_write_on_locked_branch(self):
1161
792
backing = self.get_transport()
1162
request = smart_branch.SmartServerBranchRequestLockWrite(backing)
793
request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1163
794
branch = self.make_branch('.')
1164
branch_token = branch.lock_write().branch_token
1165
796
branch.leave_lock_in_place()
1167
798
response = request.execute('')
1168
799
self.assertEqual(
1169
smart_req.SmartServerResponse(('LockContention',)), response)
1171
branch.lock_write(branch_token)
1172
branch.dont_leave_lock_in_place()
800
SmartServerResponse(('LockContention',)), response)
1175
802
def test_lock_write_with_tokens_on_locked_branch(self):
1176
803
backing = self.get_transport()
1177
request = smart_branch.SmartServerBranchRequestLockWrite(backing)
804
request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1178
805
branch = self.make_branch('.', format='knit')
1179
branch_token, repo_token = self.get_lock_tokens(branch)
806
branch_token = branch.lock_write()
807
repo_token = branch.repository.lock_write()
808
branch.repository.unlock()
1180
809
branch.leave_lock_in_place()
1181
810
branch.repository.leave_lock_in_place()
1183
812
response = request.execute('',
1184
813
branch_token, repo_token)
1185
814
self.assertEqual(
1186
smart_req.SmartServerResponse(('ok', branch_token, repo_token)),
1189
branch.repository.lock_write(repo_token)
1190
branch.repository.dont_leave_lock_in_place()
1191
branch.repository.unlock()
1192
branch.lock_write(branch_token)
1193
branch.dont_leave_lock_in_place()
815
SmartServerResponse(('ok', branch_token, repo_token)), response)
1196
817
def test_lock_write_with_mismatched_tokens_on_locked_branch(self):
1197
818
backing = self.get_transport()
1198
request = smart_branch.SmartServerBranchRequestLockWrite(backing)
819
request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1199
820
branch = self.make_branch('.', format='knit')
1200
branch_token, repo_token = self.get_lock_tokens(branch)
821
branch_token = branch.lock_write()
822
repo_token = branch.repository.lock_write()
823
branch.repository.unlock()
1201
824
branch.leave_lock_in_place()
1202
825
branch.repository.leave_lock_in_place()
1204
827
response = request.execute('',
1205
828
branch_token+'xxx', repo_token)
1206
829
self.assertEqual(
1207
smart_req.SmartServerResponse(('TokenMismatch',)), response)
1209
branch.repository.lock_write(repo_token)
1210
branch.repository.dont_leave_lock_in_place()
1211
branch.repository.unlock()
1212
branch.lock_write(branch_token)
1213
branch.dont_leave_lock_in_place()
830
SmartServerResponse(('TokenMismatch',)), response)
1216
832
def test_lock_write_on_locked_repo(self):
1217
833
backing = self.get_transport()
1218
request = smart_branch.SmartServerBranchRequestLockWrite(backing)
834
request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1219
835
branch = self.make_branch('.', format='knit')
1220
repo = branch.repository
1221
repo_token = repo.lock_write().repository_token
1222
repo.leave_lock_in_place()
836
branch.repository.lock_write()
837
branch.repository.leave_lock_in_place()
838
branch.repository.unlock()
1224
839
response = request.execute('')
1225
840
self.assertEqual(
1226
smart_req.SmartServerResponse(('LockContention',)), response)
1228
repo.lock_write(repo_token)
1229
repo.dont_leave_lock_in_place()
841
SmartServerResponse(('LockContention',)), response)
1232
843
def test_lock_write_on_readonly_transport(self):
1233
844
backing = self.get_readonly_transport()
1234
request = smart_branch.SmartServerBranchRequestLockWrite(backing)
845
request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1235
846
branch = self.make_branch('.')
1236
847
root = self.get_transport().clone('/')
1237
848
path = urlutils.relative_url(root.base, self.get_transport().base)
1270
883
def test_unlock_on_unlocked_branch_unlocked_repo(self):
1271
884
backing = self.get_transport()
1272
request = smart_branch.SmartServerBranchRequestUnlock(backing)
885
request = smart.branch.SmartServerBranchRequestUnlock(backing)
1273
886
branch = self.make_branch('.', format='knit')
1274
887
response = request.execute(
1275
888
'', 'branch token', 'repo token')
1276
889
self.assertEqual(
1277
smart_req.SmartServerResponse(('TokenMismatch',)), response)
890
SmartServerResponse(('TokenMismatch',)), response)
1279
892
def test_unlock_on_unlocked_branch_locked_repo(self):
1280
893
backing = self.get_transport()
1281
request = smart_branch.SmartServerBranchRequestUnlock(backing)
894
request = smart.branch.SmartServerBranchRequestUnlock(backing)
1282
895
branch = self.make_branch('.', format='knit')
1283
896
# Lock the repository.
1284
repo_token = branch.repository.lock_write().repository_token
897
repo_token = branch.repository.lock_write()
1285
898
branch.repository.leave_lock_in_place()
1286
899
branch.repository.unlock()
1287
900
# Issue branch lock_write request on the unlocked branch (with locked
1289
response = request.execute('', 'branch token', repo_token)
902
response = request.execute(
903
'', 'branch token', repo_token)
1290
904
self.assertEqual(
1291
smart_req.SmartServerResponse(('TokenMismatch',)), response)
1293
branch.repository.lock_write(repo_token)
1294
branch.repository.dont_leave_lock_in_place()
1295
branch.repository.unlock()
905
SmartServerResponse(('TokenMismatch',)), response)
1298
908
class TestSmartServerRepositoryRequest(tests.TestCaseWithMemoryTransport):
1316
926
def test_trivial_bzipped(self):
1317
927
# This tests that the wire encoding is actually bzipped
1318
928
backing = self.get_transport()
1319
request = smart_repo.SmartServerRepositoryGetParentMap(backing)
929
request = smart.repository.SmartServerRepositoryGetParentMap(backing)
1320
930
tree = self.make_branch_and_memory_tree('.')
1322
932
self.assertEqual(None,
1323
933
request.execute('', 'missing-id'))
1324
# Note that it returns a body that is bzipped.
1326
smart_req.SuccessfulSmartServerResponse(('ok', ), bz2.compress('')),
1327
request.do_body('\n\n0\n'))
1329
def test_trivial_include_missing(self):
1330
backing = self.get_transport()
1331
request = smart_repo.SmartServerRepositoryGetParentMap(backing)
1332
tree = self.make_branch_and_memory_tree('.')
1334
self.assertEqual(None,
1335
request.execute('', 'missing-id', 'include-missing:'))
1337
smart_req.SuccessfulSmartServerResponse(('ok', ),
1338
bz2.compress('missing:missing-id')),
1339
request.do_body('\n\n0\n'))
1342
class TestSmartServerRepositoryGetRevisionGraph(
1343
tests.TestCaseWithMemoryTransport):
934
# Note that it returns a body (of '' bzipped).
936
SuccessfulSmartServerResponse(('ok', ), bz2.compress('')),
937
request.do_body('\n\n0\n'))
940
class TestSmartServerRepositoryGetRevisionGraph(tests.TestCaseWithMemoryTransport):
1345
942
def test_none_argument(self):
1346
943
backing = self.get_transport()
1347
request = smart_repo.SmartServerRepositoryGetRevisionGraph(backing)
944
request = smart.repository.SmartServerRepositoryGetRevisionGraph(backing)
1348
945
tree = self.make_branch_and_memory_tree('.')
1349
946
tree.lock_write()
1387
984
# Note that it still returns body (of zero bytes).
1388
self.assertEqual(smart_req.SmartServerResponse(
1389
('nosuchrevision', 'missingrevision', ), ''),
1390
request.execute('', 'missingrevision'))
1393
class TestSmartServerRepositoryGetRevIdForRevno(
1394
tests.TestCaseWithMemoryTransport):
1396
def test_revno_found(self):
1397
backing = self.get_transport()
1398
request = smart_repo.SmartServerRepositoryGetRevIdForRevno(backing)
1399
tree = self.make_branch_and_memory_tree('.')
1402
rev1_id_utf8 = u'\xc8'.encode('utf-8')
1403
rev2_id_utf8 = u'\xc9'.encode('utf-8')
1404
tree.commit('1st commit', rev_id=rev1_id_utf8)
1405
tree.commit('2nd commit', rev_id=rev2_id_utf8)
1408
self.assertEqual(smart_req.SmartServerResponse(('ok', rev1_id_utf8)),
1409
request.execute('', 1, (2, rev2_id_utf8)))
1411
def test_known_revid_missing(self):
1412
backing = self.get_transport()
1413
request = smart_repo.SmartServerRepositoryGetRevIdForRevno(backing)
1414
repo = self.make_repository('.')
1416
smart_req.FailedSmartServerResponse(('nosuchrevision', 'ghost')),
1417
request.execute('', 1, (2, 'ghost')))
1419
def test_history_incomplete(self):
1420
backing = self.get_transport()
1421
request = smart_repo.SmartServerRepositoryGetRevIdForRevno(backing)
1422
parent = self.make_branch_and_memory_tree('parent', format='1.9')
1424
parent.add([''], ['TREE_ROOT'])
1425
r1 = parent.commit(message='first commit')
1426
r2 = parent.commit(message='second commit')
1428
local = self.make_branch_and_memory_tree('local', format='1.9')
1429
local.branch.pull(parent.branch)
1430
local.set_parent_ids([r2])
1431
r3 = local.commit(message='local commit')
1432
local.branch.create_clone_on_transport(
1433
self.get_transport('stacked'), stacked_on=self.get_url('parent'))
1435
smart_req.SmartServerResponse(('history-incomplete', 2, r2)),
1436
request.execute('stacked', 1, (3, r3)))
986
SmartServerResponse(('nosuchrevision', 'missingrevision', ), ''),
987
request.execute('', 'missingrevision'))
1439
990
class TestSmartServerRepositoryGetStream(tests.TestCaseWithMemoryTransport):
1583
1134
def test_lock_write_on_unlocked_repo(self):
1584
1135
backing = self.get_transport()
1585
request = smart_repo.SmartServerRepositoryLockWrite(backing)
1136
request = smart.repository.SmartServerRepositoryLockWrite(backing)
1586
1137
repository = self.make_repository('.', format='knit')
1587
1138
response = request.execute('')
1588
1139
nonce = repository.control_files._lock.peek().get('nonce')
1589
self.assertEqual(smart_req.SmartServerResponse(('ok', nonce)), response)
1140
self.assertEqual(SmartServerResponse(('ok', nonce)), response)
1590
1141
# The repository is now locked. Verify that with a new repository
1592
1143
new_repo = repository.bzrdir.open_repository()
1593
1144
self.assertRaises(errors.LockContention, new_repo.lock_write)
1595
request = smart_repo.SmartServerRepositoryUnlock(backing)
1596
response = request.execute('', nonce)
1598
1146
def test_lock_write_on_locked_repo(self):
1599
1147
backing = self.get_transport()
1600
request = smart_repo.SmartServerRepositoryLockWrite(backing)
1148
request = smart.repository.SmartServerRepositoryLockWrite(backing)
1601
1149
repository = self.make_repository('.', format='knit')
1602
repo_token = repository.lock_write().repository_token
1150
repository.lock_write()
1603
1151
repository.leave_lock_in_place()
1604
1152
repository.unlock()
1605
1153
response = request.execute('')
1606
1154
self.assertEqual(
1607
smart_req.SmartServerResponse(('LockContention',)), response)
1609
repository.lock_write(repo_token)
1610
repository.dont_leave_lock_in_place()
1155
SmartServerResponse(('LockContention',)), response)
1613
1157
def test_lock_write_on_readonly_transport(self):
1614
1158
backing = self.get_readonly_transport()
1615
request = smart_repo.SmartServerRepositoryLockWrite(backing)
1159
request = smart.repository.SmartServerRepositoryLockWrite(backing)
1616
1160
repository = self.make_repository('.', format='knit')
1617
1161
response = request.execute('')
1618
1162
self.assertFalse(response.is_successful())
1631
1175
def test_insert_stream_empty(self):
1632
1176
backing = self.get_transport()
1633
request = smart_repo.SmartServerRepositoryInsertStream(backing)
1177
request = smart.repository.SmartServerRepositoryInsertStream(backing)
1634
1178
repository = self.make_repository('.')
1635
1179
response = request.execute('', '')
1636
1180
self.assertEqual(None, response)
1637
1181
response = request.do_chunk(self.make_empty_byte_stream(repository))
1638
1182
self.assertEqual(None, response)
1639
1183
response = request.do_end()
1640
self.assertEqual(smart_req.SmartServerResponse(('ok', )), response)
1184
self.assertEqual(SmartServerResponse(('ok', )), response)
1643
1187
class TestSmartServerRepositoryInsertStreamLocked(TestInsertStreamBase):
1645
1189
def test_insert_stream_empty(self):
1646
1190
backing = self.get_transport()
1647
request = smart_repo.SmartServerRepositoryInsertStreamLocked(
1191
request = smart.repository.SmartServerRepositoryInsertStreamLocked(
1649
1193
repository = self.make_repository('.', format='knit')
1650
lock_token = repository.lock_write().repository_token
1194
lock_token = repository.lock_write()
1651
1195
response = request.execute('', '', lock_token)
1652
1196
self.assertEqual(None, response)
1653
1197
response = request.do_chunk(self.make_empty_byte_stream(repository))
1654
1198
self.assertEqual(None, response)
1655
1199
response = request.do_end()
1656
self.assertEqual(smart_req.SmartServerResponse(('ok', )), response)
1200
self.assertEqual(SmartServerResponse(('ok', )), response)
1657
1201
repository.unlock()
1659
1203
def test_insert_stream_with_wrong_lock_token(self):
1660
1204
backing = self.get_transport()
1661
request = smart_repo.SmartServerRepositoryInsertStreamLocked(
1205
request = smart.repository.SmartServerRepositoryInsertStreamLocked(
1663
1207
repository = self.make_repository('.', format='knit')
1664
lock_token = repository.lock_write().repository_token
1208
lock_token = repository.lock_write()
1665
1209
self.assertRaises(
1666
1210
errors.TokenMismatch, request.execute, '', '', 'wrong-token')
1667
1211
repository.unlock()
1691
1235
def test_unlock_on_unlocked_repo(self):
1692
1236
backing = self.get_transport()
1693
request = smart_repo.SmartServerRepositoryUnlock(backing)
1237
request = smart.repository.SmartServerRepositoryUnlock(backing)
1694
1238
repository = self.make_repository('.', format='knit')
1695
1239
response = request.execute('', 'some token')
1696
1240
self.assertEqual(
1697
smart_req.SmartServerResponse(('TokenMismatch',)), response)
1241
SmartServerResponse(('TokenMismatch',)), response)
1700
1244
class TestSmartServerIsReadonly(tests.TestCaseWithMemoryTransport):
1702
1246
def test_is_readonly_no(self):
1703
1247
backing = self.get_transport()
1704
request = smart_req.SmartServerIsReadonly(backing)
1248
request = smart.request.SmartServerIsReadonly(backing)
1705
1249
response = request.execute()
1706
1250
self.assertEqual(
1707
smart_req.SmartServerResponse(('no',)), response)
1251
SmartServerResponse(('no',)), response)
1709
1253
def test_is_readonly_yes(self):
1710
1254
backing = self.get_readonly_transport()
1711
request = smart_req.SmartServerIsReadonly(backing)
1255
request = smart.request.SmartServerIsReadonly(backing)
1712
1256
response = request.execute()
1713
1257
self.assertEqual(
1714
smart_req.SmartServerResponse(('yes',)), response)
1717
class TestSmartServerRepositorySetMakeWorkingTrees(
1718
tests.TestCaseWithMemoryTransport):
1258
SmartServerResponse(('yes',)), response)
1261
class TestSmartServerRepositorySetMakeWorkingTrees(tests.TestCaseWithMemoryTransport):
1720
1263
def test_set_false(self):
1721
1264
backing = self.get_transport()
1722
1265
repo = self.make_repository('.', shared=True)
1723
1266
repo.set_make_working_trees(True)
1724
request_class = smart_repo.SmartServerRepositorySetMakeWorkingTrees
1267
request_class = smart.repository.SmartServerRepositorySetMakeWorkingTrees
1725
1268
request = request_class(backing)
1726
self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
1269
self.assertEqual(SuccessfulSmartServerResponse(('ok',)),
1727
1270
request.execute('', 'False'))
1728
1271
repo = repo.bzrdir.open_repository()
1729
1272
self.assertFalse(repo.make_working_trees())
1811
1341
"""All registered request_handlers can be found."""
1812
1342
# If there's a typo in a register_lazy call, this loop will fail with
1813
1343
# an AttributeError.
1814
for key, item in smart_req.request_handlers.iteritems():
1344
for key, item in smart.request.request_handlers.iteritems():
1817
def assertHandlerEqual(self, verb, handler):
1818
self.assertEqual(smart_req.request_handlers.get(verb), handler)
1820
1347
def test_registered_methods(self):
1821
1348
"""Test that known methods are registered to the correct object."""
1822
self.assertHandlerEqual('Branch.get_config_file',
1823
smart_branch.SmartServerBranchGetConfigFile)
1824
self.assertHandlerEqual('Branch.get_parent',
1825
smart_branch.SmartServerBranchGetParent)
1826
self.assertHandlerEqual('Branch.get_tags_bytes',
1827
smart_branch.SmartServerBranchGetTagsBytes)
1828
self.assertHandlerEqual('Branch.lock_write',
1829
smart_branch.SmartServerBranchRequestLockWrite)
1830
self.assertHandlerEqual('Branch.last_revision_info',
1831
smart_branch.SmartServerBranchRequestLastRevisionInfo)
1832
self.assertHandlerEqual('Branch.revision_history',
1833
smart_branch.SmartServerRequestRevisionHistory)
1834
self.assertHandlerEqual('Branch.set_config_option',
1835
smart_branch.SmartServerBranchRequestSetConfigOption)
1836
self.assertHandlerEqual('Branch.set_last_revision',
1837
smart_branch.SmartServerBranchRequestSetLastRevision)
1838
self.assertHandlerEqual('Branch.set_last_revision_info',
1839
smart_branch.SmartServerBranchRequestSetLastRevisionInfo)
1840
self.assertHandlerEqual('Branch.set_last_revision_ex',
1841
smart_branch.SmartServerBranchRequestSetLastRevisionEx)
1842
self.assertHandlerEqual('Branch.set_parent_location',
1843
smart_branch.SmartServerBranchRequestSetParentLocation)
1844
self.assertHandlerEqual('Branch.unlock',
1845
smart_branch.SmartServerBranchRequestUnlock)
1846
self.assertHandlerEqual('BzrDir.find_repository',
1847
smart_dir.SmartServerRequestFindRepositoryV1)
1848
self.assertHandlerEqual('BzrDir.find_repositoryV2',
1849
smart_dir.SmartServerRequestFindRepositoryV2)
1850
self.assertHandlerEqual('BzrDirFormat.initialize',
1851
smart_dir.SmartServerRequestInitializeBzrDir)
1852
self.assertHandlerEqual('BzrDirFormat.initialize_ex_1.16',
1853
smart_dir.SmartServerRequestBzrDirInitializeEx)
1854
self.assertHandlerEqual('BzrDir.cloning_metadir',
1855
smart_dir.SmartServerBzrDirRequestCloningMetaDir)
1856
self.assertHandlerEqual('BzrDir.get_config_file',
1857
smart_dir.SmartServerBzrDirRequestConfigFile)
1858
self.assertHandlerEqual('BzrDir.open_branch',
1859
smart_dir.SmartServerRequestOpenBranch)
1860
self.assertHandlerEqual('BzrDir.open_branchV2',
1861
smart_dir.SmartServerRequestOpenBranchV2)
1862
self.assertHandlerEqual('BzrDir.open_branchV3',
1863
smart_dir.SmartServerRequestOpenBranchV3)
1864
self.assertHandlerEqual('PackRepository.autopack',
1865
smart_packrepo.SmartServerPackRepositoryAutopack)
1866
self.assertHandlerEqual('Repository.gather_stats',
1867
smart_repo.SmartServerRepositoryGatherStats)
1868
self.assertHandlerEqual('Repository.get_parent_map',
1869
smart_repo.SmartServerRepositoryGetParentMap)
1870
self.assertHandlerEqual('Repository.get_rev_id_for_revno',
1871
smart_repo.SmartServerRepositoryGetRevIdForRevno)
1872
self.assertHandlerEqual('Repository.get_revision_graph',
1873
smart_repo.SmartServerRepositoryGetRevisionGraph)
1874
self.assertHandlerEqual('Repository.get_stream',
1875
smart_repo.SmartServerRepositoryGetStream)
1876
self.assertHandlerEqual('Repository.has_revision',
1877
smart_repo.SmartServerRequestHasRevision)
1878
self.assertHandlerEqual('Repository.insert_stream',
1879
smart_repo.SmartServerRepositoryInsertStream)
1880
self.assertHandlerEqual('Repository.insert_stream_locked',
1881
smart_repo.SmartServerRepositoryInsertStreamLocked)
1882
self.assertHandlerEqual('Repository.is_shared',
1883
smart_repo.SmartServerRepositoryIsShared)
1884
self.assertHandlerEqual('Repository.lock_write',
1885
smart_repo.SmartServerRepositoryLockWrite)
1886
self.assertHandlerEqual('Repository.tarball',
1887
smart_repo.SmartServerRepositoryTarball)
1888
self.assertHandlerEqual('Repository.unlock',
1889
smart_repo.SmartServerRepositoryUnlock)
1890
self.assertHandlerEqual('Transport.is_readonly',
1891
smart_req.SmartServerIsReadonly)
1350
smart.request.request_handlers.get('Branch.get_config_file'),
1351
smart.branch.SmartServerBranchGetConfigFile)
1353
smart.request.request_handlers.get('Branch.get_parent'),
1354
smart.branch.SmartServerBranchGetParent)
1356
smart.request.request_handlers.get('Branch.get_tags_bytes'),
1357
smart.branch.SmartServerBranchGetTagsBytes)
1359
smart.request.request_handlers.get('Branch.lock_write'),
1360
smart.branch.SmartServerBranchRequestLockWrite)
1362
smart.request.request_handlers.get('Branch.last_revision_info'),
1363
smart.branch.SmartServerBranchRequestLastRevisionInfo)
1365
smart.request.request_handlers.get('Branch.revision_history'),
1366
smart.branch.SmartServerRequestRevisionHistory)
1368
smart.request.request_handlers.get('Branch.set_last_revision'),
1369
smart.branch.SmartServerBranchRequestSetLastRevision)
1371
smart.request.request_handlers.get('Branch.set_last_revision_info'),
1372
smart.branch.SmartServerBranchRequestSetLastRevisionInfo)
1374
smart.request.request_handlers.get('Branch.unlock'),
1375
smart.branch.SmartServerBranchRequestUnlock)
1377
smart.request.request_handlers.get('BzrDir.find_repository'),
1378
smart.bzrdir.SmartServerRequestFindRepositoryV1)
1380
smart.request.request_handlers.get('BzrDir.find_repositoryV2'),
1381
smart.bzrdir.SmartServerRequestFindRepositoryV2)
1383
smart.request.request_handlers.get('BzrDirFormat.initialize'),
1384
smart.bzrdir.SmartServerRequestInitializeBzrDir)
1386
smart.request.request_handlers.get('BzrDir.cloning_metadir'),
1387
smart.bzrdir.SmartServerBzrDirRequestCloningMetaDir)
1389
smart.request.request_handlers.get('BzrDir.open_branch'),
1390
smart.bzrdir.SmartServerRequestOpenBranch)
1392
smart.request.request_handlers.get('BzrDir.open_branchV2'),
1393
smart.bzrdir.SmartServerRequestOpenBranchV2)
1395
smart.request.request_handlers.get('PackRepository.autopack'),
1396
smart.packrepository.SmartServerPackRepositoryAutopack)
1398
smart.request.request_handlers.get('Repository.gather_stats'),
1399
smart.repository.SmartServerRepositoryGatherStats)
1401
smart.request.request_handlers.get('Repository.get_parent_map'),
1402
smart.repository.SmartServerRepositoryGetParentMap)
1404
smart.request.request_handlers.get(
1405
'Repository.get_revision_graph'),
1406
smart.repository.SmartServerRepositoryGetRevisionGraph)
1408
smart.request.request_handlers.get('Repository.get_stream'),
1409
smart.repository.SmartServerRepositoryGetStream)
1411
smart.request.request_handlers.get('Repository.has_revision'),
1412
smart.repository.SmartServerRequestHasRevision)
1414
smart.request.request_handlers.get('Repository.insert_stream'),
1415
smart.repository.SmartServerRepositoryInsertStream)
1417
smart.request.request_handlers.get('Repository.insert_stream_locked'),
1418
smart.repository.SmartServerRepositoryInsertStreamLocked)
1420
smart.request.request_handlers.get('Repository.is_shared'),
1421
smart.repository.SmartServerRepositoryIsShared)
1423
smart.request.request_handlers.get('Repository.lock_write'),
1424
smart.repository.SmartServerRepositoryLockWrite)
1426
smart.request.request_handlers.get('Repository.tarball'),
1427
smart.repository.SmartServerRepositoryTarball)
1429
smart.request.request_handlers.get('Repository.unlock'),
1430
smart.repository.SmartServerRepositoryUnlock)
1432
smart.request.request_handlers.get('Transport.is_readonly'),
1433
smart.request.SmartServerIsReadonly)
added
removed
bzrlib/tests/test_smart.py
