53
57
RemoteRepositoryFormat,
55
from bzrlib.repofmt import groupcompress_repo, pack_repo
59
from bzrlib.repofmt import groupcompress_repo, knitpack_repo
56
60
from bzrlib.revision import NULL_REVISION
57
from bzrlib.smart import medium
61
from bzrlib.smart import medium, request
58
62
from bzrlib.smart.client import _SmartClient
59
from bzrlib.smart.repository import SmartServerRepositoryGetParentMap
63
from bzrlib.smart.repository import (
64
SmartServerRepositoryGetParentMap,
65
SmartServerRepositoryGetStream_1_19,
67
from bzrlib.symbol_versioning import deprecated_in
60
68
from bzrlib.tests import (
62
split_suite_by_condition,
66
from bzrlib.transport import get_transport
71
from bzrlib.tests.scenarios import load_tests_apply_scenarios
67
72
from bzrlib.transport.memory import MemoryTransport
68
73
from bzrlib.transport.remote import (
70
75
RemoteSSHTransport,
71
76
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 = [
80
load_tests = load_tests_apply_scenarios
83
class BasicRemoteObjectTests(tests.TestCaseWithTransport):
79
{'transport_server': test_server.SmartTCPServer_for_testing_v2_only}),
87
{'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):
89
{'transport_server': test_server.SmartTCPServer_for_testing})]
88
93
super(BasicRemoteObjectTests, self).setUp()
89
94
self.transport = self.get_transport()
90
95
# make a branch that can be opened over the smart transport
91
96
self.local_wt = BzrDir.create_standalone_workingtree('.')
94
self.transport.disconnect()
95
tests.TestCaseWithTransport.tearDown(self)
97
self.addCleanup(self.transport.disconnect)
97
99
def test_create_remote_bzrdir(self):
98
b = remote.RemoteBzrDir(self.transport, remote.RemoteBzrDirFormat())
100
b = remote.RemoteBzrDir(self.transport, RemoteBzrDirFormat())
99
101
self.assertIsInstance(b, BzrDir)
101
103
def test_open_remote_branch(self):
102
104
# open a standalone branch in the working directory
103
b = remote.RemoteBzrDir(self.transport, remote.RemoteBzrDirFormat())
105
b = remote.RemoteBzrDir(self.transport, RemoteBzrDirFormat())
104
106
branch = b.open_branch()
105
107
self.assertIsInstance(branch, Branch)
115
117
def test_remote_branch_revision_history(self):
116
118
b = BzrDir.open_from_transport(self.transport).open_branch()
117
self.assertEqual([], b.revision_history())
120
self.applyDeprecated(deprecated_in((2, 5, 0)), b.revision_history))
118
121
r1 = self.local_wt.commit('1st commit')
119
122
r2 = self.local_wt.commit('1st commit', rev_id=u'\xc8'.encode('utf8'))
120
self.assertEqual([r1, r2], b.revision_history())
123
self.assertEqual([r1, r2],
124
self.applyDeprecated(deprecated_in((2, 5, 0)), b.revision_history))
122
126
def test_find_correct_format(self):
123
127
"""Should open a RemoteBzrDir over a RemoteTransport"""
124
128
fmt = BzrDirFormat.find_format(self.transport)
125
self.assertTrue(RemoteBzrDirFormat
126
in BzrDirFormat._control_server_formats)
127
self.assertIsInstance(fmt, remote.RemoteBzrDirFormat)
129
self.assertTrue(bzrdir.RemoteBzrProber
130
in controldir.ControlDirFormat._server_probers)
131
self.assertIsInstance(fmt, RemoteBzrDirFormat)
129
133
def test_open_detected_smart_format(self):
130
134
fmt = BzrDirFormat.find_format(self.transport)
495
499
client.add_expected_call(
496
500
'BzrDir.open_2.1', ('quack/',), 'success', ('no',))
497
501
self.assertRaises(errors.NotBranchError, RemoteBzrDir, transport,
498
remote.RemoteBzrDirFormat(), _client=client, _force_probe=True)
502
RemoteBzrDirFormat(), _client=client, _force_probe=True)
499
503
self.assertFinished(client)
501
505
def test_present_without_workingtree(self):
502
506
client, transport = self.make_fake_client_and_transport()
503
507
client.add_expected_call(
504
508
'BzrDir.open_2.1', ('quack/',), 'success', ('yes', 'no'))
505
bd = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
509
bd = RemoteBzrDir(transport, RemoteBzrDirFormat(),
506
510
_client=client, _force_probe=True)
507
511
self.assertIsInstance(bd, RemoteBzrDir)
508
512
self.assertFalse(bd.has_workingtree())
724
728
format = branch._format
725
729
self.assertEqual(network_name, format.network_name())
731
def test_already_open_repo_and_reused_medium(self):
732
"""Bug 726584: create_branch(..., repository=repo) should work
733
regardless of what the smart medium's base URL is.
735
self.transport_server = test_server.SmartTCPServer_for_testing
736
transport = self.get_transport('.')
737
repo = self.make_repository('quack')
738
# Client's medium rooted a transport root (not at the bzrdir)
739
client = FakeClient(transport.base)
740
transport = transport.clone('quack')
741
reference_bzrdir_format = bzrdir.format_registry.get('default')()
742
reference_format = reference_bzrdir_format.get_branch_format()
743
network_name = reference_format.network_name()
744
reference_repo_fmt = reference_bzrdir_format.repository_format
745
reference_repo_name = reference_repo_fmt.network_name()
746
client.add_expected_call(
747
'BzrDir.create_branch', ('extra/quack/', network_name),
748
'success', ('ok', network_name, '', 'no', 'no', 'yes',
749
reference_repo_name))
750
a_bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
752
branch = a_bzrdir.create_branch(repository=repo)
753
# We should have got a remote branch
754
self.assertIsInstance(branch, remote.RemoteBranch)
755
# its format should have the settings from the response
756
format = branch._format
757
self.assertEqual(network_name, format.network_name())
728
760
class TestBzrDirCreateRepository(TestRemote):
1143
1175
[('set_tags_bytes', 'tags bytes')] * 2, real_branch.calls)
1178
class TestBranchHeadsToFetch(RemoteBranchTestCase):
1180
def test_uses_last_revision_info_and_tags_by_default(self):
1181
transport = MemoryTransport()
1182
client = FakeClient(transport.base)
1183
client.add_expected_call(
1184
'Branch.get_stacked_on_url', ('quack/',),
1185
'error', ('NotStacked',))
1186
client.add_expected_call(
1187
'Branch.last_revision_info', ('quack/',),
1188
'success', ('ok', '1', 'rev-tip'))
1189
client.add_expected_call(
1190
'Branch.get_config_file', ('quack/',),
1191
'success', ('ok',), '')
1192
transport.mkdir('quack')
1193
transport = transport.clone('quack')
1194
branch = self.make_remote_branch(transport, client)
1195
result = branch.heads_to_fetch()
1196
self.assertFinished(client)
1197
self.assertEqual((set(['rev-tip']), set()), result)
1199
def test_uses_last_revision_info_and_tags_when_set(self):
1200
transport = MemoryTransport()
1201
client = FakeClient(transport.base)
1202
client.add_expected_call(
1203
'Branch.get_stacked_on_url', ('quack/',),
1204
'error', ('NotStacked',))
1205
client.add_expected_call(
1206
'Branch.last_revision_info', ('quack/',),
1207
'success', ('ok', '1', 'rev-tip'))
1208
client.add_expected_call(
1209
'Branch.get_config_file', ('quack/',),
1210
'success', ('ok',), 'branch.fetch_tags = True')
1211
# XXX: this will break if the default format's serialization of tags
1212
# changes, or if the RPC for fetching tags changes from get_tags_bytes.
1213
client.add_expected_call(
1214
'Branch.get_tags_bytes', ('quack/',),
1215
'success', ('d5:tag-17:rev-foo5:tag-27:rev-bare',))
1216
transport.mkdir('quack')
1217
transport = transport.clone('quack')
1218
branch = self.make_remote_branch(transport, client)
1219
result = branch.heads_to_fetch()
1220
self.assertFinished(client)
1222
(set(['rev-tip']), set(['rev-foo', 'rev-bar'])), result)
1224
def test_uses_rpc_for_formats_with_non_default_heads_to_fetch(self):
1225
transport = MemoryTransport()
1226
client = FakeClient(transport.base)
1227
client.add_expected_call(
1228
'Branch.get_stacked_on_url', ('quack/',),
1229
'error', ('NotStacked',))
1230
client.add_expected_call(
1231
'Branch.heads_to_fetch', ('quack/',),
1232
'success', (['tip'], ['tagged-1', 'tagged-2']))
1233
transport.mkdir('quack')
1234
transport = transport.clone('quack')
1235
branch = self.make_remote_branch(transport, client)
1236
branch._format._use_default_local_heads_to_fetch = lambda: False
1237
result = branch.heads_to_fetch()
1238
self.assertFinished(client)
1239
self.assertEqual((set(['tip']), set(['tagged-1', 'tagged-2'])), result)
1241
def make_branch_with_tags(self):
1242
self.setup_smart_server_with_call_log()
1243
# Make a branch with a single revision.
1244
builder = self.make_branch_builder('foo')
1245
builder.start_series()
1246
builder.build_snapshot('tip', None, [
1247
('add', ('', 'root-id', 'directory', ''))])
1248
builder.finish_series()
1249
branch = builder.get_branch()
1250
# Add two tags to that branch
1251
branch.tags.set_tag('tag-1', 'rev-1')
1252
branch.tags.set_tag('tag-2', 'rev-2')
1255
def test_backwards_compatible(self):
1256
branch = self.make_branch_with_tags()
1257
c = branch.get_config()
1258
c.set_user_option('branch.fetch_tags', 'True')
1259
self.addCleanup(branch.lock_read().unlock)
1260
# Disable the heads_to_fetch verb
1261
verb = 'Branch.heads_to_fetch'
1262
self.disable_verb(verb)
1263
self.reset_smart_call_log()
1264
result = branch.heads_to_fetch()
1265
self.assertEqual((set(['tip']), set(['rev-1', 'rev-2'])), result)
1267
['Branch.last_revision_info', 'Branch.get_config_file',
1268
'Branch.get_tags_bytes'],
1269
[call.call.method for call in self.hpss_calls])
1271
def test_backwards_compatible_no_tags(self):
1272
branch = self.make_branch_with_tags()
1273
c = branch.get_config()
1274
c.set_user_option('branch.fetch_tags', 'False')
1275
self.addCleanup(branch.lock_read().unlock)
1276
# Disable the heads_to_fetch verb
1277
verb = 'Branch.heads_to_fetch'
1278
self.disable_verb(verb)
1279
self.reset_smart_call_log()
1280
result = branch.heads_to_fetch()
1281
self.assertEqual((set(['tip']), set()), result)
1283
['Branch.last_revision_info', 'Branch.get_config_file'],
1284
[call.call.method for call in self.hpss_calls])
1146
1287
class TestBranchLastRevisionInfo(RemoteBranchTestCase):
1148
1289
def test_empty_branch(self):
1652
1794
branch.unlock()
1653
1795
self.assertFinished(client)
1797
def test_set_option_with_dict(self):
1798
client = FakeClient()
1799
client.add_expected_call(
1800
'Branch.get_stacked_on_url', ('memory:///',),
1801
'error', ('NotStacked',),)
1802
client.add_expected_call(
1803
'Branch.lock_write', ('memory:///', '', ''),
1804
'success', ('ok', 'branch token', 'repo token'))
1805
encoded_dict_value = 'd5:ascii1:a11:unicode \xe2\x8c\x9a3:\xe2\x80\xbde'
1806
client.add_expected_call(
1807
'Branch.set_config_option_dict', ('memory:///', 'branch token',
1808
'repo token', encoded_dict_value, 'foo', ''),
1810
client.add_expected_call(
1811
'Branch.unlock', ('memory:///', 'branch token', 'repo token'),
1813
transport = MemoryTransport()
1814
branch = self.make_remote_branch(transport, client)
1816
config = branch._get_config()
1818
{'ascii': 'a', u'unicode \N{WATCH}': u'\N{INTERROBANG}'},
1821
self.assertFinished(client)
1655
1823
def test_backwards_compat_set_option(self):
1656
1824
self.setup_smart_server_with_call_log()
1657
1825
branch = self.make_branch('.')
2095
2277
self.assertEqual({}, repo.get_parent_map(['non-existant']))
2096
2278
self.assertLength(0, self.hpss_calls)
2280
def test_exposes_get_cached_parent_map(self):
2281
"""RemoteRepository exposes get_cached_parent_map from
2284
r1 = u'\u0e33'.encode('utf8')
2285
r2 = u'\u0dab'.encode('utf8')
2286
lines = [' '.join([r2, r1]), r1]
2287
encoded_body = bz2.compress('\n'.join(lines))
2289
transport_path = 'quack'
2290
repo, client = self.setup_fake_client_and_repository(transport_path)
2291
client.add_success_response_with_body(encoded_body, 'ok')
2293
# get_cached_parent_map should *not* trigger an RPC
2294
self.assertEqual({}, repo.get_cached_parent_map([r1]))
2295
self.assertEqual([], client._calls)
2296
self.assertEqual({r2: (r1,)}, repo.get_parent_map([r2]))
2297
self.assertEqual({r1: (NULL_REVISION,)},
2298
repo.get_cached_parent_map([r1]))
2300
[('call_with_body_bytes_expecting_body',
2301
'Repository.get_parent_map', ('quack/', 'include-missing:', r2),
2099
2307
class TestGetParentMapAllowsNew(tests.TestCaseWithTransport):
2895
3128
expected_error = errors.PermissionDenied(path, extra)
2896
3129
self.assertEqual(expected_error, translated_error)
3131
# GZ 2011-03-02: TODO test for PermissionDenied with non-ascii 'extra'
3133
def test_NoSuchFile_context_path(self):
3134
local_path = "local path"
3135
translated_error = self.translateTuple(('ReadError', "remote path"),
3137
expected_error = errors.ReadError(local_path)
3138
self.assertEqual(expected_error, translated_error)
3140
def test_NoSuchFile_without_context(self):
3141
remote_path = "remote path"
3142
translated_error = self.translateTuple(('ReadError', remote_path))
3143
expected_error = errors.ReadError(remote_path)
3144
self.assertEqual(expected_error, translated_error)
3146
def test_ReadOnlyError(self):
3147
translated_error = self.translateTuple(('ReadOnlyError',))
3148
expected_error = errors.TransportNotPossible("readonly transport")
3149
self.assertEqual(expected_error, translated_error)
3151
def test_MemoryError(self):
3152
translated_error = self.translateTuple(('MemoryError',))
3153
self.assertStartsWith(str(translated_error),
3154
"remote server out of memory")
3156
def test_generic_IndexError_no_classname(self):
3157
err = errors.ErrorFromSmartServer(('error', "list index out of range"))
3158
translated_error = self.translateErrorFromSmartServer(err)
3159
expected_error = errors.UnknownErrorFromSmartServer(err)
3160
self.assertEqual(expected_error, translated_error)
3162
# GZ 2011-03-02: TODO test generic non-ascii error string
3164
def test_generic_KeyError(self):
3165
err = errors.ErrorFromSmartServer(('error', 'KeyError', "1"))
3166
translated_error = self.translateErrorFromSmartServer(err)
3167
expected_error = errors.UnknownErrorFromSmartServer(err)
3168
self.assertEqual(expected_error, translated_error)
2899
3171
class TestErrorTranslationRobustness(TestErrorTranslationBase):
2900
3172
"""Unit tests for bzrlib.remote._translate_error's robustness.
3143
3417
def test_copy_content_into_avoids_revision_history(self):
3144
3418
local = self.make_branch('local')
3145
remote_backing_tree = self.make_branch_and_tree('remote')
3146
remote_backing_tree.commit("Commit.")
3419
builder = self.make_branch_builder('remote')
3420
builder.build_commit(message="Commit.")
3147
3421
remote_branch_url = self.smart_server.get_url() + 'remote'
3148
3422
remote_branch = bzrdir.BzrDir.open(remote_branch_url).open_branch()
3149
3423
local.repository.fetch(remote_branch.repository)
3150
3424
self.hpss_calls = []
3151
3425
remote_branch.copy_content_into(local)
3152
3426
self.assertFalse('Branch.revision_history' in self.hpss_calls)
3428
def test_fetch_everything_needs_just_one_call(self):
3429
local = self.make_branch('local')
3430
builder = self.make_branch_builder('remote')
3431
builder.build_commit(message="Commit.")
3432
remote_branch_url = self.smart_server.get_url() + 'remote'
3433
remote_branch = bzrdir.BzrDir.open(remote_branch_url).open_branch()
3434
self.hpss_calls = []
3435
local.repository.fetch(
3436
remote_branch.repository,
3437
fetch_spec=_mod_graph.EverythingResult(remote_branch.repository))
3438
self.assertEqual(['Repository.get_stream_1.19'], self.hpss_calls)
3440
def override_verb(self, verb_name, verb):
3441
request_handlers = request.request_handlers
3442
orig_verb = request_handlers.get(verb_name)
3443
request_handlers.register(verb_name, verb, override_existing=True)
3444
self.addCleanup(request_handlers.register, verb_name, orig_verb,
3445
override_existing=True)
3447
def test_fetch_everything_backwards_compat(self):
3448
"""Can fetch with EverythingResult even with pre 2.4 servers.
3450
Pre-2.4 do not support 'everything' searches with the
3451
Repository.get_stream_1.19 verb.
3454
class OldGetStreamVerb(SmartServerRepositoryGetStream_1_19):
3455
"""A version of the Repository.get_stream_1.19 verb patched to
3456
reject 'everything' searches the way 2.3 and earlier do.
3458
def recreate_search(self, repository, search_bytes,
3459
discard_excess=False):
3460
verb_log.append(search_bytes.split('\n', 1)[0])
3461
if search_bytes == 'everything':
3463
request.FailedSmartServerResponse(('BadSearch',)))
3464
return super(OldGetStreamVerb,
3465
self).recreate_search(repository, search_bytes,
3466
discard_excess=discard_excess)
3467
self.override_verb('Repository.get_stream_1.19', OldGetStreamVerb)
3468
local = self.make_branch('local')
3469
builder = self.make_branch_builder('remote')
3470
builder.build_commit(message="Commit.")
3471
remote_branch_url = self.smart_server.get_url() + 'remote'
3472
remote_branch = bzrdir.BzrDir.open(remote_branch_url).open_branch()
3473
self.hpss_calls = []
3474
local.repository.fetch(
3475
remote_branch.repository,
3476
fetch_spec=_mod_graph.EverythingResult(remote_branch.repository))
3477
# make sure the overridden verb was used
3478
self.assertLength(1, verb_log)
3479
# more than one HPSS call is needed, but because it's a VFS callback
3480
# its hard to predict exactly how many.
3481
self.assertTrue(len(self.hpss_calls) > 1)
3484
class TestUpdateBoundBranchWithModifiedBoundLocation(
3485
tests.TestCaseWithTransport):
3486
"""Ensure correct handling of bound_location modifications.
3488
This is tested against a smart server as http://pad.lv/786980 was about a
3489
ReadOnlyError (write attempt during a read-only transaction) which can only
3490
happen in this context.
3494
super(TestUpdateBoundBranchWithModifiedBoundLocation, self).setUp()
3495
self.transport_server = test_server.SmartTCPServer_for_testing
3497
def make_master_and_checkout(self, master_name, checkout_name):
3498
# Create the master branch and its associated checkout
3499
self.master = self.make_branch_and_tree(master_name)
3500
self.checkout = self.master.branch.create_checkout(checkout_name)
3501
# Modify the master branch so there is something to update
3502
self.master.commit('add stuff')
3503
self.last_revid = self.master.commit('even more stuff')
3504
self.bound_location = self.checkout.branch.get_bound_location()
3506
def assertUpdateSucceeds(self, new_location):
3507
self.checkout.branch.set_bound_location(new_location)
3508
self.checkout.update()
3509
self.assertEquals(self.last_revid, self.checkout.last_revision())
3511
def test_without_final_slash(self):
3512
self.make_master_and_checkout('master', 'checkout')
3513
# For unclear reasons some users have a bound_location without a final
3514
# '/', simulate that by forcing such a value
3515
self.assertEndsWith(self.bound_location, '/')
3516
self.assertUpdateSucceeds(self.bound_location.rstrip('/'))
3518
def test_plus_sign(self):
3519
self.make_master_and_checkout('+master', 'checkout')
3520
self.assertUpdateSucceeds(self.bound_location.replace('%2B', '+', 1))
3522
def test_tilda(self):
3523
# Embed ~ in the middle of the path just to avoid any $HOME
3525
self.make_master_and_checkout('mas~ter', 'checkout')
3526
self.assertUpdateSucceeds(self.bound_location.replace('%2E', '~', 1))
added
removed
bzrlib/tests/test_remote.py
