53
60
RemoteRepositoryFormat,
55
from bzrlib.repofmt import groupcompress_repo, pack_repo
56
from bzrlib.revision import NULL_REVISION
57
from bzrlib.smart import medium
62
from bzrlib.repofmt import groupcompress_repo, knitpack_repo
63
from bzrlib.revision import (
67
from bzrlib.smart import medium, request
58
68
from bzrlib.smart.client import _SmartClient
59
from bzrlib.smart.repository import SmartServerRepositoryGetParentMap
69
from bzrlib.smart.repository import (
70
SmartServerRepositoryGetParentMap,
71
SmartServerRepositoryGetStream_1_19,
72
_stream_to_byte_stream,
74
from bzrlib.symbol_versioning import deprecated_in
60
75
from bzrlib.tests import (
62
split_suite_by_condition,
66
from bzrlib.transport import get_transport
78
from bzrlib.tests.scenarios import load_tests_apply_scenarios
67
79
from bzrlib.transport.memory import MemoryTransport
68
80
from bzrlib.transport.remote import (
70
82
RemoteSSHTransport,
71
83
RemoteTCPTransport,
74
def load_tests(standard_tests, module, loader):
75
to_adapt, result = split_suite_by_condition(
76
standard_tests, condition_isinstance(BasicRemoteObjectTests))
77
smart_server_version_scenarios = [
87
load_tests = load_tests_apply_scenarios
90
class BasicRemoteObjectTests(tests.TestCaseWithTransport):
79
{'transport_server': test_server.SmartTCPServer_for_testing_v2_only}),
94
{'transport_server': test_server.SmartTCPServer_for_testing_v2_only}),
81
{'transport_server': test_server.SmartTCPServer_for_testing})]
82
return multiply_tests(to_adapt, smart_server_version_scenarios, result)
85
class BasicRemoteObjectTests(tests.TestCaseWithTransport):
96
{'transport_server': test_server.SmartTCPServer_for_testing})]
88
100
super(BasicRemoteObjectTests, self).setUp()
89
101
self.transport = self.get_transport()
90
102
# make a branch that can be opened over the smart transport
91
103
self.local_wt = BzrDir.create_standalone_workingtree('.')
94
self.transport.disconnect()
95
tests.TestCaseWithTransport.tearDown(self)
104
self.addCleanup(self.transport.disconnect)
97
106
def test_create_remote_bzrdir(self):
98
b = remote.RemoteBzrDir(self.transport, remote.RemoteBzrDirFormat())
107
b = remote.RemoteBzrDir(self.transport, RemoteBzrDirFormat())
99
108
self.assertIsInstance(b, BzrDir)
101
110
def test_open_remote_branch(self):
102
111
# open a standalone branch in the working directory
103
b = remote.RemoteBzrDir(self.transport, remote.RemoteBzrDirFormat())
112
b = remote.RemoteBzrDir(self.transport, RemoteBzrDirFormat())
104
113
branch = b.open_branch()
105
114
self.assertIsInstance(branch, Branch)
480
491
self.assertEqual(None, result._branch_format)
481
492
self.assertFinished(client)
494
def test_unknown(self):
495
transport = self.get_transport('quack')
496
referenced = self.make_branch('referenced')
497
expected = referenced.bzrdir.cloning_metadir()
498
client = FakeClient(transport.base)
499
client.add_expected_call(
500
'BzrDir.cloning_metadir', ('quack/', 'False'),
501
'success', ('unknown', 'unknown', ('branch', ''))),
502
a_bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
504
self.assertRaises(errors.UnknownFormatError, a_bzrdir.cloning_metadir)
507
class TestBzrDirCheckoutMetaDir(TestRemote):
509
def test__get_checkout_format(self):
510
transport = MemoryTransport()
511
client = FakeClient(transport.base)
512
reference_bzrdir_format = controldir.format_registry.get('default')()
513
control_name = reference_bzrdir_format.network_name()
514
client.add_expected_call(
515
'BzrDir.checkout_metadir', ('quack/', ),
516
'success', (control_name, '', ''))
517
transport.mkdir('quack')
518
transport = transport.clone('quack')
519
a_bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
521
result = a_bzrdir.checkout_metadir()
522
# We should have got a reference control dir with default branch and
523
# repository formats.
524
self.assertEqual(bzrdir.BzrDirMetaFormat1, type(result))
525
self.assertEqual(None, result._repository_format)
526
self.assertEqual(None, result._branch_format)
527
self.assertFinished(client)
529
def test_unknown_format(self):
530
transport = MemoryTransport()
531
client = FakeClient(transport.base)
532
client.add_expected_call(
533
'BzrDir.checkout_metadir', ('quack/',),
534
'success', ('dontknow', '', ''))
535
transport.mkdir('quack')
536
transport = transport.clone('quack')
537
a_bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
539
self.assertRaises(errors.UnknownFormatError,
540
a_bzrdir.checkout_metadir)
541
self.assertFinished(client)
544
class TestBzrDirGetBranches(TestRemote):
546
def test_get_branches(self):
547
transport = MemoryTransport()
548
client = FakeClient(transport.base)
549
reference_bzrdir_format = controldir.format_registry.get('default')()
550
branch_name = reference_bzrdir_format.get_branch_format().network_name()
551
client.add_success_response_with_body(
553
"foo": ("branch", branch_name),
554
"": ("branch", branch_name)}), "success")
555
client.add_success_response(
556
'ok', '', 'no', 'no', 'no',
557
reference_bzrdir_format.repository_format.network_name())
558
client.add_error_response('NotStacked')
559
client.add_success_response(
560
'ok', '', 'no', 'no', 'no',
561
reference_bzrdir_format.repository_format.network_name())
562
client.add_error_response('NotStacked')
563
transport.mkdir('quack')
564
transport = transport.clone('quack')
565
a_bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
567
result = a_bzrdir.get_branches()
568
self.assertEquals(set(["", "foo"]), set(result.keys()))
570
[('call_expecting_body', 'BzrDir.get_branches', ('quack/',)),
571
('call', 'BzrDir.find_repositoryV3', ('quack/', )),
572
('call', 'Branch.get_stacked_on_url', ('quack/', )),
573
('call', 'BzrDir.find_repositoryV3', ('quack/', )),
574
('call', 'Branch.get_stacked_on_url', ('quack/', ))],
578
class TestBzrDirDestroyBranch(TestRemote):
580
def test_destroy_default(self):
581
transport = self.get_transport('quack')
582
referenced = self.make_branch('referenced')
583
client = FakeClient(transport.base)
584
client.add_expected_call(
585
'BzrDir.destroy_branch', ('quack/', ),
587
a_bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
589
a_bzrdir.destroy_branch()
590
self.assertFinished(client)
593
class TestBzrDirHasWorkingTree(TestRemote):
595
def test_has_workingtree(self):
596
transport = self.get_transport('quack')
597
client = FakeClient(transport.base)
598
client.add_expected_call(
599
'BzrDir.has_workingtree', ('quack/',),
600
'success', ('yes',)),
601
a_bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
603
self.assertTrue(a_bzrdir.has_workingtree())
604
self.assertFinished(client)
606
def test_no_workingtree(self):
607
transport = self.get_transport('quack')
608
client = FakeClient(transport.base)
609
client.add_expected_call(
610
'BzrDir.has_workingtree', ('quack/',),
612
a_bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
614
self.assertFalse(a_bzrdir.has_workingtree())
615
self.assertFinished(client)
618
class TestBzrDirDestroyRepository(TestRemote):
620
def test_destroy_repository(self):
621
transport = self.get_transport('quack')
622
client = FakeClient(transport.base)
623
client.add_expected_call(
624
'BzrDir.destroy_repository', ('quack/',),
626
a_bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
628
a_bzrdir.destroy_repository()
629
self.assertFinished(client)
484
632
class TestBzrDirOpen(TestRemote):
967
1147
return RemoteBranch(bzrdir, repo, _client=client, format=format)
1150
class TestBranchBreakLock(RemoteBranchTestCase):
1152
def test_break_lock(self):
1153
transport_path = 'quack'
1154
transport = MemoryTransport()
1155
client = FakeClient(transport.base)
1156
client.add_expected_call(
1157
'Branch.get_stacked_on_url', ('quack/',),
1158
'error', ('NotStacked',))
1159
client.add_expected_call(
1160
'Branch.break_lock', ('quack/',),
1162
transport.mkdir('quack')
1163
transport = transport.clone('quack')
1164
branch = self.make_remote_branch(transport, client)
1166
self.assertFinished(client)
1169
class TestBranchGetPhysicalLockStatus(RemoteBranchTestCase):
1171
def test_get_physical_lock_status_yes(self):
1172
transport = MemoryTransport()
1173
client = FakeClient(transport.base)
1174
client.add_expected_call(
1175
'Branch.get_stacked_on_url', ('quack/',),
1176
'error', ('NotStacked',))
1177
client.add_expected_call(
1178
'Branch.get_physical_lock_status', ('quack/',),
1179
'success', ('yes',))
1180
transport.mkdir('quack')
1181
transport = transport.clone('quack')
1182
branch = self.make_remote_branch(transport, client)
1183
result = branch.get_physical_lock_status()
1184
self.assertFinished(client)
1185
self.assertEqual(True, result)
1187
def test_get_physical_lock_status_no(self):
1188
transport = MemoryTransport()
1189
client = FakeClient(transport.base)
1190
client.add_expected_call(
1191
'Branch.get_stacked_on_url', ('quack/',),
1192
'error', ('NotStacked',))
1193
client.add_expected_call(
1194
'Branch.get_physical_lock_status', ('quack/',),
1196
transport.mkdir('quack')
1197
transport = transport.clone('quack')
1198
branch = self.make_remote_branch(transport, client)
1199
result = branch.get_physical_lock_status()
1200
self.assertFinished(client)
1201
self.assertEqual(False, result)
970
1204
class TestBranchGetParent(RemoteBranchTestCase):
972
1206
def test_no_parent(self):
1143
1377
[('set_tags_bytes', 'tags bytes')] * 2, real_branch.calls)
1380
class TestBranchHeadsToFetch(RemoteBranchTestCase):
1382
def test_uses_last_revision_info_and_tags_by_default(self):
1383
transport = MemoryTransport()
1384
client = FakeClient(transport.base)
1385
client.add_expected_call(
1386
'Branch.get_stacked_on_url', ('quack/',),
1387
'error', ('NotStacked',))
1388
client.add_expected_call(
1389
'Branch.last_revision_info', ('quack/',),
1390
'success', ('ok', '1', 'rev-tip'))
1391
client.add_expected_call(
1392
'Branch.get_config_file', ('quack/',),
1393
'success', ('ok',), '')
1394
transport.mkdir('quack')
1395
transport = transport.clone('quack')
1396
branch = self.make_remote_branch(transport, client)
1397
result = branch.heads_to_fetch()
1398
self.assertFinished(client)
1399
self.assertEqual((set(['rev-tip']), set()), result)
1401
def test_uses_last_revision_info_and_tags_when_set(self):
1402
transport = MemoryTransport()
1403
client = FakeClient(transport.base)
1404
client.add_expected_call(
1405
'Branch.get_stacked_on_url', ('quack/',),
1406
'error', ('NotStacked',))
1407
client.add_expected_call(
1408
'Branch.last_revision_info', ('quack/',),
1409
'success', ('ok', '1', 'rev-tip'))
1410
client.add_expected_call(
1411
'Branch.get_config_file', ('quack/',),
1412
'success', ('ok',), 'branch.fetch_tags = True')
1413
# XXX: this will break if the default format's serialization of tags
1414
# changes, or if the RPC for fetching tags changes from get_tags_bytes.
1415
client.add_expected_call(
1416
'Branch.get_tags_bytes', ('quack/',),
1417
'success', ('d5:tag-17:rev-foo5:tag-27:rev-bare',))
1418
transport.mkdir('quack')
1419
transport = transport.clone('quack')
1420
branch = self.make_remote_branch(transport, client)
1421
result = branch.heads_to_fetch()
1422
self.assertFinished(client)
1424
(set(['rev-tip']), set(['rev-foo', 'rev-bar'])), result)
1426
def test_uses_rpc_for_formats_with_non_default_heads_to_fetch(self):
1427
transport = MemoryTransport()
1428
client = FakeClient(transport.base)
1429
client.add_expected_call(
1430
'Branch.get_stacked_on_url', ('quack/',),
1431
'error', ('NotStacked',))
1432
client.add_expected_call(
1433
'Branch.heads_to_fetch', ('quack/',),
1434
'success', (['tip'], ['tagged-1', 'tagged-2']))
1435
transport.mkdir('quack')
1436
transport = transport.clone('quack')
1437
branch = self.make_remote_branch(transport, client)
1438
branch._format._use_default_local_heads_to_fetch = lambda: False
1439
result = branch.heads_to_fetch()
1440
self.assertFinished(client)
1441
self.assertEqual((set(['tip']), set(['tagged-1', 'tagged-2'])), result)
1443
def make_branch_with_tags(self):
1444
self.setup_smart_server_with_call_log()
1445
# Make a branch with a single revision.
1446
builder = self.make_branch_builder('foo')
1447
builder.start_series()
1448
builder.build_snapshot('tip', None, [
1449
('add', ('', 'root-id', 'directory', ''))])
1450
builder.finish_series()
1451
branch = builder.get_branch()
1452
# Add two tags to that branch
1453
branch.tags.set_tag('tag-1', 'rev-1')
1454
branch.tags.set_tag('tag-2', 'rev-2')
1457
def test_backwards_compatible(self):
1458
br = self.make_branch_with_tags()
1459
br.get_config_stack().set('branch.fetch_tags', True)
1460
self.addCleanup(br.lock_read().unlock)
1461
# Disable the heads_to_fetch verb
1462
verb = 'Branch.heads_to_fetch'
1463
self.disable_verb(verb)
1464
self.reset_smart_call_log()
1465
result = br.heads_to_fetch()
1466
self.assertEqual((set(['tip']), set(['rev-1', 'rev-2'])), result)
1468
['Branch.last_revision_info', 'Branch.get_tags_bytes'],
1469
[call.call.method for call in self.hpss_calls])
1471
def test_backwards_compatible_no_tags(self):
1472
br = self.make_branch_with_tags()
1473
br.get_config_stack().set('branch.fetch_tags', False)
1474
self.addCleanup(br.lock_read().unlock)
1475
# Disable the heads_to_fetch verb
1476
verb = 'Branch.heads_to_fetch'
1477
self.disable_verb(verb)
1478
self.reset_smart_call_log()
1479
result = br.heads_to_fetch()
1480
self.assertEqual((set(['tip']), set()), result)
1482
['Branch.last_revision_info'],
1483
[call.call.method for call in self.hpss_calls])
1146
1486
class TestBranchLastRevisionInfo(RemoteBranchTestCase):
1148
1488
def test_empty_branch(self):
1661
2021
self.addCleanup(branch.unlock)
1662
2022
self.reset_smart_call_log()
1663
2023
branch._get_config().set_option('value', 'name')
1664
self.assertLength(10, self.hpss_calls)
2024
self.assertLength(11, self.hpss_calls)
1665
2025
self.assertEqual('value', branch._get_config().get_option('name'))
2027
def test_backwards_compat_set_option_with_dict(self):
2028
self.setup_smart_server_with_call_log()
2029
branch = self.make_branch('.')
2030
verb = 'Branch.set_config_option_dict'
2031
self.disable_verb(verb)
2033
self.addCleanup(branch.unlock)
2034
self.reset_smart_call_log()
2035
config = branch._get_config()
2036
value_dict = {'ascii': 'a', u'unicode \N{WATCH}': u'\N{INTERROBANG}'}
2037
config.set_option(value_dict, 'name')
2038
self.assertLength(11, self.hpss_calls)
2039
self.assertEqual(value_dict, branch._get_config().get_option('name'))
2042
class TestBranchGetPutConfigStore(RemoteBranchTestCase):
2044
def test_get_branch_conf(self):
2045
# in an empty branch we decode the response properly
2046
client = FakeClient()
2047
client.add_expected_call(
2048
'Branch.get_stacked_on_url', ('memory:///',),
2049
'error', ('NotStacked',),)
2050
client.add_success_response_with_body('# config file body', 'ok')
2051
transport = MemoryTransport()
2052
branch = self.make_remote_branch(transport, client)
2053
config = branch.get_config_stack()
2055
config.get("log_format")
2057
[('call', 'Branch.get_stacked_on_url', ('memory:///',)),
2058
('call_expecting_body', 'Branch.get_config_file', ('memory:///',))],
2061
def test_set_branch_conf(self):
2062
client = FakeClient()
2063
client.add_expected_call(
2064
'Branch.get_stacked_on_url', ('memory:///',),
2065
'error', ('NotStacked',),)
2066
client.add_expected_call(
2067
'Branch.lock_write', ('memory:///', '', ''),
2068
'success', ('ok', 'branch token', 'repo token'))
2069
client.add_expected_call(
2070
'Branch.get_config_file', ('memory:///', ),
2071
'success', ('ok', ), "# line 1\n")
2072
client.add_expected_call(
2073
'Branch.get_config_file', ('memory:///', ),
2074
'success', ('ok', ), "# line 1\n")
2075
client.add_expected_call(
2076
'Branch.put_config_file', ('memory:///', 'branch token',
2079
client.add_expected_call(
2080
'Branch.unlock', ('memory:///', 'branch token', 'repo token'),
2082
transport = MemoryTransport()
2083
branch = self.make_remote_branch(transport, client)
2085
config = branch.get_config_stack()
2086
config.set('email', 'The Dude <lebowski@example.com>')
2088
self.assertFinished(client)
2090
[('call', 'Branch.get_stacked_on_url', ('memory:///',)),
2091
('call', 'Branch.lock_write', ('memory:///', '', '')),
2092
('call_expecting_body', 'Branch.get_config_file', ('memory:///',)),
2093
('call_expecting_body', 'Branch.get_config_file', ('memory:///',)),
2094
('call_with_body_bytes_expecting_body', 'Branch.put_config_file',
2095
('memory:///', 'branch token', 'repo token'),
2096
'# line 1\nemail = The Dude <lebowski@example.com>\n'),
2097
('call', 'Branch.unlock', ('memory:///', 'branch token', 'repo token'))],
1668
2101
class TestBranchLockWrite(RemoteBranchTestCase):
1683
2116
self.assertFinished(client)
2119
class TestBranchRevisionIdToRevno(RemoteBranchTestCase):
2121
def test_simple(self):
2122
transport = MemoryTransport()
2123
client = FakeClient(transport.base)
2124
client.add_expected_call(
2125
'Branch.get_stacked_on_url', ('quack/',),
2126
'error', ('NotStacked',),)
2127
client.add_expected_call(
2128
'Branch.revision_id_to_revno', ('quack/', 'null:'),
2129
'success', ('ok', '0',),)
2130
client.add_expected_call(
2131
'Branch.revision_id_to_revno', ('quack/', 'unknown'),
2132
'error', ('NoSuchRevision', 'unknown',),)
2133
transport.mkdir('quack')
2134
transport = transport.clone('quack')
2135
branch = self.make_remote_branch(transport, client)
2136
self.assertEquals(0, branch.revision_id_to_revno('null:'))
2137
self.assertRaises(errors.NoSuchRevision,
2138
branch.revision_id_to_revno, 'unknown')
2139
self.assertFinished(client)
2141
def test_dotted(self):
2142
transport = MemoryTransport()
2143
client = FakeClient(transport.base)
2144
client.add_expected_call(
2145
'Branch.get_stacked_on_url', ('quack/',),
2146
'error', ('NotStacked',),)
2147
client.add_expected_call(
2148
'Branch.revision_id_to_revno', ('quack/', 'null:'),
2149
'success', ('ok', '0',),)
2150
client.add_expected_call(
2151
'Branch.revision_id_to_revno', ('quack/', 'unknown'),
2152
'error', ('NoSuchRevision', 'unknown',),)
2153
transport.mkdir('quack')
2154
transport = transport.clone('quack')
2155
branch = self.make_remote_branch(transport, client)
2156
self.assertEquals((0, ), branch.revision_id_to_dotted_revno('null:'))
2157
self.assertRaises(errors.NoSuchRevision,
2158
branch.revision_id_to_dotted_revno, 'unknown')
2159
self.assertFinished(client)
2161
def test_dotted_no_smart_verb(self):
2162
self.setup_smart_server_with_call_log()
2163
branch = self.make_branch('.')
2164
self.disable_verb('Branch.revision_id_to_revno')
2165
self.reset_smart_call_log()
2166
self.assertEquals((0, ),
2167
branch.revision_id_to_dotted_revno('null:'))
2168
self.assertLength(8, self.hpss_calls)
1686
2171
class TestBzrDirGetSetConfig(RemoteBzrDirTestCase):
1688
2173
def test__get_config(self):
2416
class TestRepositoryBreakLock(TestRemoteRepository):
2418
def test_break_lock(self):
2419
transport_path = 'quack'
2420
repo, client = self.setup_fake_client_and_repository(transport_path)
2421
client.add_success_response('ok')
2424
[('call', 'Repository.break_lock', ('quack/',))],
2428
class TestRepositoryGetSerializerFormat(TestRemoteRepository):
2430
def test_get_serializer_format(self):
2431
transport_path = 'hill'
2432
repo, client = self.setup_fake_client_and_repository(transport_path)
2433
client.add_success_response('ok', '7')
2434
self.assertEquals('7', repo.get_serializer_format())
2436
[('call', 'VersionedFileRepository.get_serializer_format',
2441
class TestRepositoryReconcile(TestRemoteRepository):
2443
def test_reconcile(self):
2444
transport_path = 'hill'
2445
repo, client = self.setup_fake_client_and_repository(transport_path)
2446
body = ("garbage_inventories: 2\n"
2447
"inconsistent_parents: 3\n")
2448
client.add_expected_call(
2449
'Repository.lock_write', ('hill/', ''),
2450
'success', ('ok', 'a token'))
2451
client.add_success_response_with_body(body, 'ok')
2452
reconciler = repo.reconcile()
2454
[('call', 'Repository.lock_write', ('hill/', '')),
2455
('call_expecting_body', 'Repository.reconcile',
2456
('hill/', 'a token'))],
2458
self.assertEquals(2, reconciler.garbage_inventories)
2459
self.assertEquals(3, reconciler.inconsistent_parents)
2462
class TestRepositoryGetRevisionSignatureText(TestRemoteRepository):
2464
def test_text(self):
2465
# ('ok',), body with signature text
2466
transport_path = 'quack'
2467
repo, client = self.setup_fake_client_and_repository(transport_path)
2468
client.add_success_response_with_body(
2470
self.assertEquals("THETEXT", repo.get_signature_text("revid"))
2472
[('call_expecting_body', 'Repository.get_revision_signature_text',
2473
('quack/', 'revid'))],
2476
def test_no_signature(self):
2477
transport_path = 'quick'
2478
repo, client = self.setup_fake_client_and_repository(transport_path)
2479
client.add_error_response('nosuchrevision', 'unknown')
2480
self.assertRaises(errors.NoSuchRevision, repo.get_signature_text,
2483
[('call_expecting_body', 'Repository.get_revision_signature_text',
2484
('quick/', 'unknown'))],
1906
2488
class TestRepositoryGetGraph(TestRemoteRepository):
1908
2490
def test_get_graph(self):
3079
class TestRepositoryWriteGroups(TestRemoteRepository):
3081
def test_start_write_group(self):
3082
transport_path = 'quack'
3083
repo, client = self.setup_fake_client_and_repository(transport_path)
3084
client.add_expected_call(
3085
'Repository.lock_write', ('quack/', ''),
3086
'success', ('ok', 'a token'))
3087
client.add_expected_call(
3088
'Repository.start_write_group', ('quack/', 'a token'),
3089
'success', ('ok', ('token1', )))
3091
repo.start_write_group()
3093
def test_start_write_group_unsuspendable(self):
3094
# Some repositories do not support suspending write
3095
# groups. For those, fall back to the "real" repository.
3096
transport_path = 'quack'
3097
repo, client = self.setup_fake_client_and_repository(transport_path)
3098
def stub_ensure_real():
3099
client._calls.append(('_ensure_real',))
3100
repo._real_repository = _StubRealPackRepository(client._calls)
3101
repo._ensure_real = stub_ensure_real
3102
client.add_expected_call(
3103
'Repository.lock_write', ('quack/', ''),
3104
'success', ('ok', 'a token'))
3105
client.add_expected_call(
3106
'Repository.start_write_group', ('quack/', 'a token'),
3107
'error', ('UnsuspendableWriteGroup',))
3109
repo.start_write_group()
3110
self.assertEquals(client._calls[-2:], [
3112
('start_write_group',)])
3114
def test_commit_write_group(self):
3115
transport_path = 'quack'
3116
repo, client = self.setup_fake_client_and_repository(transport_path)
3117
client.add_expected_call(
3118
'Repository.lock_write', ('quack/', ''),
3119
'success', ('ok', 'a token'))
3120
client.add_expected_call(
3121
'Repository.start_write_group', ('quack/', 'a token'),
3122
'success', ('ok', ['token1']))
3123
client.add_expected_call(
3124
'Repository.commit_write_group', ('quack/', 'a token', ['token1']),
3127
repo.start_write_group()
3128
repo.commit_write_group()
3130
def test_abort_write_group(self):
3131
transport_path = 'quack'
3132
repo, client = self.setup_fake_client_and_repository(transport_path)
3133
client.add_expected_call(
3134
'Repository.lock_write', ('quack/', ''),
3135
'success', ('ok', 'a token'))
3136
client.add_expected_call(
3137
'Repository.start_write_group', ('quack/', 'a token'),
3138
'success', ('ok', ['token1']))
3139
client.add_expected_call(
3140
'Repository.abort_write_group', ('quack/', 'a token', ['token1']),
3143
repo.start_write_group()
3144
repo.abort_write_group(False)
3146
def test_suspend_write_group(self):
3147
transport_path = 'quack'
3148
repo, client = self.setup_fake_client_and_repository(transport_path)
3149
self.assertEquals([], repo.suspend_write_group())
3151
def test_resume_write_group(self):
3152
transport_path = 'quack'
3153
repo, client = self.setup_fake_client_and_repository(transport_path)
3154
client.add_expected_call(
3155
'Repository.lock_write', ('quack/', ''),
3156
'success', ('ok', 'a token'))
3157
client.add_expected_call(
3158
'Repository.check_write_group', ('quack/', 'a token', ['token1']),
3161
repo.resume_write_group(['token1'])
2329
3164
class TestRepositorySetMakeWorkingTrees(TestRemoteRepository):
2331
3166
def test_backwards_compat(self):
2895
3784
expected_error = errors.PermissionDenied(path, extra)
2896
3785
self.assertEqual(expected_error, translated_error)
3787
# GZ 2011-03-02: TODO test for PermissionDenied with non-ascii 'extra'
3789
def test_NoSuchFile_context_path(self):
3790
local_path = "local path"
3791
translated_error = self.translateTuple(('ReadError', "remote path"),
3793
expected_error = errors.ReadError(local_path)
3794
self.assertEqual(expected_error, translated_error)
3796
def test_NoSuchFile_without_context(self):
3797
remote_path = "remote path"
3798
translated_error = self.translateTuple(('ReadError', remote_path))
3799
expected_error = errors.ReadError(remote_path)
3800
self.assertEqual(expected_error, translated_error)
3802
def test_ReadOnlyError(self):
3803
translated_error = self.translateTuple(('ReadOnlyError',))
3804
expected_error = errors.TransportNotPossible("readonly transport")
3805
self.assertEqual(expected_error, translated_error)
3807
def test_MemoryError(self):
3808
translated_error = self.translateTuple(('MemoryError',))
3809
self.assertStartsWith(str(translated_error),
3810
"remote server out of memory")
3812
def test_generic_IndexError_no_classname(self):
3813
err = errors.ErrorFromSmartServer(('error', "list index out of range"))
3814
translated_error = self.translateErrorFromSmartServer(err)
3815
expected_error = errors.UnknownErrorFromSmartServer(err)
3816
self.assertEqual(expected_error, translated_error)
3818
# GZ 2011-03-02: TODO test generic non-ascii error string
3820
def test_generic_KeyError(self):
3821
err = errors.ErrorFromSmartServer(('error', 'KeyError', "1"))
3822
translated_error = self.translateErrorFromSmartServer(err)
3823
expected_error = errors.UnknownErrorFromSmartServer(err)
3824
self.assertEqual(expected_error, translated_error)
2899
3827
class TestErrorTranslationRobustness(TestErrorTranslationBase):
2900
3828
"""Unit tests for bzrlib.remote._translate_error's robustness.
3143
4073
def test_copy_content_into_avoids_revision_history(self):
3144
4074
local = self.make_branch('local')
3145
remote_backing_tree = self.make_branch_and_tree('remote')
3146
remote_backing_tree.commit("Commit.")
4075
builder = self.make_branch_builder('remote')
4076
builder.build_commit(message="Commit.")
3147
4077
remote_branch_url = self.smart_server.get_url() + 'remote'
3148
4078
remote_branch = bzrdir.BzrDir.open(remote_branch_url).open_branch()
3149
4079
local.repository.fetch(remote_branch.repository)
3150
4080
self.hpss_calls = []
3151
4081
remote_branch.copy_content_into(local)
3152
4082
self.assertFalse('Branch.revision_history' in self.hpss_calls)
4084
def test_fetch_everything_needs_just_one_call(self):
4085
local = self.make_branch('local')
4086
builder = self.make_branch_builder('remote')
4087
builder.build_commit(message="Commit.")
4088
remote_branch_url = self.smart_server.get_url() + 'remote'
4089
remote_branch = bzrdir.BzrDir.open(remote_branch_url).open_branch()
4090
self.hpss_calls = []
4091
local.repository.fetch(
4092
remote_branch.repository,
4093
fetch_spec=vf_search.EverythingResult(remote_branch.repository))
4094
self.assertEqual(['Repository.get_stream_1.19'], self.hpss_calls)
4096
def override_verb(self, verb_name, verb):
4097
request_handlers = request.request_handlers
4098
orig_verb = request_handlers.get(verb_name)
4099
orig_info = request_handlers.get_info(verb_name)
4100
request_handlers.register(verb_name, verb, override_existing=True)
4101
self.addCleanup(request_handlers.register, verb_name, orig_verb,
4102
override_existing=True, info=orig_info)
4104
def test_fetch_everything_backwards_compat(self):
4105
"""Can fetch with EverythingResult even with pre 2.4 servers.
4107
Pre-2.4 do not support 'everything' searches with the
4108
Repository.get_stream_1.19 verb.
4111
class OldGetStreamVerb(SmartServerRepositoryGetStream_1_19):
4112
"""A version of the Repository.get_stream_1.19 verb patched to
4113
reject 'everything' searches the way 2.3 and earlier do.
4115
def recreate_search(self, repository, search_bytes,
4116
discard_excess=False):
4117
verb_log.append(search_bytes.split('\n', 1)[0])
4118
if search_bytes == 'everything':
4120
request.FailedSmartServerResponse(('BadSearch',)))
4121
return super(OldGetStreamVerb,
4122
self).recreate_search(repository, search_bytes,
4123
discard_excess=discard_excess)
4124
self.override_verb('Repository.get_stream_1.19', OldGetStreamVerb)
4125
local = self.make_branch('local')
4126
builder = self.make_branch_builder('remote')
4127
builder.build_commit(message="Commit.")
4128
remote_branch_url = self.smart_server.get_url() + 'remote'
4129
remote_branch = bzrdir.BzrDir.open(remote_branch_url).open_branch()
4130
self.hpss_calls = []
4131
local.repository.fetch(
4132
remote_branch.repository,
4133
fetch_spec=vf_search.EverythingResult(remote_branch.repository))
4134
# make sure the overridden verb was used
4135
self.assertLength(1, verb_log)
4136
# more than one HPSS call is needed, but because it's a VFS callback
4137
# its hard to predict exactly how many.
4138
self.assertTrue(len(self.hpss_calls) > 1)
4141
class TestUpdateBoundBranchWithModifiedBoundLocation(
4142
tests.TestCaseWithTransport):
4143
"""Ensure correct handling of bound_location modifications.
4145
This is tested against a smart server as http://pad.lv/786980 was about a
4146
ReadOnlyError (write attempt during a read-only transaction) which can only
4147
happen in this context.
4151
super(TestUpdateBoundBranchWithModifiedBoundLocation, self).setUp()
4152
self.transport_server = test_server.SmartTCPServer_for_testing
4154
def make_master_and_checkout(self, master_name, checkout_name):
4155
# Create the master branch and its associated checkout
4156
self.master = self.make_branch_and_tree(master_name)
4157
self.checkout = self.master.branch.create_checkout(checkout_name)
4158
# Modify the master branch so there is something to update
4159
self.master.commit('add stuff')
4160
self.last_revid = self.master.commit('even more stuff')
4161
self.bound_location = self.checkout.branch.get_bound_location()
4163
def assertUpdateSucceeds(self, new_location):
4164
self.checkout.branch.set_bound_location(new_location)
4165
self.checkout.update()
4166
self.assertEquals(self.last_revid, self.checkout.last_revision())
4168
def test_without_final_slash(self):
4169
self.make_master_and_checkout('master', 'checkout')
4170
# For unclear reasons some users have a bound_location without a final
4171
# '/', simulate that by forcing such a value
4172
self.assertEndsWith(self.bound_location, '/')
4173
self.assertUpdateSucceeds(self.bound_location.rstrip('/'))
4175
def test_plus_sign(self):
4176
self.make_master_and_checkout('+master', 'checkout')
4177
self.assertUpdateSucceeds(self.bound_location.replace('%2B', '+', 1))
4179
def test_tilda(self):
4180
# Embed ~ in the middle of the path just to avoid any $HOME
4182
self.make_master_and_checkout('mas~ter', 'checkout')
4183
self.assertUpdateSucceeds(self.bound_location.replace('%2E', '~', 1))
4186
class TestWithCustomErrorHandler(RemoteBranchTestCase):
4188
def test_no_context(self):
4189
class OutOfCoffee(errors.BzrError):
4190
"""A dummy exception for testing."""
4192
def __init__(self, urgency):
4193
self.urgency = urgency
4194
remote.no_context_error_translators.register("OutOfCoffee",
4195
lambda err: OutOfCoffee(err.error_args[0]))
4196
transport = MemoryTransport()
4197
client = FakeClient(transport.base)
4198
client.add_expected_call(
4199
'Branch.get_stacked_on_url', ('quack/',),
4200
'error', ('NotStacked',))
4201
client.add_expected_call(
4202
'Branch.last_revision_info',
4204
'error', ('OutOfCoffee', 'low'))
4205
transport.mkdir('quack')
4206
transport = transport.clone('quack')
4207
branch = self.make_remote_branch(transport, client)
4208
self.assertRaises(OutOfCoffee, branch.last_revision_info)
4209
self.assertFinished(client)
4211
def test_with_context(self):
4212
class OutOfTea(errors.BzrError):
4213
def __init__(self, branch, urgency):
4214
self.branch = branch
4215
self.urgency = urgency
4216
remote.error_translators.register("OutOfTea",
4217
lambda err, find, path: OutOfTea(err.error_args[0],
4219
transport = MemoryTransport()
4220
client = FakeClient(transport.base)
4221
client.add_expected_call(
4222
'Branch.get_stacked_on_url', ('quack/',),
4223
'error', ('NotStacked',))
4224
client.add_expected_call(
4225
'Branch.last_revision_info',
4227
'error', ('OutOfTea', 'low'))
4228
transport.mkdir('quack')
4229
transport = transport.clone('quack')
4230
branch = self.make_remote_branch(transport, client)
4231
self.assertRaises(OutOfTea, branch.last_revision_info)
4232
self.assertFinished(client)
4235
class TestRepositoryPack(TestRemoteRepository):
4237
def test_pack(self):
4238
transport_path = 'quack'
4239
repo, client = self.setup_fake_client_and_repository(transport_path)
4240
client.add_expected_call(
4241
'Repository.lock_write', ('quack/', ''),
4242
'success', ('ok', 'token'))
4243
client.add_expected_call(
4244
'Repository.pack', ('quack/', 'token', 'False'),
4245
'success', ('ok',), )
4246
client.add_expected_call(
4247
'Repository.unlock', ('quack/', 'token'),
4248
'success', ('ok', ))
4251
def test_pack_with_hint(self):
4252
transport_path = 'quack'
4253
repo, client = self.setup_fake_client_and_repository(transport_path)
4254
client.add_expected_call(
4255
'Repository.lock_write', ('quack/', ''),
4256
'success', ('ok', 'token'))
4257
client.add_expected_call(
4258
'Repository.pack', ('quack/', 'token', 'False'),
4259
'success', ('ok',), )
4260
client.add_expected_call(
4261
'Repository.unlock', ('quack/', 'token', 'False'),
4262
'success', ('ok', ))
4263
repo.pack(['hinta', 'hintb'])
4266
class TestRepositoryIterInventories(TestRemoteRepository):
4267
"""Test Repository.iter_inventories."""
4269
def _serialize_inv_delta(self, old_name, new_name, delta):
4270
serializer = inventory_delta.InventoryDeltaSerializer(True, False)
4271
return "".join(serializer.delta_to_lines(old_name, new_name, delta))
4273
def test_single_empty(self):
4274
transport_path = 'quack'
4275
repo, client = self.setup_fake_client_and_repository(transport_path)
4276
fmt = controldir.format_registry.get('2a')().repository_format
4278
stream = [('inventory-deltas', [
4279
versionedfile.FulltextContentFactory('somerevid', None, None,
4280
self._serialize_inv_delta('null:', 'somerevid', []))])]
4281
client.add_expected_call(
4282
'VersionedFileRepository.get_inventories', ('quack/', 'unordered'),
4283
'success', ('ok', ),
4284
_stream_to_byte_stream(stream, fmt))
4285
ret = list(repo.iter_inventories(["somerevid"]))
4286
self.assertLength(1, ret)
4288
self.assertEquals("somerevid", inv.revision_id)
4290
def test_empty(self):
4291
transport_path = 'quack'
4292
repo, client = self.setup_fake_client_and_repository(transport_path)
4293
ret = list(repo.iter_inventories([]))
4294
self.assertEquals(ret, [])
4296
def test_missing(self):
4297
transport_path = 'quack'
4298
repo, client = self.setup_fake_client_and_repository(transport_path)
4299
client.add_expected_call(
4300
'VersionedFileRepository.get_inventories', ('quack/', 'unordered'),
4301
'success', ('ok', ), iter([]))
4302
self.assertRaises(errors.NoSuchRevision, list, repo.iter_inventories(
added
removed
bzrlib/tests/test_remote.py
