1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
|
# Copyright (C) 2006, 2007, 2008 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Tests for remote bzrdir/branch/repo/etc
These are proxy objects which act on remote objects by sending messages
through a smart client. The proxies are to be created when attempting to open
the object given a transport that supports smartserver rpc operations.
These tests correspond to tests.test_smart, which exercises the server side.
"""
import bz2
from cStringIO import StringIO
from bzrlib import (
errors,
graph,
pack,
remote,
repository,
tests,
)
from bzrlib.branch import Branch
from bzrlib.bzrdir import BzrDir, BzrDirFormat
from bzrlib.remote import (
RemoteBranch,
RemoteBzrDir,
RemoteBzrDirFormat,
RemoteRepository,
)
from bzrlib.revision import NULL_REVISION
from bzrlib.smart import server, medium
from bzrlib.smart.client import _SmartClient
from bzrlib.symbol_versioning import one_four
from bzrlib.transport import get_transport, http
from bzrlib.transport.memory import MemoryTransport
from bzrlib.transport.remote import RemoteTransport, RemoteTCPTransport
class BasicRemoteObjectTests(tests.TestCaseWithTransport):
def setUp(self):
self.transport_server = server.SmartTCPServer_for_testing
super(BasicRemoteObjectTests, self).setUp()
self.transport = self.get_transport()
# make a branch that can be opened over the smart transport
self.local_wt = BzrDir.create_standalone_workingtree('.')
def tearDown(self):
self.transport.disconnect()
tests.TestCaseWithTransport.tearDown(self)
def test_create_remote_bzrdir(self):
b = remote.RemoteBzrDir(self.transport)
self.assertIsInstance(b, BzrDir)
def test_open_remote_branch(self):
# open a standalone branch in the working directory
b = remote.RemoteBzrDir(self.transport)
branch = b.open_branch()
self.assertIsInstance(branch, Branch)
def test_remote_repository(self):
b = BzrDir.open_from_transport(self.transport)
repo = b.open_repository()
revid = u'\xc823123123'.encode('utf8')
self.assertFalse(repo.has_revision(revid))
self.local_wt.commit(message='test commit', rev_id=revid)
self.assertTrue(repo.has_revision(revid))
def test_remote_branch_revision_history(self):
b = BzrDir.open_from_transport(self.transport).open_branch()
self.assertEqual([], b.revision_history())
r1 = self.local_wt.commit('1st commit')
r2 = self.local_wt.commit('1st commit', rev_id=u'\xc8'.encode('utf8'))
self.assertEqual([r1, r2], b.revision_history())
def test_find_correct_format(self):
"""Should open a RemoteBzrDir over a RemoteTransport"""
fmt = BzrDirFormat.find_format(self.transport)
self.assertTrue(RemoteBzrDirFormat
in BzrDirFormat._control_server_formats)
self.assertIsInstance(fmt, remote.RemoteBzrDirFormat)
def test_open_detected_smart_format(self):
fmt = BzrDirFormat.find_format(self.transport)
d = fmt.open(self.transport)
self.assertIsInstance(d, BzrDir)
def test_remote_branch_repr(self):
b = BzrDir.open_from_transport(self.transport).open_branch()
self.assertStartsWith(str(b), 'RemoteBranch(')
class FakeProtocol(object):
"""Lookalike SmartClientRequestProtocolOne allowing body reading tests."""
def __init__(self, body, fake_client):
self.body = body
self._body_buffer = None
self._fake_client = fake_client
def read_body_bytes(self, count=-1):
if self._body_buffer is None:
self._body_buffer = StringIO(self.body)
bytes = self._body_buffer.read(count)
if self._body_buffer.tell() == len(self._body_buffer.getvalue()):
self._fake_client.expecting_body = False
return bytes
def cancel_read_body(self):
self._fake_client.expecting_body = False
def read_streamed_body(self):
return self.body
class FakeClient(_SmartClient):
"""Lookalike for _SmartClient allowing testing."""
def __init__(self, fake_medium_base='fake base'):
"""Create a FakeClient.
:param responses: A list of response-tuple, body-data pairs to be sent
back to callers. A special case is if the response-tuple is
'unknown verb', then a UnknownSmartMethod will be raised for that
call, using the second element of the tuple as the verb in the
exception.
"""
self.responses = []
self._calls = []
self.expecting_body = False
_SmartClient.__init__(self, FakeMedium(self._calls, fake_medium_base))
def add_success_response(self, *args):
self.responses.append(('success', args, None))
def add_success_response_with_body(self, body, *args):
self.responses.append(('success', args, body))
def add_error_response(self, *args):
self.responses.append(('error', args))
def add_unknown_method_response(self, verb):
self.responses.append(('unknown', verb))
def _get_next_response(self):
response_tuple = self.responses.pop(0)
if response_tuple[0] == 'unknown':
raise errors.UnknownSmartMethod(response_tuple[1])
elif response_tuple[0] == 'error':
raise errors.ErrorFromSmartServer(response_tuple[1])
return response_tuple
def call(self, method, *args):
self._calls.append(('call', method, args))
return self._get_next_response()[1]
def call_expecting_body(self, method, *args):
self._calls.append(('call_expecting_body', method, args))
result = self._get_next_response()
self.expecting_body = True
return result[1], FakeProtocol(result[2], self)
def call_with_body_bytes_expecting_body(self, method, args, body):
self._calls.append(('call_with_body_bytes_expecting_body', method,
args, body))
result = self._get_next_response()
self.expecting_body = True
return result[1], FakeProtocol(result[2], self)
class FakeMedium(medium.SmartClientMedium):
def __init__(self, client_calls, base):
medium.SmartClientMedium.__init__(self, base)
self._client_calls = client_calls
def disconnect(self):
self._client_calls.append(('disconnect medium',))
class TestVfsHas(tests.TestCase):
def test_unicode_path(self):
client = FakeClient('/')
client.add_success_response('yes',)
transport = RemoteTransport('bzr://localhost/', _client=client)
filename = u'/hell\u00d8'.encode('utf8')
result = transport.has(filename)
self.assertEqual(
[('call', 'has', (filename,))],
client._calls)
self.assertTrue(result)
class Test_ClientMedium_remote_path_from_transport(tests.TestCase):
"""Tests for the behaviour of client_medium.remote_path_from_transport."""
def assertRemotePath(self, expected, client_base, transport_base):
"""Assert that the result of
SmartClientMedium.remote_path_from_transport is the expected value for
a given client_base and transport_base.
"""
client_medium = medium.SmartClientMedium(client_base)
transport = get_transport(transport_base)
result = client_medium.remote_path_from_transport(transport)
self.assertEqual(expected, result)
def test_remote_path_from_transport(self):
"""SmartClientMedium.remote_path_from_transport calculates a URL for
the given transport relative to the root of the client base URL.
"""
self.assertRemotePath('xyz/', 'bzr://host/path', 'bzr://host/xyz')
self.assertRemotePath(
'path/xyz/', 'bzr://host/path', 'bzr://host/path/xyz')
def assertRemotePathHTTP(self, expected, transport_base, relpath):
"""Assert that the result of
HttpTransportBase.remote_path_from_transport is the expected value for
a given transport_base and relpath of that transport. (Note that
HttpTransportBase is a subclass of SmartClientMedium)
"""
base_transport = get_transport(transport_base)
client_medium = base_transport.get_smart_medium()
cloned_transport = base_transport.clone(relpath)
result = client_medium.remote_path_from_transport(cloned_transport)
self.assertEqual(expected, result)
def test_remote_path_from_transport_http(self):
"""Remote paths for HTTP transports are calculated differently to other
transports. They are just relative to the client base, not the root
directory of the host.
"""
for scheme in ['http:', 'https:', 'bzr+http:', 'bzr+https:']:
self.assertRemotePathHTTP(
'../xyz/', scheme + '//host/path', '../xyz/')
self.assertRemotePathHTTP(
'xyz/', scheme + '//host/path', 'xyz/')
class Test_ClientMedium_remote_is_at_least(tests.TestCase):
"""Tests for the behaviour of client_medium.remote_is_at_least."""
def test_initially_unlimited(self):
"""A fresh medium assumes that the remote side supports all
versions.
"""
client_medium = medium.SmartClientMedium('dummy base')
self.assertFalse(client_medium._is_remote_before((99, 99)))
def test__remember_remote_is_before(self):
"""Calling _remember_remote_is_before ratchets down the known remote
version.
"""
client_medium = medium.SmartClientMedium('dummy base')
# Mark the remote side as being less than 1.6. The remote side may
# still be 1.5.
client_medium._remember_remote_is_before((1, 6))
self.assertTrue(client_medium._is_remote_before((1, 6)))
self.assertFalse(client_medium._is_remote_before((1, 5)))
# Calling _remember_remote_is_before again with a lower value works.
client_medium._remember_remote_is_before((1, 5))
self.assertTrue(client_medium._is_remote_before((1, 5)))
# You cannot call _remember_remote_is_before with a larger value.
self.assertRaises(
AssertionError, client_medium._remember_remote_is_before, (1, 9))
class TestBzrDirOpenBranch(tests.TestCase):
def test_branch_present(self):
transport = MemoryTransport()
transport.mkdir('quack')
transport = transport.clone('quack')
client = FakeClient(transport.base)
client.add_success_response('ok', '')
client.add_success_response('ok', '', 'no', 'no', 'no')
bzrdir = RemoteBzrDir(transport, _client=client)
result = bzrdir.open_branch()
self.assertEqual(
[('call', 'BzrDir.open_branch', ('quack/',)),
('call', 'BzrDir.find_repositoryV2', ('quack/',))],
client._calls)
self.assertIsInstance(result, RemoteBranch)
self.assertEqual(bzrdir, result.bzrdir)
def test_branch_missing(self):
transport = MemoryTransport()
transport.mkdir('quack')
transport = transport.clone('quack')
client = FakeClient(transport.base)
client.add_error_response('nobranch')
bzrdir = RemoteBzrDir(transport, _client=client)
self.assertRaises(errors.NotBranchError, bzrdir.open_branch)
self.assertEqual(
[('call', 'BzrDir.open_branch', ('quack/',))],
client._calls)
def test__get_tree_branch(self):
# _get_tree_branch is a form of open_branch, but it should only ask for
# branch opening, not any other network requests.
calls = []
def open_branch():
calls.append("Called")
return "a-branch"
transport = MemoryTransport()
# no requests on the network - catches other api calls being made.
client = FakeClient(transport.base)
bzrdir = RemoteBzrDir(transport, _client=client)
# patch the open_branch call to record that it was called.
bzrdir.open_branch = open_branch
self.assertEqual((None, "a-branch"), bzrdir._get_tree_branch())
self.assertEqual(["Called"], calls)
self.assertEqual([], client._calls)
def test_url_quoting_of_path(self):
# Relpaths on the wire should not be URL-escaped. So "~" should be
# transmitted as "~", not "%7E".
transport = RemoteTCPTransport('bzr://localhost/~hello/')
client = FakeClient(transport.base)
client.add_success_response('ok', '')
client.add_success_response('ok', '', 'no', 'no', 'no')
bzrdir = RemoteBzrDir(transport, _client=client)
result = bzrdir.open_branch()
self.assertEqual(
[('call', 'BzrDir.open_branch', ('~hello/',)),
('call', 'BzrDir.find_repositoryV2', ('~hello/',))],
client._calls)
def check_open_repository(self, rich_root, subtrees, external_lookup='no'):
transport = MemoryTransport()
transport.mkdir('quack')
transport = transport.clone('quack')
if rich_root:
rich_response = 'yes'
else:
rich_response = 'no'
if subtrees:
subtree_response = 'yes'
else:
subtree_response = 'no'
client = FakeClient(transport.base)
client.add_success_response(
'ok', '', rich_response, subtree_response, external_lookup)
bzrdir = RemoteBzrDir(transport, _client=client)
result = bzrdir.open_repository()
self.assertEqual(
[('call', 'BzrDir.find_repositoryV2', ('quack/',))],
client._calls)
self.assertIsInstance(result, RemoteRepository)
self.assertEqual(bzrdir, result.bzrdir)
self.assertEqual(rich_root, result._format.rich_root_data)
self.assertEqual(subtrees, result._format.supports_tree_reference)
def test_open_repository_sets_format_attributes(self):
self.check_open_repository(True, True)
self.check_open_repository(False, True)
self.check_open_repository(True, False)
self.check_open_repository(False, False)
self.check_open_repository(False, False, 'yes')
def test_old_server(self):
"""RemoteBzrDirFormat should fail to probe if the server version is too
old.
"""
self.assertRaises(errors.NotBranchError,
RemoteBzrDirFormat.probe_transport, OldServerTransport())
class TestBzrDirOpenRepository(tests.TestCase):
def test_backwards_compat_1_2(self):
transport = MemoryTransport()
transport.mkdir('quack')
transport = transport.clone('quack')
client = FakeClient(transport.base)
client.add_unknown_method_response('RemoteRepository.find_repositoryV2')
client.add_success_response('ok', '', 'no', 'no')
bzrdir = RemoteBzrDir(transport, _client=client)
repo = bzrdir.open_repository()
self.assertEqual(
[('call', 'BzrDir.find_repositoryV2', ('quack/',)),
('call', 'BzrDir.find_repository', ('quack/',))],
client._calls)
class OldSmartClient(object):
"""A fake smart client for test_old_version that just returns a version one
response to the 'hello' (query version) command.
"""
def get_request(self):
input_file = StringIO('ok\x011\n')
output_file = StringIO()
client_medium = medium.SmartSimplePipesClientMedium(
input_file, output_file)
return medium.SmartClientStreamMediumRequest(client_medium)
def protocol_version(self):
return 1
class OldServerTransport(object):
"""A fake transport for test_old_server that reports it's smart server
protocol version as version one.
"""
def __init__(self):
self.base = 'fake:'
def get_smart_client(self):
return OldSmartClient()
class RemoteBranchTestCase(tests.TestCase):
def make_remote_branch(self, transport, client):
"""Make a RemoteBranch using 'client' as its _SmartClient.
A RemoteBzrDir and RemoteRepository will also be created to fill out
the RemoteBranch, albeit with stub values for some of their attributes.
"""
# we do not want bzrdir to make any remote calls, so use False as its
# _client. If it tries to make a remote call, this will fail
# immediately.
bzrdir = RemoteBzrDir(transport, _client=False)
repo = RemoteRepository(bzrdir, None, _client=client)
return RemoteBranch(bzrdir, repo, _client=client)
class TestBranchLastRevisionInfo(RemoteBranchTestCase):
def test_empty_branch(self):
# in an empty branch we decode the response properly
transport = MemoryTransport()
client = FakeClient(transport.base)
client.add_success_response('ok', '0', 'null:')
transport.mkdir('quack')
transport = transport.clone('quack')
branch = self.make_remote_branch(transport, client)
result = branch.last_revision_info()
self.assertEqual(
[('call', 'Branch.last_revision_info', ('quack/',))],
client._calls)
self.assertEqual((0, NULL_REVISION), result)
def test_non_empty_branch(self):
# in a non-empty branch we also decode the response properly
revid = u'\xc8'.encode('utf8')
transport = MemoryTransport()
client = FakeClient(transport.base)
client.add_success_response('ok', '2', revid)
transport.mkdir('kwaak')
transport = transport.clone('kwaak')
branch = self.make_remote_branch(transport, client)
result = branch.last_revision_info()
self.assertEqual(
[('call', 'Branch.last_revision_info', ('kwaak/',))],
client._calls)
self.assertEqual((2, revid), result)
class TestBranchSetLastRevision(RemoteBranchTestCase):
def test_set_empty(self):
# set_revision_history([]) is translated to calling
# Branch.set_last_revision(path, '') on the wire.
transport = MemoryTransport()
transport.mkdir('branch')
transport = transport.clone('branch')
client = FakeClient(transport.base)
# lock_write
client.add_success_response('ok', 'branch token', 'repo token')
# set_last_revision
client.add_success_response('ok')
# unlock
client.add_success_response('ok')
branch = self.make_remote_branch(transport, client)
branch.lock_write()
client._calls = []
result = branch.set_revision_history([])
self.assertEqual(
[('call', 'Branch.set_last_revision',
('branch/', 'branch token', 'repo token', 'null:'))],
client._calls)
branch.unlock()
self.assertEqual(None, result)
def test_set_nonempty(self):
# set_revision_history([rev-id1, ..., rev-idN]) is translated to calling
# Branch.set_last_revision(path, rev-idN) on the wire.
transport = MemoryTransport()
transport.mkdir('branch')
transport = transport.clone('branch')
client = FakeClient(transport.base)
# lock_write
client.add_success_response('ok', 'branch token', 'repo token')
# set_last_revision
client.add_success_response('ok')
# unlock
client.add_success_response('ok')
branch = self.make_remote_branch(transport, client)
# Lock the branch, reset the record of remote calls.
branch.lock_write()
client._calls = []
result = branch.set_revision_history(['rev-id1', 'rev-id2'])
self.assertEqual(
[('call', 'Branch.set_last_revision',
('branch/', 'branch token', 'repo token', 'rev-id2'))],
client._calls)
branch.unlock()
self.assertEqual(None, result)
def test_no_such_revision(self):
transport = MemoryTransport()
transport.mkdir('branch')
transport = transport.clone('branch')
# A response of 'NoSuchRevision' is translated into an exception.
client = FakeClient(transport.base)
# lock_write
client.add_success_response('ok', 'branch token', 'repo token')
# set_last_revision
client.add_error_response('NoSuchRevision', 'rev-id')
# unlock
client.add_success_response('ok')
branch = self.make_remote_branch(transport, client)
branch.lock_write()
client._calls = []
self.assertRaises(
errors.NoSuchRevision, branch.set_revision_history, ['rev-id'])
branch.unlock()
def test_tip_change_rejected(self):
"""TipChangeRejected responses cause a TipChangeRejected exception to
be raised.
"""
transport = MemoryTransport()
transport.mkdir('branch')
transport = transport.clone('branch')
client = FakeClient(transport.base)
# lock_write
client.add_success_response('ok', 'branch token', 'repo token')
# set_last_revision
rejection_msg_unicode = u'rejection message\N{INTERROBANG}'
rejection_msg_utf8 = rejection_msg_unicode.encode('utf8')
client.add_error_response('TipChangeRejected', rejection_msg_utf8)
# unlock
client.add_success_response('ok')
branch = self.make_remote_branch(transport, client)
branch.lock_write()
self.addCleanup(branch.unlock)
client._calls = []
# The 'TipChangeRejected' error response triggered by calling
# set_revision_history causes a TipChangeRejected exception.
err = self.assertRaises(
errors.TipChangeRejected, branch.set_revision_history, ['rev-id'])
# The UTF-8 message from the response has been decoded into a unicode
# object.
self.assertIsInstance(err.msg, unicode)
self.assertEqual(rejection_msg_unicode, err.msg)
class TestBranchSetLastRevisionInfo(RemoteBranchTestCase):
def test_set_last_revision_info(self):
# set_last_revision_info(num, 'rev-id') is translated to calling
# Branch.set_last_revision_info(num, 'rev-id') on the wire.
transport = MemoryTransport()
transport.mkdir('branch')
transport = transport.clone('branch')
client = FakeClient(transport.base)
# lock_write
client.add_success_response('ok', 'branch token', 'repo token')
# set_last_revision
client.add_success_response('ok')
# unlock
client.add_success_response('ok')
branch = self.make_remote_branch(transport, client)
# Lock the branch, reset the record of remote calls.
branch.lock_write()
client._calls = []
result = branch.set_last_revision_info(1234, 'a-revision-id')
self.assertEqual(
[('call', 'Branch.set_last_revision_info',
('branch/', 'branch token', 'repo token',
'1234', 'a-revision-id'))],
client._calls)
self.assertEqual(None, result)
def test_no_such_revision(self):
# A response of 'NoSuchRevision' is translated into an exception.
transport = MemoryTransport()
transport.mkdir('branch')
transport = transport.clone('branch')
client = FakeClient(transport.base)
# lock_write
client.add_success_response('ok', 'branch token', 'repo token')
# set_last_revision
client.add_error_response('NoSuchRevision', 'revid')
# unlock
client.add_success_response('ok')
branch = self.make_remote_branch(transport, client)
# Lock the branch, reset the record of remote calls.
branch.lock_write()
client._calls = []
self.assertRaises(
errors.NoSuchRevision, branch.set_last_revision_info, 123, 'revid')
branch.unlock()
def lock_remote_branch(self, branch):
"""Trick a RemoteBranch into thinking it is locked."""
branch._lock_mode = 'w'
branch._lock_count = 2
branch._lock_token = 'branch token'
branch._repo_lock_token = 'repo token'
branch.repository._lock_mode = 'w'
branch.repository._lock_count = 2
branch.repository._lock_token = 'repo token'
def test_backwards_compatibility(self):
"""If the server does not support the Branch.set_last_revision_info
verb (which is new in 1.4), then the client falls back to VFS methods.
"""
# This test is a little messy. Unlike most tests in this file, it
# doesn't purely test what a Remote* object sends over the wire, and
# how it reacts to responses from the wire. It instead relies partly
# on asserting that the RemoteBranch will call
# self._real_branch.set_last_revision_info(...).
# First, set up our RemoteBranch with a FakeClient that raises
# UnknownSmartMethod, and a StubRealBranch that logs how it is called.
transport = MemoryTransport()
transport.mkdir('branch')
transport = transport.clone('branch')
client = FakeClient(transport.base)
client.add_unknown_method_response('Branch.set_last_revision_info')
branch = self.make_remote_branch(transport, client)
class StubRealBranch(object):
def __init__(self):
self.calls = []
def set_last_revision_info(self, revno, revision_id):
self.calls.append(
('set_last_revision_info', revno, revision_id))
def _clear_cached_state(self):
pass
real_branch = StubRealBranch()
branch._real_branch = real_branch
self.lock_remote_branch(branch)
# Call set_last_revision_info, and verify it behaved as expected.
result = branch.set_last_revision_info(1234, 'a-revision-id')
self.assertEqual(
[('call', 'Branch.set_last_revision_info',
('branch/', 'branch token', 'repo token',
'1234', 'a-revision-id')),],
client._calls)
self.assertEqual(
[('set_last_revision_info', 1234, 'a-revision-id')],
real_branch.calls)
def test_unexpected_error(self):
# A response of 'NoSuchRevision' is translated into an exception.
transport = MemoryTransport()
transport.mkdir('branch')
transport = transport.clone('branch')
client = FakeClient(transport.base)
# lock_write
client.add_success_response('ok', 'branch token', 'repo token')
# set_last_revision
client.add_error_response('UnexpectedError')
# unlock
client.add_success_response('ok')
branch = self.make_remote_branch(transport, client)
# Lock the branch, reset the record of remote calls.
branch.lock_write()
client._calls = []
err = self.assertRaises(
errors.ErrorFromSmartServer,
branch.set_last_revision_info, 123, 'revid')
self.assertEqual(('UnexpectedError',), err.error_tuple)
branch.unlock()
def test_tip_change_rejected(self):
"""TipChangeRejected responses cause a TipChangeRejected exception to
be raised.
"""
transport = MemoryTransport()
transport.mkdir('branch')
transport = transport.clone('branch')
client = FakeClient(transport.base)
# lock_write
client.add_success_response('ok', 'branch token', 'repo token')
# set_last_revision
client.add_error_response('TipChangeRejected', 'rejection message')
# unlock
client.add_success_response('ok')
branch = self.make_remote_branch(transport, client)
# Lock the branch, reset the record of remote calls.
branch.lock_write()
self.addCleanup(branch.unlock)
client._calls = []
# The 'TipChangeRejected' error response triggered by calling
# set_last_revision_info causes a TipChangeRejected exception.
err = self.assertRaises(
errors.TipChangeRejected,
branch.set_last_revision_info, 123, 'revid')
self.assertEqual('rejection message', err.msg)
class TestBranchControlGetBranchConf(tests.TestCaseWithMemoryTransport):
"""Getting the branch configuration should use an abstract method not vfs.
"""
def test_get_branch_conf(self):
raise tests.KnownFailure('branch.conf is not retrieved by get_config_file')
## # We should see that branch.get_config() does a single rpc to get the
## # remote configuration file, abstracting away where that is stored on
## # the server. However at the moment it always falls back to using the
## # vfs, and this would need some changes in config.py.
## # in an empty branch we decode the response properly
## client = FakeClient([(('ok', ), '# config file body')], self.get_url())
## # we need to make a real branch because the remote_branch.control_files
## # will trigger _ensure_real.
## branch = self.make_branch('quack')
## transport = branch.bzrdir.root_transport
## # we do not want bzrdir to make any remote calls
## bzrdir = RemoteBzrDir(transport, _client=False)
## branch = RemoteBranch(bzrdir, None, _client=client)
## config = branch.get_config()
## self.assertEqual(
## [('call_expecting_body', 'Branch.get_config_file', ('quack/',))],
## client._calls)
class TestBranchLockWrite(RemoteBranchTestCase):
def test_lock_write_unlockable(self):
transport = MemoryTransport()
client = FakeClient(transport.base)
client.add_error_response('UnlockableTransport')
transport.mkdir('quack')
transport = transport.clone('quack')
branch = self.make_remote_branch(transport, client)
self.assertRaises(errors.UnlockableTransport, branch.lock_write)
self.assertEqual(
[('call', 'Branch.lock_write', ('quack/', '', ''))],
client._calls)
class TestTransportIsReadonly(tests.TestCase):
def test_true(self):
client = FakeClient()
client.add_success_response('yes')
transport = RemoteTransport('bzr://example.com/', medium=False,
_client=client)
self.assertEqual(True, transport.is_readonly())
self.assertEqual(
[('call', 'Transport.is_readonly', ())],
client._calls)
def test_false(self):
client = FakeClient()
client.add_success_response('no')
transport = RemoteTransport('bzr://example.com/', medium=False,
_client=client)
self.assertEqual(False, transport.is_readonly())
self.assertEqual(
[('call', 'Transport.is_readonly', ())],
client._calls)
def test_error_from_old_server(self):
"""bzr 0.15 and earlier servers don't recognise the is_readonly verb.
Clients should treat it as a "no" response, because is_readonly is only
advisory anyway (a transport could be read-write, but then the
underlying filesystem could be readonly anyway).
"""
client = FakeClient()
client.add_unknown_method_response('Transport.is_readonly')
transport = RemoteTransport('bzr://example.com/', medium=False,
_client=client)
self.assertEqual(False, transport.is_readonly())
self.assertEqual(
[('call', 'Transport.is_readonly', ())],
client._calls)
class TestRemoteRepository(tests.TestCase):
"""Base for testing RemoteRepository protocol usage.
These tests contain frozen requests and responses. We want any changes to
what is sent or expected to be require a thoughtful update to these tests
because they might break compatibility with different-versioned servers.
"""
def setup_fake_client_and_repository(self, transport_path):
"""Create the fake client and repository for testing with.
There's no real server here; we just have canned responses sent
back one by one.
:param transport_path: Path below the root of the MemoryTransport
where the repository will be created.
"""
transport = MemoryTransport()
transport.mkdir(transport_path)
client = FakeClient(transport.base)
transport = transport.clone(transport_path)
# we do not want bzrdir to make any remote calls
bzrdir = RemoteBzrDir(transport, _client=False)
repo = RemoteRepository(bzrdir, None, _client=client)
return repo, client
class TestRepositoryGatherStats(TestRemoteRepository):
def test_revid_none(self):
# ('ok',), body with revisions and size
transport_path = 'quack'
repo, client = self.setup_fake_client_and_repository(transport_path)
client.add_success_response_with_body(
'revisions: 2\nsize: 18\n', 'ok')
result = repo.gather_stats(None)
self.assertEqual(
[('call_expecting_body', 'Repository.gather_stats',
('quack/','','no'))],
client._calls)
self.assertEqual({'revisions': 2, 'size': 18}, result)
def test_revid_no_committers(self):
# ('ok',), body without committers
body = ('firstrev: 123456.300 3600\n'
'latestrev: 654231.400 0\n'
'revisions: 2\n'
'size: 18\n')
transport_path = 'quick'
revid = u'\xc8'.encode('utf8')
repo, client = self.setup_fake_client_and_repository(transport_path)
client.add_success_response_with_body(body, 'ok')
result = repo.gather_stats(revid)
self.assertEqual(
[('call_expecting_body', 'Repository.gather_stats',
('quick/', revid, 'no'))],
client._calls)
self.assertEqual({'revisions': 2, 'size': 18,
'firstrev': (123456.300, 3600),
'latestrev': (654231.400, 0),},
result)
def test_revid_with_committers(self):
# ('ok',), body with committers
body = ('committers: 128\n'
'firstrev: 123456.300 3600\n'
'latestrev: 654231.400 0\n'
'revisions: 2\n'
'size: 18\n')
transport_path = 'buick'
revid = u'\xc8'.encode('utf8')
repo, client = self.setup_fake_client_and_repository(transport_path)
client.add_success_response_with_body(body, 'ok')
result = repo.gather_stats(revid, True)
self.assertEqual(
[('call_expecting_body', 'Repository.gather_stats',
('buick/', revid, 'yes'))],
client._calls)
self.assertEqual({'revisions': 2, 'size': 18,
'committers': 128,
'firstrev': (123456.300, 3600),
'latestrev': (654231.400, 0),},
result)
class TestRepositoryGetGraph(TestRemoteRepository):
def test_get_graph(self):
# get_graph returns a graph with the repository as the
# parents_provider.
transport_path = 'quack'
repo, client = self.setup_fake_client_and_repository(transport_path)
graph = repo.get_graph()
self.assertEqual(graph._parents_provider, repo)
class TestRepositoryGetParentMap(TestRemoteRepository):
def test_get_parent_map_caching(self):
# get_parent_map returns from cache until unlock()
# setup a reponse with two revisions
r1 = u'\u0e33'.encode('utf8')
r2 = u'\u0dab'.encode('utf8')
lines = [' '.join([r2, r1]), r1]
encoded_body = bz2.compress('\n'.join(lines))
transport_path = 'quack'
repo, client = self.setup_fake_client_and_repository(transport_path)
client.add_success_response_with_body(encoded_body, 'ok')
client.add_success_response_with_body(encoded_body, 'ok')
repo.lock_read()
graph = repo.get_graph()
parents = graph.get_parent_map([r2])
self.assertEqual({r2: (r1,)}, parents)
# locking and unlocking deeper should not reset
repo.lock_read()
repo.unlock()
parents = graph.get_parent_map([r1])
self.assertEqual({r1: (NULL_REVISION,)}, parents)
self.assertEqual(
[('call_with_body_bytes_expecting_body',
'Repository.get_parent_map', ('quack/', r2), '\n\n0')],
client._calls)
repo.unlock()
# now we call again, and it should use the second response.
repo.lock_read()
graph = repo.get_graph()
parents = graph.get_parent_map([r1])
self.assertEqual({r1: (NULL_REVISION,)}, parents)
self.assertEqual(
[('call_with_body_bytes_expecting_body',
'Repository.get_parent_map', ('quack/', r2), '\n\n0'),
('call_with_body_bytes_expecting_body',
'Repository.get_parent_map', ('quack/', r1), '\n\n0'),
],
client._calls)
repo.unlock()
def test_get_parent_map_reconnects_if_unknown_method(self):
transport_path = 'quack'
repo, client = self.setup_fake_client_and_repository(transport_path)
client.add_unknown_method_response('Repository,get_parent_map')
client.add_success_response_with_body('', 'ok')
self.assertFalse(client._medium._is_remote_before((1, 2)))
rev_id = 'revision-id'
expected_deprecations = [
'bzrlib.remote.RemoteRepository.get_revision_graph was deprecated '
'in version 1.4.']
parents = self.callDeprecated(
expected_deprecations, repo.get_parent_map, [rev_id])
self.assertEqual(
[('call_with_body_bytes_expecting_body',
'Repository.get_parent_map', ('quack/', rev_id), '\n\n0'),
('disconnect medium',),
('call_expecting_body', 'Repository.get_revision_graph',
('quack/', ''))],
client._calls)
# The medium is now marked as being connected to an older server
self.assertTrue(client._medium._is_remote_before((1, 2)))
def test_get_parent_map_fallback_parentless_node(self):
"""get_parent_map falls back to get_revision_graph on old servers. The
results from get_revision_graph are tweaked to match the get_parent_map
API.
Specifically, a {key: ()} result from get_revision_graph means "no
parents" for that key, which in get_parent_map results should be
represented as {key: ('null:',)}.
This is the test for https://bugs.launchpad.net/bzr/+bug/214894
"""
rev_id = 'revision-id'
transport_path = 'quack'
repo, client = self.setup_fake_client_and_repository(transport_path)
client.add_success_response_with_body(rev_id, 'ok')
client._medium._remember_remote_is_before((1, 2))
expected_deprecations = [
'bzrlib.remote.RemoteRepository.get_revision_graph was deprecated '
'in version 1.4.']
parents = self.callDeprecated(
expected_deprecations, repo.get_parent_map, [rev_id])
self.assertEqual(
[('call_expecting_body', 'Repository.get_revision_graph',
('quack/', ''))],
client._calls)
self.assertEqual({rev_id: ('null:',)}, parents)
def test_get_parent_map_unexpected_response(self):
repo, client = self.setup_fake_client_and_repository('path')
client.add_success_response('something unexpected!')
self.assertRaises(
errors.UnexpectedSmartServerResponse,
repo.get_parent_map, ['a-revision-id'])
class TestRepositoryGetRevisionGraph(TestRemoteRepository):
def test_null_revision(self):
# a null revision has the predictable result {}, we should have no wire
# traffic when calling it with this argument
transport_path = 'empty'
repo, client = self.setup_fake_client_and_repository(transport_path)
client.add_success_response('notused')
result = self.applyDeprecated(one_four, repo.get_revision_graph,
NULL_REVISION)
self.assertEqual([], client._calls)
self.assertEqual({}, result)
def test_none_revision(self):
# with none we want the entire graph
r1 = u'\u0e33'.encode('utf8')
r2 = u'\u0dab'.encode('utf8')
lines = [' '.join([r2, r1]), r1]
encoded_body = '\n'.join(lines)
transport_path = 'sinhala'
repo, client = self.setup_fake_client_and_repository(transport_path)
client.add_success_response_with_body(encoded_body, 'ok')
result = self.applyDeprecated(one_four, repo.get_revision_graph)
self.assertEqual(
[('call_expecting_body', 'Repository.get_revision_graph',
('sinhala/', ''))],
client._calls)
self.assertEqual({r1: (), r2: (r1, )}, result)
def test_specific_revision(self):
# with a specific revision we want the graph for that
# with none we want the entire graph
r11 = u'\u0e33'.encode('utf8')
r12 = u'\xc9'.encode('utf8')
r2 = u'\u0dab'.encode('utf8')
lines = [' '.join([r2, r11, r12]), r11, r12]
encoded_body = '\n'.join(lines)
transport_path = 'sinhala'
repo, client = self.setup_fake_client_and_repository(transport_path)
client.add_success_response_with_body(encoded_body, 'ok')
result = self.applyDeprecated(one_four, repo.get_revision_graph, r2)
self.assertEqual(
[('call_expecting_body', 'Repository.get_revision_graph',
('sinhala/', r2))],
client._calls)
self.assertEqual({r11: (), r12: (), r2: (r11, r12), }, result)
def test_no_such_revision(self):
revid = '123'
transport_path = 'sinhala'
repo, client = self.setup_fake_client_and_repository(transport_path)
client.add_error_response('nosuchrevision', revid)
# also check that the right revision is reported in the error
self.assertRaises(errors.NoSuchRevision,
self.applyDeprecated, one_four, repo.get_revision_graph, revid)
self.assertEqual(
[('call_expecting_body', 'Repository.get_revision_graph',
('sinhala/', revid))],
client._calls)
def test_unexpected_error(self):
revid = '123'
transport_path = 'sinhala'
repo, client = self.setup_fake_client_and_repository(transport_path)
client.add_error_response('AnUnexpectedError')
e = self.assertRaises(errors.ErrorFromSmartServer,
self.applyDeprecated, one_four, repo.get_revision_graph, revid)
self.assertEqual(('AnUnexpectedError',), e.error_tuple)
class TestRepositoryIsShared(TestRemoteRepository):
def test_is_shared(self):
# ('yes', ) for Repository.is_shared -> 'True'.
transport_path = 'quack'
repo, client = self.setup_fake_client_and_repository(transport_path)
client.add_success_response('yes')
result = repo.is_shared()
self.assertEqual(
[('call', 'Repository.is_shared', ('quack/',))],
client._calls)
self.assertEqual(True, result)
def test_is_not_shared(self):
# ('no', ) for Repository.is_shared -> 'False'.
transport_path = 'qwack'
repo, client = self.setup_fake_client_and_repository(transport_path)
client.add_success_response('no')
result = repo.is_shared()
self.assertEqual(
[('call', 'Repository.is_shared', ('qwack/',))],
client._calls)
self.assertEqual(False, result)
class TestRepositoryLockWrite(TestRemoteRepository):
def test_lock_write(self):
transport_path = 'quack'
repo, client = self.setup_fake_client_and_repository(transport_path)
client.add_success_response('ok', 'a token')
result = repo.lock_write()
self.assertEqual(
[('call', 'Repository.lock_write', ('quack/', ''))],
client._calls)
self.assertEqual('a token', result)
def test_lock_write_already_locked(self):
transport_path = 'quack'
repo, client = self.setup_fake_client_and_repository(transport_path)
client.add_error_response('LockContention')
self.assertRaises(errors.LockContention, repo.lock_write)
self.assertEqual(
[('call', 'Repository.lock_write', ('quack/', ''))],
client._calls)
def test_lock_write_unlockable(self):
transport_path = 'quack'
repo, client = self.setup_fake_client_and_repository(transport_path)
client.add_error_response('UnlockableTransport')
self.assertRaises(errors.UnlockableTransport, repo.lock_write)
self.assertEqual(
[('call', 'Repository.lock_write', ('quack/', ''))],
client._calls)
class TestRepositoryUnlock(TestRemoteRepository):
def test_unlock(self):
transport_path = 'quack'
repo, client = self.setup_fake_client_and_repository(transport_path)
client.add_success_response('ok', 'a token')
client.add_success_response('ok')
repo.lock_write()
repo.unlock()
self.assertEqual(
[('call', 'Repository.lock_write', ('quack/', '')),
('call', 'Repository.unlock', ('quack/', 'a token'))],
client._calls)
def test_unlock_wrong_token(self):
# If somehow the token is wrong, unlock will raise TokenMismatch.
transport_path = 'quack'
repo, client = self.setup_fake_client_and_repository(transport_path)
client.add_success_response('ok', 'a token')
client.add_error_response('TokenMismatch')
repo.lock_write()
self.assertRaises(errors.TokenMismatch, repo.unlock)
class TestRepositoryHasRevision(TestRemoteRepository):
def test_none(self):
# repo.has_revision(None) should not cause any traffic.
transport_path = 'quack'
repo, client = self.setup_fake_client_and_repository(transport_path)
# The null revision is always there, so has_revision(None) == True.
self.assertEqual(True, repo.has_revision(NULL_REVISION))
# The remote repo shouldn't be accessed.
self.assertEqual([], client._calls)
class TestRepositoryTarball(TestRemoteRepository):
# This is a canned tarball reponse we can validate against
tarball_content = (
'QlpoOTFBWSZTWdGkj3wAAWF/k8aQACBIB//A9+8cIX/v33AACEAYABAECEACNz'
'JqsgJJFPTSnk1A3qh6mTQAAAANPUHkagkSTEkaA09QaNAAAGgAAAcwCYCZGAEY'
'mJhMJghpiaYBUkKammSHqNMZQ0NABkNAeo0AGneAevnlwQoGzEzNVzaYxp/1Uk'
'xXzA1CQX0BJMZZLcPBrluJir5SQyijWHYZ6ZUtVqqlYDdB2QoCwa9GyWwGYDMA'
'OQYhkpLt/OKFnnlT8E0PmO8+ZNSo2WWqeCzGB5fBXZ3IvV7uNJVE7DYnWj6qwB'
'k5DJDIrQ5OQHHIjkS9KqwG3mc3t+F1+iujb89ufyBNIKCgeZBWrl5cXxbMGoMs'
'c9JuUkg5YsiVcaZJurc6KLi6yKOkgCUOlIlOpOoXyrTJjK8ZgbklReDdwGmFgt'
'dkVsAIslSVCd4AtACSLbyhLHryfb14PKegrVDba+U8OL6KQtzdM5HLjAc8/p6n'
'0lgaWU8skgO7xupPTkyuwheSckejFLK5T4ZOo0Gda9viaIhpD1Qn7JqqlKAJqC'
'QplPKp2nqBWAfwBGaOwVrz3y1T+UZZNismXHsb2Jq18T+VaD9k4P8DqE3g70qV'
'JLurpnDI6VS5oqDDPVbtVjMxMxMg4rzQVipn2Bv1fVNK0iq3Gl0hhnnHKm/egy'
'nWQ7QH/F3JFOFCQ0aSPfA='
).decode('base64')
def test_repository_tarball(self):
# Test that Repository.tarball generates the right operations
transport_path = 'repo'
expected_calls = [('call_expecting_body', 'Repository.tarball',
('repo/', 'bz2',),),
]
repo, client = self.setup_fake_client_and_repository(transport_path)
client.add_success_response_with_body(self.tarball_content, 'ok')
# Now actually ask for the tarball
tarball_file = repo._get_tarball('bz2')
try:
self.assertEqual(expected_calls, client._calls)
self.assertEqual(self.tarball_content, tarball_file.read())
finally:
tarball_file.close()
class TestRemoteRepositoryCopyContent(tests.TestCaseWithTransport):
"""RemoteRepository.copy_content_into optimizations"""
def test_copy_content_remote_to_local(self):
self.transport_server = server.SmartTCPServer_for_testing
src_repo = self.make_repository('repo1')
src_repo = repository.Repository.open(self.get_url('repo1'))
# At the moment the tarball-based copy_content_into can't write back
# into a smart server. It would be good if it could upload the
# tarball; once that works we'd have to create repositories of
# different formats. -- mbp 20070410
dest_url = self.get_vfs_only_url('repo2')
dest_bzrdir = BzrDir.create(dest_url)
dest_repo = dest_bzrdir.create_repository()
self.assertFalse(isinstance(dest_repo, RemoteRepository))
self.assertTrue(isinstance(src_repo, RemoteRepository))
src_repo.copy_content_into(dest_repo)
class TestErrorTranslationBase(tests.TestCaseWithMemoryTransport):
"""Base class for unit tests for bzrlib.remote._translate_error."""
def translateTuple(self, error_tuple, **context):
"""Call _translate_error with an ErrorFromSmartServer built from the
given error_tuple.
:param error_tuple: A tuple of a smart server response, as would be
passed to an ErrorFromSmartServer.
:kwargs context: context items to call _translate_error with.
:returns: The error raised by _translate_error.
"""
# Raise the ErrorFromSmartServer before passing it as an argument,
# because _translate_error may need to re-raise it with a bare 'raise'
# statement.
server_error = errors.ErrorFromSmartServer(error_tuple)
translated_error = self.translateErrorFromSmartServer(
server_error, **context)
return translated_error
def translateErrorFromSmartServer(self, error_object, **context):
"""Like translateTuple, but takes an already constructed
ErrorFromSmartServer rather than a tuple.
"""
try:
raise error_object
except errors.ErrorFromSmartServer, server_error:
translated_error = self.assertRaises(
errors.BzrError, remote._translate_error, server_error,
**context)
return translated_error
class TestErrorTranslationSuccess(TestErrorTranslationBase):
"""Unit tests for bzrlib.remote._translate_error.
Given an ErrorFromSmartServer (which has an error tuple from a smart
server) and some context, _translate_error raises more specific errors from
bzrlib.errors.
This test case covers the cases where _translate_error succeeds in
translating an ErrorFromSmartServer to something better. See
TestErrorTranslationRobustness for other cases.
"""
def test_NoSuchRevision(self):
branch = self.make_branch('')
revid = 'revid'
translated_error = self.translateTuple(
('NoSuchRevision', revid), branch=branch)
expected_error = errors.NoSuchRevision(branch, revid)
self.assertEqual(expected_error, translated_error)
def test_nosuchrevision(self):
repository = self.make_repository('')
revid = 'revid'
translated_error = self.translateTuple(
('nosuchrevision', revid), repository=repository)
expected_error = errors.NoSuchRevision(repository, revid)
self.assertEqual(expected_error, translated_error)
def test_nobranch(self):
bzrdir = self.make_bzrdir('')
translated_error = self.translateTuple(('nobranch',), bzrdir=bzrdir)
expected_error = errors.NotBranchError(path=bzrdir.root_transport.base)
self.assertEqual(expected_error, translated_error)
def test_LockContention(self):
translated_error = self.translateTuple(('LockContention',))
expected_error = errors.LockContention('(remote lock)')
self.assertEqual(expected_error, translated_error)
def test_UnlockableTransport(self):
bzrdir = self.make_bzrdir('')
translated_error = self.translateTuple(
('UnlockableTransport',), bzrdir=bzrdir)
expected_error = errors.UnlockableTransport(bzrdir.root_transport)
self.assertEqual(expected_error, translated_error)
def test_LockFailed(self):
lock = 'str() of a server lock'
why = 'str() of why'
translated_error = self.translateTuple(('LockFailed', lock, why))
expected_error = errors.LockFailed(lock, why)
self.assertEqual(expected_error, translated_error)
def test_TokenMismatch(self):
token = 'a lock token'
translated_error = self.translateTuple(('TokenMismatch',), token=token)
expected_error = errors.TokenMismatch(token, '(remote token)')
self.assertEqual(expected_error, translated_error)
def test_Diverged(self):
branch = self.make_branch('a')
other_branch = self.make_branch('b')
translated_error = self.translateTuple(
('Diverged',), branch=branch, other_branch=other_branch)
expected_error = errors.DivergedBranches(branch, other_branch)
self.assertEqual(expected_error, translated_error)
class TestErrorTranslationRobustness(TestErrorTranslationBase):
"""Unit tests for bzrlib.remote._translate_error's robustness.
TestErrorTranslationSuccess is for cases where _translate_error can
translate successfully. This class about how _translate_err behaves when
it fails to translate: it re-raises the original error.
"""
def test_unrecognised_server_error(self):
"""If the error code from the server is not recognised, the original
ErrorFromSmartServer is propagated unmodified.
"""
error_tuple = ('An unknown error tuple',)
server_error = errors.ErrorFromSmartServer(error_tuple)
translated_error = self.translateErrorFromSmartServer(server_error)
self.assertEqual(server_error, translated_error)
def test_context_missing_a_key(self):
"""In case of a bug in the client, or perhaps an unexpected response
from a server, _translate_error returns the original error tuple from
the server and mutters a warning.
"""
# To translate a NoSuchRevision error _translate_error needs a 'branch'
# in the context dict. So let's give it an empty context dict instead
# to exercise its error recovery.
empty_context = {}
error_tuple = ('NoSuchRevision', 'revid')
server_error = errors.ErrorFromSmartServer(error_tuple)
translated_error = self.translateErrorFromSmartServer(server_error)
self.assertEqual(server_error, translated_error)
# In addition to re-raising ErrorFromSmartServer, some debug info has
# been muttered to the log file for developer to look at.
self.assertContainsRe(
self._get_log(keep_log_file=True),
"Missing key 'branch' in context")
|