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 = bzrdir.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 TestBzrDirDestroyBranch(TestRemote):
546
def test_destroy_default(self):
547
transport = self.get_transport('quack')
548
referenced = self.make_branch('referenced')
549
client = FakeClient(transport.base)
550
client.add_expected_call(
551
'BzrDir.destroy_branch', ('quack/', ),
553
a_bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
555
a_bzrdir.destroy_branch()
556
self.assertFinished(client)
558
def test_destroy_named(self):
559
transport = self.get_transport('quack')
560
referenced = self.make_branch('referenced')
561
client = FakeClient(transport.base)
562
client.add_expected_call(
563
'BzrDir.destroy_branch', ('quack/', "foo"),
565
a_bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
567
a_bzrdir.destroy_branch("foo")
568
self.assertFinished(client)
571
class TestBzrDirHasWorkingTree(TestRemote):
573
def test_has_workingtree(self):
574
transport = self.get_transport('quack')
575
client = FakeClient(transport.base)
576
client.add_expected_call(
577
'BzrDir.has_workingtree', ('quack/',),
578
'success', ('yes',)),
579
a_bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
581
self.assertTrue(a_bzrdir.has_workingtree())
582
self.assertFinished(client)
584
def test_no_workingtree(self):
585
transport = self.get_transport('quack')
586
client = FakeClient(transport.base)
587
client.add_expected_call(
588
'BzrDir.has_workingtree', ('quack/',),
590
a_bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
592
self.assertFalse(a_bzrdir.has_workingtree())
593
self.assertFinished(client)
596
class TestBzrDirDestroyRepository(TestRemote):
598
def test_destroy_repository(self):
599
transport = self.get_transport('quack')
600
client = FakeClient(transport.base)
601
client.add_expected_call(
602
'BzrDir.destroy_repository', ('quack/',),
604
a_bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
606
a_bzrdir.destroy_repository()
607
self.assertFinished(client)
484
610
class TestBzrDirOpen(TestRemote):
967
1125
return RemoteBranch(bzrdir, repo, _client=client, format=format)
1128
class TestBranchBreakLock(RemoteBranchTestCase):
1130
def test_break_lock(self):
1131
transport_path = 'quack'
1132
transport = MemoryTransport()
1133
client = FakeClient(transport.base)
1134
client.add_expected_call(
1135
'Branch.get_stacked_on_url', ('quack/',),
1136
'error', ('NotStacked',))
1137
client.add_expected_call(
1138
'Branch.break_lock', ('quack/',),
1140
transport.mkdir('quack')
1141
transport = transport.clone('quack')
1142
branch = self.make_remote_branch(transport, client)
1144
self.assertFinished(client)
1147
class TestBranchGetPhysicalLockStatus(RemoteBranchTestCase):
1149
def test_get_physical_lock_status_yes(self):
1150
transport = MemoryTransport()
1151
client = FakeClient(transport.base)
1152
client.add_expected_call(
1153
'Branch.get_stacked_on_url', ('quack/',),
1154
'error', ('NotStacked',))
1155
client.add_expected_call(
1156
'Branch.get_physical_lock_status', ('quack/',),
1157
'success', ('yes',))
1158
transport.mkdir('quack')
1159
transport = transport.clone('quack')
1160
branch = self.make_remote_branch(transport, client)
1161
result = branch.get_physical_lock_status()
1162
self.assertFinished(client)
1163
self.assertEqual(True, result)
1165
def test_get_physical_lock_status_no(self):
1166
transport = MemoryTransport()
1167
client = FakeClient(transport.base)
1168
client.add_expected_call(
1169
'Branch.get_stacked_on_url', ('quack/',),
1170
'error', ('NotStacked',))
1171
client.add_expected_call(
1172
'Branch.get_physical_lock_status', ('quack/',),
1174
transport.mkdir('quack')
1175
transport = transport.clone('quack')
1176
branch = self.make_remote_branch(transport, client)
1177
result = branch.get_physical_lock_status()
1178
self.assertFinished(client)
1179
self.assertEqual(False, result)
970
1182
class TestBranchGetParent(RemoteBranchTestCase):
972
1184
def test_no_parent(self):
1143
1355
[('set_tags_bytes', 'tags bytes')] * 2, real_branch.calls)
1358
class TestBranchHeadsToFetch(RemoteBranchTestCase):
1360
def test_uses_last_revision_info_and_tags_by_default(self):
1361
transport = MemoryTransport()
1362
client = FakeClient(transport.base)
1363
client.add_expected_call(
1364
'Branch.get_stacked_on_url', ('quack/',),
1365
'error', ('NotStacked',))
1366
client.add_expected_call(
1367
'Branch.last_revision_info', ('quack/',),
1368
'success', ('ok', '1', 'rev-tip'))
1369
client.add_expected_call(
1370
'Branch.get_config_file', ('quack/',),
1371
'success', ('ok',), '')
1372
transport.mkdir('quack')
1373
transport = transport.clone('quack')
1374
branch = self.make_remote_branch(transport, client)
1375
result = branch.heads_to_fetch()
1376
self.assertFinished(client)
1377
self.assertEqual((set(['rev-tip']), set()), result)
1379
def test_uses_last_revision_info_and_tags_when_set(self):
1380
transport = MemoryTransport()
1381
client = FakeClient(transport.base)
1382
client.add_expected_call(
1383
'Branch.get_stacked_on_url', ('quack/',),
1384
'error', ('NotStacked',))
1385
client.add_expected_call(
1386
'Branch.last_revision_info', ('quack/',),
1387
'success', ('ok', '1', 'rev-tip'))
1388
client.add_expected_call(
1389
'Branch.get_config_file', ('quack/',),
1390
'success', ('ok',), 'branch.fetch_tags = True')
1391
# XXX: this will break if the default format's serialization of tags
1392
# changes, or if the RPC for fetching tags changes from get_tags_bytes.
1393
client.add_expected_call(
1394
'Branch.get_tags_bytes', ('quack/',),
1395
'success', ('d5:tag-17:rev-foo5:tag-27:rev-bare',))
1396
transport.mkdir('quack')
1397
transport = transport.clone('quack')
1398
branch = self.make_remote_branch(transport, client)
1399
result = branch.heads_to_fetch()
1400
self.assertFinished(client)
1402
(set(['rev-tip']), set(['rev-foo', 'rev-bar'])), result)
1404
def test_uses_rpc_for_formats_with_non_default_heads_to_fetch(self):
1405
transport = MemoryTransport()
1406
client = FakeClient(transport.base)
1407
client.add_expected_call(
1408
'Branch.get_stacked_on_url', ('quack/',),
1409
'error', ('NotStacked',))
1410
client.add_expected_call(
1411
'Branch.heads_to_fetch', ('quack/',),
1412
'success', (['tip'], ['tagged-1', 'tagged-2']))
1413
transport.mkdir('quack')
1414
transport = transport.clone('quack')
1415
branch = self.make_remote_branch(transport, client)
1416
branch._format._use_default_local_heads_to_fetch = lambda: False
1417
result = branch.heads_to_fetch()
1418
self.assertFinished(client)
1419
self.assertEqual((set(['tip']), set(['tagged-1', 'tagged-2'])), result)
1421
def make_branch_with_tags(self):
1422
self.setup_smart_server_with_call_log()
1423
# Make a branch with a single revision.
1424
builder = self.make_branch_builder('foo')
1425
builder.start_series()
1426
builder.build_snapshot('tip', None, [
1427
('add', ('', 'root-id', 'directory', ''))])
1428
builder.finish_series()
1429
branch = builder.get_branch()
1430
# Add two tags to that branch
1431
branch.tags.set_tag('tag-1', 'rev-1')
1432
branch.tags.set_tag('tag-2', 'rev-2')
1435
def test_backwards_compatible(self):
1436
branch = self.make_branch_with_tags()
1437
c = branch.get_config_stack()
1438
c.set('branch.fetch_tags', True)
1439
self.addCleanup(branch.lock_read().unlock)
1440
# Disable the heads_to_fetch verb
1441
verb = 'Branch.heads_to_fetch'
1442
self.disable_verb(verb)
1443
self.reset_smart_call_log()
1444
result = branch.heads_to_fetch()
1445
self.assertEqual((set(['tip']), set(['rev-1', 'rev-2'])), result)
1447
['Branch.last_revision_info', 'Branch.get_config_file',
1448
'Branch.get_tags_bytes'],
1449
[call.call.method for call in self.hpss_calls])
1451
def test_backwards_compatible_no_tags(self):
1452
branch = self.make_branch_with_tags()
1453
c = branch.get_config_stack()
1454
c.set('branch.fetch_tags', False)
1455
self.addCleanup(branch.lock_read().unlock)
1456
# Disable the heads_to_fetch verb
1457
verb = 'Branch.heads_to_fetch'
1458
self.disable_verb(verb)
1459
self.reset_smart_call_log()
1460
result = branch.heads_to_fetch()
1461
self.assertEqual((set(['tip']), set()), result)
1463
['Branch.last_revision_info', 'Branch.get_config_file'],
1464
[call.call.method for call in self.hpss_calls])
1146
1467
class TestBranchLastRevisionInfo(RemoteBranchTestCase):
1148
1469
def test_empty_branch(self):
1661
2002
self.addCleanup(branch.unlock)
1662
2003
self.reset_smart_call_log()
1663
2004
branch._get_config().set_option('value', 'name')
1664
self.assertLength(10, self.hpss_calls)
2005
self.assertLength(11, self.hpss_calls)
1665
2006
self.assertEqual('value', branch._get_config().get_option('name'))
2008
def test_backwards_compat_set_option_with_dict(self):
2009
self.setup_smart_server_with_call_log()
2010
branch = self.make_branch('.')
2011
verb = 'Branch.set_config_option_dict'
2012
self.disable_verb(verb)
2014
self.addCleanup(branch.unlock)
2015
self.reset_smart_call_log()
2016
config = branch._get_config()
2017
value_dict = {'ascii': 'a', u'unicode \N{WATCH}': u'\N{INTERROBANG}'}
2018
config.set_option(value_dict, 'name')
2019
self.assertLength(11, self.hpss_calls)
2020
self.assertEqual(value_dict, branch._get_config().get_option('name'))
2023
class TestBranchGetPutConfigStore(RemoteBranchTestCase):
2025
def test_get_branch_conf(self):
2026
# in an empty branch we decode the response properly
2027
client = FakeClient()
2028
client.add_expected_call(
2029
'Branch.get_stacked_on_url', ('memory:///',),
2030
'error', ('NotStacked',),)
2031
client.add_success_response_with_body('# config file body', 'ok')
2032
transport = MemoryTransport()
2033
branch = self.make_remote_branch(transport, client)
2034
config = branch.get_config_stack()
2036
config.get("log_format")
2038
[('call', 'Branch.get_stacked_on_url', ('memory:///',)),
2039
('call_expecting_body', 'Branch.get_config_file', ('memory:///',))],
2042
def test_set_branch_conf(self):
2043
client = FakeClient()
2044
client.add_expected_call(
2045
'Branch.get_stacked_on_url', ('memory:///',),
2046
'error', ('NotStacked',),)
2047
client.add_expected_call(
2048
'Branch.lock_write', ('memory:///', '', ''),
2049
'success', ('ok', 'branch token', 'repo token'))
2050
client.add_expected_call(
2051
'Branch.get_config_file', ('memory:///', ),
2052
'success', ('ok', ), "# line 1\n")
2053
client.add_expected_call(
2054
'Branch.put_config_file', ('memory:///', 'branch token',
2057
client.add_expected_call(
2058
'Branch.unlock', ('memory:///', 'branch token', 'repo token'),
2060
transport = MemoryTransport()
2061
branch = self.make_remote_branch(transport, client)
2063
config = branch.get_config_stack()
2064
config.set('email', 'The Dude <lebowski@example.com>')
2066
self.assertFinished(client)
2068
[('call', 'Branch.get_stacked_on_url', ('memory:///',)),
2069
('call', 'Branch.lock_write', ('memory:///', '', '')),
2070
('call_expecting_body', 'Branch.get_config_file', ('memory:///',)),
2071
('call_with_body_bytes_expecting_body', 'Branch.put_config_file',
2072
('memory:///', 'branch token', 'repo token'),
2073
'# line 1\nemail = The Dude <lebowski@example.com>\n'),
2074
('call', 'Branch.unlock', ('memory:///', 'branch token', 'repo token'))],
1668
2078
class TestBranchLockWrite(RemoteBranchTestCase):
1683
2093
self.assertFinished(client)
2096
class TestBranchRevisionIdToRevno(RemoteBranchTestCase):
2098
def test_simple(self):
2099
transport = MemoryTransport()
2100
client = FakeClient(transport.base)
2101
client.add_expected_call(
2102
'Branch.get_stacked_on_url', ('quack/',),
2103
'error', ('NotStacked',),)
2104
client.add_expected_call(
2105
'Branch.revision_id_to_revno', ('quack/', 'null:'),
2106
'success', ('ok', '0',),)
2107
client.add_expected_call(
2108
'Branch.revision_id_to_revno', ('quack/', 'unknown'),
2109
'error', ('NoSuchRevision', 'unknown',),)
2110
transport.mkdir('quack')
2111
transport = transport.clone('quack')
2112
branch = self.make_remote_branch(transport, client)
2113
self.assertEquals(0, branch.revision_id_to_revno('null:'))
2114
self.assertRaises(errors.NoSuchRevision,
2115
branch.revision_id_to_revno, 'unknown')
2116
self.assertFinished(client)
2118
def test_dotted(self):
2119
transport = MemoryTransport()
2120
client = FakeClient(transport.base)
2121
client.add_expected_call(
2122
'Branch.get_stacked_on_url', ('quack/',),
2123
'error', ('NotStacked',),)
2124
client.add_expected_call(
2125
'Branch.revision_id_to_revno', ('quack/', 'null:'),
2126
'success', ('ok', '0',),)
2127
client.add_expected_call(
2128
'Branch.revision_id_to_revno', ('quack/', 'unknown'),
2129
'error', ('NoSuchRevision', 'unknown',),)
2130
transport.mkdir('quack')
2131
transport = transport.clone('quack')
2132
branch = self.make_remote_branch(transport, client)
2133
self.assertEquals((0, ), branch.revision_id_to_dotted_revno('null:'))
2134
self.assertRaises(errors.NoSuchRevision,
2135
branch.revision_id_to_dotted_revno, 'unknown')
2136
self.assertFinished(client)
2138
def test_dotted_no_smart_verb(self):
2139
self.setup_smart_server_with_call_log()
2140
branch = self.make_branch('.')
2141
self.disable_verb('Branch.revision_id_to_revno')
2142
self.reset_smart_call_log()
2143
self.assertEquals((0, ),
2144
branch.revision_id_to_dotted_revno('null:'))
2145
self.assertLength(8, self.hpss_calls)
1686
2148
class TestBzrDirGetSetConfig(RemoteBzrDirTestCase):
1688
2150
def test__get_config(self):
2393
class TestRepositoryBreakLock(TestRemoteRepository):
2395
def test_break_lock(self):
2396
transport_path = 'quack'
2397
repo, client = self.setup_fake_client_and_repository(transport_path)
2398
client.add_success_response('ok')
2401
[('call', 'Repository.break_lock', ('quack/',))],
2405
class TestRepositoryGetSerializerFormat(TestRemoteRepository):
2407
def test_get_serializer_format(self):
2408
transport_path = 'hill'
2409
repo, client = self.setup_fake_client_and_repository(transport_path)
2410
client.add_success_response('ok', '7')
2411
self.assertEquals('7', repo.get_serializer_format())
2413
[('call', 'VersionedFileRepository.get_serializer_format',
2418
class TestRepositoryReconcile(TestRemoteRepository):
2420
def test_reconcile(self):
2421
transport_path = 'hill'
2422
repo, client = self.setup_fake_client_and_repository(transport_path)
2423
body = ("garbage_inventories: 2\n"
2424
"inconsistent_parents: 3\n")
2425
client.add_expected_call(
2426
'Repository.lock_write', ('hill/', ''),
2427
'success', ('ok', 'a token'))
2428
client.add_success_response_with_body(body, 'ok')
2429
reconciler = repo.reconcile()
2431
[('call', 'Repository.lock_write', ('hill/', '')),
2432
('call_expecting_body', 'Repository.reconcile',
2433
('hill/', 'a token'))],
2435
self.assertEquals(2, reconciler.garbage_inventories)
2436
self.assertEquals(3, reconciler.inconsistent_parents)
2439
class TestRepositoryGetRevisionSignatureText(TestRemoteRepository):
2441
def test_text(self):
2442
# ('ok',), body with signature text
2443
transport_path = 'quack'
2444
repo, client = self.setup_fake_client_and_repository(transport_path)
2445
client.add_success_response_with_body(
2447
self.assertEquals("THETEXT", repo.get_signature_text("revid"))
2449
[('call_expecting_body', 'Repository.get_revision_signature_text',
2450
('quack/', 'revid'))],
2453
def test_no_signature(self):
2454
transport_path = 'quick'
2455
repo, client = self.setup_fake_client_and_repository(transport_path)
2456
client.add_error_response('nosuchrevision', 'unknown')
2457
self.assertRaises(errors.NoSuchRevision, repo.get_signature_text,
2460
[('call_expecting_body', 'Repository.get_revision_signature_text',
2461
('quick/', 'unknown'))],
1906
2465
class TestRepositoryGetGraph(TestRemoteRepository):
1908
2467
def test_get_graph(self):
3056
class TestRepositoryWriteGroups(TestRemoteRepository):
3058
def test_start_write_group(self):
3059
transport_path = 'quack'
3060
repo, client = self.setup_fake_client_and_repository(transport_path)
3061
client.add_expected_call(
3062
'Repository.lock_write', ('quack/', ''),
3063
'success', ('ok', 'a token'))
3064
client.add_expected_call(
3065
'Repository.start_write_group', ('quack/', 'a token'),
3066
'success', ('ok', ('token1', )))
3068
repo.start_write_group()
3070
def test_start_write_group_unsuspendable(self):
3071
# Some repositories do not support suspending write
3072
# groups. For those, fall back to the "real" repository.
3073
transport_path = 'quack'
3074
repo, client = self.setup_fake_client_and_repository(transport_path)
3075
def stub_ensure_real():
3076
client._calls.append(('_ensure_real',))
3077
repo._real_repository = _StubRealPackRepository(client._calls)
3078
repo._ensure_real = stub_ensure_real
3079
client.add_expected_call(
3080
'Repository.lock_write', ('quack/', ''),
3081
'success', ('ok', 'a token'))
3082
client.add_expected_call(
3083
'Repository.start_write_group', ('quack/', 'a token'),
3084
'error', ('UnsuspendableWriteGroup',))
3086
repo.start_write_group()
3087
self.assertEquals(client._calls[-2:], [
3089
('start_write_group',)])
3091
def test_commit_write_group(self):
3092
transport_path = 'quack'
3093
repo, client = self.setup_fake_client_and_repository(transport_path)
3094
client.add_expected_call(
3095
'Repository.lock_write', ('quack/', ''),
3096
'success', ('ok', 'a token'))
3097
client.add_expected_call(
3098
'Repository.start_write_group', ('quack/', 'a token'),
3099
'success', ('ok', ['token1']))
3100
client.add_expected_call(
3101
'Repository.commit_write_group', ('quack/', 'a token', ['token1']),
3104
repo.start_write_group()
3105
repo.commit_write_group()
3107
def test_abort_write_group(self):
3108
transport_path = 'quack'
3109
repo, client = self.setup_fake_client_and_repository(transport_path)
3110
client.add_expected_call(
3111
'Repository.lock_write', ('quack/', ''),
3112
'success', ('ok', 'a token'))
3113
client.add_expected_call(
3114
'Repository.start_write_group', ('quack/', 'a token'),
3115
'success', ('ok', ['token1']))
3116
client.add_expected_call(
3117
'Repository.abort_write_group', ('quack/', 'a token', ['token1']),
3120
repo.start_write_group()
3121
repo.abort_write_group(False)
3123
def test_suspend_write_group(self):
3124
transport_path = 'quack'
3125
repo, client = self.setup_fake_client_and_repository(transport_path)
3126
self.assertEquals([], repo.suspend_write_group())
3128
def test_resume_write_group(self):
3129
transport_path = 'quack'
3130
repo, client = self.setup_fake_client_and_repository(transport_path)
3131
client.add_expected_call(
3132
'Repository.lock_write', ('quack/', ''),
3133
'success', ('ok', 'a token'))
3134
client.add_expected_call(
3135
'Repository.check_write_group', ('quack/', 'a token', ['token1']),
3138
repo.resume_write_group(['token1'])
2329
3141
class TestRepositorySetMakeWorkingTrees(TestRemoteRepository):
2331
3143
def test_backwards_compat(self):
2895
3761
expected_error = errors.PermissionDenied(path, extra)
2896
3762
self.assertEqual(expected_error, translated_error)
3764
# GZ 2011-03-02: TODO test for PermissionDenied with non-ascii 'extra'
3766
def test_NoSuchFile_context_path(self):
3767
local_path = "local path"
3768
translated_error = self.translateTuple(('ReadError', "remote path"),
3770
expected_error = errors.ReadError(local_path)
3771
self.assertEqual(expected_error, translated_error)
3773
def test_NoSuchFile_without_context(self):
3774
remote_path = "remote path"
3775
translated_error = self.translateTuple(('ReadError', remote_path))
3776
expected_error = errors.ReadError(remote_path)
3777
self.assertEqual(expected_error, translated_error)
3779
def test_ReadOnlyError(self):
3780
translated_error = self.translateTuple(('ReadOnlyError',))
3781
expected_error = errors.TransportNotPossible("readonly transport")
3782
self.assertEqual(expected_error, translated_error)
3784
def test_MemoryError(self):
3785
translated_error = self.translateTuple(('MemoryError',))
3786
self.assertStartsWith(str(translated_error),
3787
"remote server out of memory")
3789
def test_generic_IndexError_no_classname(self):
3790
err = errors.ErrorFromSmartServer(('error', "list index out of range"))
3791
translated_error = self.translateErrorFromSmartServer(err)
3792
expected_error = errors.UnknownErrorFromSmartServer(err)
3793
self.assertEqual(expected_error, translated_error)
3795
# GZ 2011-03-02: TODO test generic non-ascii error string
3797
def test_generic_KeyError(self):
3798
err = errors.ErrorFromSmartServer(('error', 'KeyError', "1"))
3799
translated_error = self.translateErrorFromSmartServer(err)
3800
expected_error = errors.UnknownErrorFromSmartServer(err)
3801
self.assertEqual(expected_error, translated_error)
2899
3804
class TestErrorTranslationRobustness(TestErrorTranslationBase):
2900
3805
"""Unit tests for bzrlib.remote._translate_error's robustness.
3143
4050
def test_copy_content_into_avoids_revision_history(self):
3144
4051
local = self.make_branch('local')
3145
remote_backing_tree = self.make_branch_and_tree('remote')
3146
remote_backing_tree.commit("Commit.")
4052
builder = self.make_branch_builder('remote')
4053
builder.build_commit(message="Commit.")
3147
4054
remote_branch_url = self.smart_server.get_url() + 'remote'
3148
4055
remote_branch = bzrdir.BzrDir.open(remote_branch_url).open_branch()
3149
4056
local.repository.fetch(remote_branch.repository)
3150
4057
self.hpss_calls = []
3151
4058
remote_branch.copy_content_into(local)
3152
4059
self.assertFalse('Branch.revision_history' in self.hpss_calls)
4061
def test_fetch_everything_needs_just_one_call(self):
4062
local = self.make_branch('local')
4063
builder = self.make_branch_builder('remote')
4064
builder.build_commit(message="Commit.")
4065
remote_branch_url = self.smart_server.get_url() + 'remote'
4066
remote_branch = bzrdir.BzrDir.open(remote_branch_url).open_branch()
4067
self.hpss_calls = []
4068
local.repository.fetch(
4069
remote_branch.repository,
4070
fetch_spec=vf_search.EverythingResult(remote_branch.repository))
4071
self.assertEqual(['Repository.get_stream_1.19'], self.hpss_calls)
4073
def override_verb(self, verb_name, verb):
4074
request_handlers = request.request_handlers
4075
orig_verb = request_handlers.get(verb_name)
4076
orig_info = request_handlers.get_info(verb_name)
4077
request_handlers.register(verb_name, verb, override_existing=True)
4078
self.addCleanup(request_handlers.register, verb_name, orig_verb,
4079
override_existing=True, info=orig_info)
4081
def test_fetch_everything_backwards_compat(self):
4082
"""Can fetch with EverythingResult even with pre 2.4 servers.
4084
Pre-2.4 do not support 'everything' searches with the
4085
Repository.get_stream_1.19 verb.
4088
class OldGetStreamVerb(SmartServerRepositoryGetStream_1_19):
4089
"""A version of the Repository.get_stream_1.19 verb patched to
4090
reject 'everything' searches the way 2.3 and earlier do.
4092
def recreate_search(self, repository, search_bytes,
4093
discard_excess=False):
4094
verb_log.append(search_bytes.split('\n', 1)[0])
4095
if search_bytes == 'everything':
4097
request.FailedSmartServerResponse(('BadSearch',)))
4098
return super(OldGetStreamVerb,
4099
self).recreate_search(repository, search_bytes,
4100
discard_excess=discard_excess)
4101
self.override_verb('Repository.get_stream_1.19', OldGetStreamVerb)
4102
local = self.make_branch('local')
4103
builder = self.make_branch_builder('remote')
4104
builder.build_commit(message="Commit.")
4105
remote_branch_url = self.smart_server.get_url() + 'remote'
4106
remote_branch = bzrdir.BzrDir.open(remote_branch_url).open_branch()
4107
self.hpss_calls = []
4108
local.repository.fetch(
4109
remote_branch.repository,
4110
fetch_spec=vf_search.EverythingResult(remote_branch.repository))
4111
# make sure the overridden verb was used
4112
self.assertLength(1, verb_log)
4113
# more than one HPSS call is needed, but because it's a VFS callback
4114
# its hard to predict exactly how many.
4115
self.assertTrue(len(self.hpss_calls) > 1)
4118
class TestUpdateBoundBranchWithModifiedBoundLocation(
4119
tests.TestCaseWithTransport):
4120
"""Ensure correct handling of bound_location modifications.
4122
This is tested against a smart server as http://pad.lv/786980 was about a
4123
ReadOnlyError (write attempt during a read-only transaction) which can only
4124
happen in this context.
4128
super(TestUpdateBoundBranchWithModifiedBoundLocation, self).setUp()
4129
self.transport_server = test_server.SmartTCPServer_for_testing
4131
def make_master_and_checkout(self, master_name, checkout_name):
4132
# Create the master branch and its associated checkout
4133
self.master = self.make_branch_and_tree(master_name)
4134
self.checkout = self.master.branch.create_checkout(checkout_name)
4135
# Modify the master branch so there is something to update
4136
self.master.commit('add stuff')
4137
self.last_revid = self.master.commit('even more stuff')
4138
self.bound_location = self.checkout.branch.get_bound_location()
4140
def assertUpdateSucceeds(self, new_location):
4141
self.checkout.branch.set_bound_location(new_location)
4142
self.checkout.update()
4143
self.assertEquals(self.last_revid, self.checkout.last_revision())
4145
def test_without_final_slash(self):
4146
self.make_master_and_checkout('master', 'checkout')
4147
# For unclear reasons some users have a bound_location without a final
4148
# '/', simulate that by forcing such a value
4149
self.assertEndsWith(self.bound_location, '/')
4150
self.assertUpdateSucceeds(self.bound_location.rstrip('/'))
4152
def test_plus_sign(self):
4153
self.make_master_and_checkout('+master', 'checkout')
4154
self.assertUpdateSucceeds(self.bound_location.replace('%2B', '+', 1))
4156
def test_tilda(self):
4157
# Embed ~ in the middle of the path just to avoid any $HOME
4159
self.make_master_and_checkout('mas~ter', 'checkout')
4160
self.assertUpdateSucceeds(self.bound_location.replace('%2E', '~', 1))
4163
class TestWithCustomErrorHandler(RemoteBranchTestCase):
4165
def test_no_context(self):
4166
class OutOfCoffee(errors.BzrError):
4167
"""A dummy exception for testing."""
4169
def __init__(self, urgency):
4170
self.urgency = urgency
4171
remote.no_context_error_translators.register("OutOfCoffee",
4172
lambda err: OutOfCoffee(err.error_args[0]))
4173
transport = MemoryTransport()
4174
client = FakeClient(transport.base)
4175
client.add_expected_call(
4176
'Branch.get_stacked_on_url', ('quack/',),
4177
'error', ('NotStacked',))
4178
client.add_expected_call(
4179
'Branch.last_revision_info',
4181
'error', ('OutOfCoffee', 'low'))
4182
transport.mkdir('quack')
4183
transport = transport.clone('quack')
4184
branch = self.make_remote_branch(transport, client)
4185
self.assertRaises(OutOfCoffee, branch.last_revision_info)
4186
self.assertFinished(client)
4188
def test_with_context(self):
4189
class OutOfTea(errors.BzrError):
4190
def __init__(self, branch, urgency):
4191
self.branch = branch
4192
self.urgency = urgency
4193
remote.error_translators.register("OutOfTea",
4194
lambda err, find, path: OutOfTea(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', ('OutOfTea', 'low'))
4205
transport.mkdir('quack')
4206
transport = transport.clone('quack')
4207
branch = self.make_remote_branch(transport, client)
4208
self.assertRaises(OutOfTea, branch.last_revision_info)
4209
self.assertFinished(client)
4212
class TestRepositoryPack(TestRemoteRepository):
4214
def test_pack(self):
4215
transport_path = 'quack'
4216
repo, client = self.setup_fake_client_and_repository(transport_path)
4217
client.add_expected_call(
4218
'Repository.lock_write', ('quack/', ''),
4219
'success', ('ok', 'token'))
4220
client.add_expected_call(
4221
'Repository.pack', ('quack/', 'token', 'False'),
4222
'success', ('ok',), )
4223
client.add_expected_call(
4224
'Repository.unlock', ('quack/', 'token'),
4225
'success', ('ok', ))
4228
def test_pack_with_hint(self):
4229
transport_path = 'quack'
4230
repo, client = self.setup_fake_client_and_repository(transport_path)
4231
client.add_expected_call(
4232
'Repository.lock_write', ('quack/', ''),
4233
'success', ('ok', 'token'))
4234
client.add_expected_call(
4235
'Repository.pack', ('quack/', 'token', 'False'),
4236
'success', ('ok',), )
4237
client.add_expected_call(
4238
'Repository.unlock', ('quack/', 'token', 'False'),
4239
'success', ('ok', ))
4240
repo.pack(['hinta', 'hintb'])
4243
class TestRepositoryIterInventories(TestRemoteRepository):
4244
"""Test Repository.iter_inventories."""
4246
def _serialize_inv_delta(self, old_name, new_name, delta):
4247
serializer = inventory_delta.InventoryDeltaSerializer(True, False)
4248
return "".join(serializer.delta_to_lines(old_name, new_name, delta))
4250
def test_single_empty(self):
4251
transport_path = 'quack'
4252
repo, client = self.setup_fake_client_and_repository(transport_path)
4253
fmt = bzrdir.format_registry.get('2a')().repository_format
4255
stream = [('inventory-deltas', [
4256
versionedfile.FulltextContentFactory('somerevid', None, None,
4257
self._serialize_inv_delta('null:', 'somerevid', []))])]
4258
client.add_expected_call(
4259
'VersionedFileRepository.get_inventories', ('quack/', 'unordered'),
4260
'success', ('ok', ),
4261
_stream_to_byte_stream(stream, fmt))
4262
ret = list(repo.iter_inventories(["somerevid"]))
4263
self.assertLength(1, ret)
4265
self.assertEquals("somerevid", inv.revision_id)
4267
def test_empty(self):
4268
transport_path = 'quack'
4269
repo, client = self.setup_fake_client_and_repository(transport_path)
4270
ret = list(repo.iter_inventories([]))
4271
self.assertEquals(ret, [])
4273
def test_missing(self):
4274
transport_path = 'quack'
4275
repo, client = self.setup_fake_client_and_repository(transport_path)
4276
client.add_expected_call(
4277
'VersionedFileRepository.get_inventories', ('quack/', 'unordered'),
4278
'success', ('ok', ), iter([]))
4279
self.assertRaises(errors.NoSuchRevision, list, repo.iter_inventories(
added
removed
bzrlib/tests/test_remote.py
