104
77
# the default or a parameterized class, but rather use the
105
78
# TestCaseWithTransport infrastructure to set up a smart server and
107
self.overrideAttr(self, "transport_server", self.make_transport_server)
109
def make_transport_server(self):
110
return test_server.SmartTCPServer_for_testing('-' + self.id())
80
self.transport_server = smart.server.SmartTCPServer_for_testing
112
82
def get_smart_medium(self):
113
83
"""Get a smart medium to use in tests."""
114
84
return self.get_transport().get_smart_medium()
117
class TestByteStreamToStream(tests.TestCase):
119
def test_repeated_substreams_same_kind_are_one_stream(self):
120
# Make a stream - an iterable of bytestrings.
121
stream = [('text', [versionedfile.FulltextContentFactory(('k1',), None,
122
None, 'foo')]),('text', [
123
versionedfile.FulltextContentFactory(('k2',), None, None, 'bar')])]
124
fmt = controldir.format_registry.get('pack-0.92')().repository_format
125
bytes = smart_repo._stream_to_byte_stream(stream, fmt)
127
# Iterate the resulting iterable; checking that we get only one stream
129
fmt, stream = smart_repo._byte_stream_to_stream(bytes)
130
for kind, substream in stream:
131
streams.append((kind, list(substream)))
132
self.assertLength(1, streams)
133
self.assertLength(2, streams[0][1])
136
87
class TestSmartServerResponse(tests.TestCase):
138
89
def test__eq__(self):
139
self.assertEqual(smart_req.SmartServerResponse(('ok', )),
140
smart_req.SmartServerResponse(('ok', )))
141
self.assertEqual(smart_req.SmartServerResponse(('ok', ), 'body'),
142
smart_req.SmartServerResponse(('ok', ), 'body'))
143
self.assertNotEqual(smart_req.SmartServerResponse(('ok', )),
144
smart_req.SmartServerResponse(('notok', )))
145
self.assertNotEqual(smart_req.SmartServerResponse(('ok', ), 'body'),
146
smart_req.SmartServerResponse(('ok', )))
90
self.assertEqual(SmartServerResponse(('ok', )),
91
SmartServerResponse(('ok', )))
92
self.assertEqual(SmartServerResponse(('ok', ), 'body'),
93
SmartServerResponse(('ok', ), 'body'))
94
self.assertNotEqual(SmartServerResponse(('ok', )),
95
SmartServerResponse(('notok', )))
96
self.assertNotEqual(SmartServerResponse(('ok', ), 'body'),
97
SmartServerResponse(('ok', )))
147
98
self.assertNotEqual(None,
148
smart_req.SmartServerResponse(('ok', )))
150
def test__str__(self):
151
"""SmartServerResponses can be stringified."""
153
"<SuccessfulSmartServerResponse args=('args',) body='body'>",
154
str(smart_req.SuccessfulSmartServerResponse(('args',), 'body')))
156
"<FailedSmartServerResponse args=('args',) body='body'>",
157
str(smart_req.FailedSmartServerResponse(('args',), 'body')))
160
class TestSmartServerRequest(tests.TestCaseWithMemoryTransport):
162
def test_translate_client_path(self):
163
transport = self.get_transport()
164
request = smart_req.SmartServerRequest(transport, 'foo/')
165
self.assertEqual('./', request.translate_client_path('foo/'))
167
errors.InvalidURLJoin, request.translate_client_path, 'foo/..')
169
errors.PathNotChild, request.translate_client_path, '/')
171
errors.PathNotChild, request.translate_client_path, 'bar/')
172
self.assertEqual('./baz', request.translate_client_path('foo/baz'))
173
e_acute = u'\N{LATIN SMALL LETTER E WITH ACUTE}'.encode('utf-8')
174
self.assertEqual('./' + urlutils.escape(e_acute),
175
request.translate_client_path('foo/' + e_acute))
177
def test_translate_client_path_vfs(self):
178
"""VfsRequests receive escaped paths rather than raw UTF-8."""
179
transport = self.get_transport()
180
request = vfs.VfsRequest(transport, 'foo/')
181
e_acute = u'\N{LATIN SMALL LETTER E WITH ACUTE}'.encode('utf-8')
182
escaped = urlutils.escape('foo/' + e_acute)
183
self.assertEqual('./' + urlutils.escape(e_acute),
184
request.translate_client_path(escaped))
186
def test_transport_from_client_path(self):
187
transport = self.get_transport()
188
request = smart_req.SmartServerRequest(transport, 'foo/')
191
request.transport_from_client_path('foo/').base)
194
class TestSmartServerBzrDirRequestCloningMetaDir(
195
tests.TestCaseWithMemoryTransport):
196
"""Tests for BzrDir.cloning_metadir."""
198
def test_cloning_metadir(self):
199
"""When there is a bzrdir present, the call succeeds."""
200
backing = self.get_transport()
201
dir = self.make_bzrdir('.')
202
local_result = dir.cloning_metadir()
203
request_class = smart_dir.SmartServerBzrDirRequestCloningMetaDir
204
request = request_class(backing)
205
expected = smart_req.SuccessfulSmartServerResponse(
206
(local_result.network_name(),
207
local_result.repository_format.network_name(),
208
('branch', local_result.get_branch_format().network_name())))
209
self.assertEqual(expected, request.execute('', 'False'))
211
def test_cloning_metadir_reference(self):
212
"""The request fails when bzrdir contains a branch reference."""
213
backing = self.get_transport()
214
referenced_branch = self.make_branch('referenced')
215
dir = self.make_bzrdir('.')
216
local_result = dir.cloning_metadir()
217
reference = _mod_branch.BranchReferenceFormat().initialize(
218
dir, target_branch=referenced_branch)
219
reference_url = _mod_branch.BranchReferenceFormat().get_reference(dir)
220
# The server shouldn't try to follow the branch reference, so it's fine
221
# if the referenced branch isn't reachable.
222
backing.rename('referenced', 'moved')
223
request_class = smart_dir.SmartServerBzrDirRequestCloningMetaDir
224
request = request_class(backing)
225
expected = smart_req.FailedSmartServerResponse(('BranchReference',))
226
self.assertEqual(expected, request.execute('', 'False'))
229
class TestSmartServerBzrDirRequestCloningMetaDir(
230
tests.TestCaseWithMemoryTransport):
231
"""Tests for BzrDir.checkout_metadir."""
233
def test_checkout_metadir(self):
234
backing = self.get_transport()
235
request = smart_dir.SmartServerBzrDirRequestCheckoutMetaDir(
237
branch = self.make_branch('.', format='2a')
238
response = request.execute('')
240
smart_req.SmartServerResponse(
241
('Bazaar-NG meta directory, format 1\n',
242
'Bazaar repository format 2a (needs bzr 1.16 or later)\n',
243
'Bazaar Branch Format 7 (needs bzr 1.6)\n')),
247
class TestSmartServerBzrDirRequestDestroyBranch(
248
tests.TestCaseWithMemoryTransport):
249
"""Tests for BzrDir.destroy_branch."""
251
def test_destroy_branch_default(self):
252
"""The default branch can be removed."""
253
backing = self.get_transport()
254
dir = self.make_branch('.').bzrdir
255
request_class = smart_dir.SmartServerBzrDirRequestDestroyBranch
256
request = request_class(backing)
257
expected = smart_req.SuccessfulSmartServerResponse(('ok',))
258
self.assertEqual(expected, request.execute('', None))
260
def test_destroy_branch_named(self):
261
"""A named branch can be removed."""
262
backing = self.get_transport()
263
dir = self.make_repository('.', format="development-colo").bzrdir
264
dir.create_branch(name="branchname")
265
request_class = smart_dir.SmartServerBzrDirRequestDestroyBranch
266
request = request_class(backing)
267
expected = smart_req.SuccessfulSmartServerResponse(('ok',))
268
self.assertEqual(expected, request.execute('', "branchname"))
270
def test_destroy_branch_missing(self):
271
"""An error is raised if the branch didn't exist."""
272
backing = self.get_transport()
273
dir = self.make_bzrdir('.', format="development-colo")
274
request_class = smart_dir.SmartServerBzrDirRequestDestroyBranch
275
request = request_class(backing)
276
expected = smart_req.FailedSmartServerResponse(('nobranch',), None)
277
self.assertEqual(expected, request.execute('', "branchname"))
280
class TestSmartServerBzrDirRequestHasWorkingTree(
281
tests.TestCaseWithTransport):
282
"""Tests for BzrDir.has_workingtree."""
284
def test_has_workingtree_yes(self):
285
"""A working tree is present."""
286
backing = self.get_transport()
287
dir = self.make_branch_and_tree('.').bzrdir
288
request_class = smart_dir.SmartServerBzrDirRequestHasWorkingTree
289
request = request_class(backing)
290
expected = smart_req.SuccessfulSmartServerResponse(('yes',))
291
self.assertEqual(expected, request.execute(''))
293
def test_has_workingtree_no(self):
294
"""A working tree is missing."""
295
backing = self.get_transport()
296
dir = self.make_bzrdir('.')
297
request_class = smart_dir.SmartServerBzrDirRequestHasWorkingTree
298
request = request_class(backing)
299
expected = smart_req.SuccessfulSmartServerResponse(('no',))
300
self.assertEqual(expected, request.execute(''))
303
class TestSmartServerBzrDirRequestDestroyRepository(
304
tests.TestCaseWithMemoryTransport):
305
"""Tests for BzrDir.destroy_repository."""
307
def test_destroy_repository_default(self):
308
"""The repository can be removed."""
309
backing = self.get_transport()
310
dir = self.make_repository('.').bzrdir
311
request_class = smart_dir.SmartServerBzrDirRequestDestroyRepository
312
request = request_class(backing)
313
expected = smart_req.SuccessfulSmartServerResponse(('ok',))
314
self.assertEqual(expected, request.execute(''))
316
def test_destroy_repository_missing(self):
317
"""An error is raised if the repository didn't exist."""
318
backing = self.get_transport()
319
dir = self.make_bzrdir('.')
320
request_class = smart_dir.SmartServerBzrDirRequestDestroyRepository
321
request = request_class(backing)
322
expected = smart_req.FailedSmartServerResponse(
323
('norepository',), None)
324
self.assertEqual(expected, request.execute(''))
327
class TestSmartServerRequestCreateRepository(tests.TestCaseWithMemoryTransport):
328
"""Tests for BzrDir.create_repository."""
330
def test_makes_repository(self):
331
"""When there is a bzrdir present, the call succeeds."""
332
backing = self.get_transport()
333
self.make_bzrdir('.')
334
request_class = smart_dir.SmartServerRequestCreateRepository
335
request = request_class(backing)
336
reference_bzrdir_format = controldir.format_registry.get('pack-0.92')()
337
reference_format = reference_bzrdir_format.repository_format
338
network_name = reference_format.network_name()
339
expected = smart_req.SuccessfulSmartServerResponse(
340
('ok', 'no', 'no', 'no', network_name))
341
self.assertEqual(expected, request.execute('', network_name, 'True'))
344
class TestSmartServerRequestFindRepository(tests.TestCaseWithMemoryTransport):
99
SmartServerResponse(('ok', )))
102
class TestSmartServerRequestFindRepository(tests.TestCaseWithTransport):
345
103
"""Tests for BzrDir.find_repository."""
347
105
def test_no_repository(self):
381
if repo._format.supports_external_lookups:
385
if (smart_dir.SmartServerRequestFindRepositoryV3 ==
386
self._request_class):
387
return smart_req.SuccessfulSmartServerResponse(
388
('ok', '', rich_root, subtrees, external,
389
repo._format.network_name()))
390
elif (smart_dir.SmartServerRequestFindRepositoryV2 ==
139
if (smart.bzrdir.SmartServerRequestFindRepositoryV2 ==
391
140
self._request_class):
392
141
# All tests so far are on formats, and for non-external
394
return smart_req.SuccessfulSmartServerResponse(
395
('ok', '', rich_root, subtrees, external))
143
return SuccessfulSmartServerResponse(
144
('ok', '', rich_root, subtrees, 'no'))
397
return smart_req.SuccessfulSmartServerResponse(
398
('ok', '', rich_root, subtrees))
146
return SuccessfulSmartServerResponse(('ok', '', rich_root, subtrees))
400
148
def test_shared_repository(self):
401
149
"""When there is a shared repository, we get 'ok', 'relpath-to-repo'."""
402
150
backing = self.get_transport()
403
151
request = self._request_class(backing)
404
152
result = self._make_repository_and_result(shared=True)
405
self.assertEqual(result, request.execute(''))
153
self.assertEqual(result, request.execute(backing.local_abspath('')))
406
154
self.make_bzrdir('subdir')
407
result2 = smart_req.SmartServerResponse(
408
result.args[0:1] + ('..', ) + result.args[2:])
155
result2 = SmartServerResponse(result.args[0:1] + ('..', ) + result.args[2:])
409
156
self.assertEqual(result2,
410
request.execute('subdir'))
157
request.execute(backing.local_abspath('subdir')))
411
158
self.make_bzrdir('subdir/deeper')
412
result3 = smart_req.SmartServerResponse(
413
result.args[0:1] + ('../..', ) + result.args[2:])
159
result3 = SmartServerResponse(result.args[0:1] + ('../..', ) + result.args[2:])
414
160
self.assertEqual(result3,
415
request.execute('subdir/deeper'))
161
request.execute(backing.local_abspath('subdir/deeper')))
417
163
def test_rich_root_and_subtree_encoding(self):
418
164
"""Test for the format attributes for rich root and subtree support."""
419
165
backing = self.get_transport()
420
166
request = self._request_class(backing)
421
result = self._make_repository_and_result(
422
format='development-subtree')
167
result = self._make_repository_and_result(format='dirstate-with-subtree')
423
168
# check the test will be valid
424
169
self.assertEqual('yes', result.args[2])
425
170
self.assertEqual('yes', result.args[3])
426
self.assertEqual(result, request.execute(''))
171
self.assertEqual(result, request.execute(backing.local_abspath('')))
428
173
def test_supports_external_lookups_no_v2(self):
429
174
"""Test for the supports_external_lookups attribute."""
430
175
backing = self.get_transport()
431
176
request = self._request_class(backing)
432
result = self._make_repository_and_result(
433
format='development-subtree')
177
result = self._make_repository_and_result(format='dirstate-with-subtree')
434
178
# check the test will be valid
435
self.assertEqual('yes', result.args[4])
436
self.assertEqual(result, request.execute(''))
439
class TestSmartServerBzrDirRequestGetConfigFile(
440
tests.TestCaseWithMemoryTransport):
441
"""Tests for BzrDir.get_config_file."""
443
def test_present(self):
444
backing = self.get_transport()
445
dir = self.make_bzrdir('.')
446
dir.get_config().set_default_stack_on("/")
447
local_result = dir._get_config()._get_config_file().read()
448
request_class = smart_dir.SmartServerBzrDirRequestConfigFile
449
request = request_class(backing)
450
expected = smart_req.SuccessfulSmartServerResponse((), local_result)
451
self.assertEqual(expected, request.execute(''))
453
def test_missing(self):
454
backing = self.get_transport()
455
dir = self.make_bzrdir('.')
456
request_class = smart_dir.SmartServerBzrDirRequestConfigFile
457
request = request_class(backing)
458
expected = smart_req.SuccessfulSmartServerResponse((), '')
459
self.assertEqual(expected, request.execute(''))
462
class TestSmartServerBzrDirRequestGetBranches(
463
tests.TestCaseWithMemoryTransport):
464
"""Tests for BzrDir.get_branches."""
466
def test_simple(self):
467
backing = self.get_transport()
468
branch = self.make_branch('.')
469
request_class = smart_dir.SmartServerBzrDirRequestGetBranches
470
request = request_class(backing)
471
local_result = bencode.bencode(
472
{"": ("branch", branch._format.network_name())})
473
expected = smart_req.SuccessfulSmartServerResponse(
474
("success", ), local_result)
475
self.assertEqual(expected, request.execute(''))
477
def test_empty(self):
478
backing = self.get_transport()
479
dir = self.make_bzrdir('.')
480
request_class = smart_dir.SmartServerBzrDirRequestGetBranches
481
request = request_class(backing)
482
local_result = bencode.bencode({})
483
expected = smart_req.SuccessfulSmartServerResponse(
484
('success',), local_result)
485
self.assertEqual(expected, request.execute(''))
488
class TestSmartServerRequestInitializeBzrDir(tests.TestCaseWithMemoryTransport):
179
self.assertEqual('no', result.args[4])
180
self.assertEqual(result, request.execute(backing.local_abspath('')))
183
class TestSmartServerRequestInitializeBzrDir(tests.TestCaseWithTransport):
490
185
def test_empty_dir(self):
491
186
"""Initializing an empty dir should succeed and do it."""
492
187
backing = self.get_transport()
493
request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
494
self.assertEqual(smart_req.SmartServerResponse(('ok', )),
496
made_dir = controldir.ControlDir.open_from_transport(backing)
497
# no branch, tree or repository is expected with the current
188
request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
189
self.assertEqual(SmartServerResponse(('ok', )),
190
request.execute(backing.local_abspath('.')))
191
made_dir = bzrdir.BzrDir.open_from_transport(backing)
192
# no branch, tree or repository is expected with the current
498
193
# default formart.
499
194
self.assertRaises(errors.NoWorkingTree, made_dir.open_workingtree)
500
195
self.assertRaises(errors.NotBranchError, made_dir.open_branch)
503
198
def test_missing_dir(self):
504
199
"""Initializing a missing directory should fail like the bzrdir api."""
505
200
backing = self.get_transport()
506
request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
201
request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
507
202
self.assertRaises(errors.NoSuchFile,
508
request.execute, 'subdir')
203
request.execute, backing.local_abspath('subdir'))
510
205
def test_initialized_dir(self):
511
206
"""Initializing an extant bzrdir should fail like the bzrdir api."""
512
207
backing = self.get_transport()
513
request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
514
self.make_bzrdir('subdir')
515
self.assertRaises(errors.AlreadyControlDirError,
516
request.execute, 'subdir')
519
class TestSmartServerRequestBzrDirInitializeEx(
520
tests.TestCaseWithMemoryTransport):
521
"""Basic tests for BzrDir.initialize_ex_1.16 in the smart server.
523
The main unit tests in test_bzrdir exercise the API comprehensively.
526
def test_empty_dir(self):
527
"""Initializing an empty dir should succeed and do it."""
528
backing = self.get_transport()
529
name = self.make_bzrdir('reference')._format.network_name()
530
request = smart_dir.SmartServerRequestBzrDirInitializeEx(backing)
532
smart_req.SmartServerResponse(('', '', '', '', '', '', name,
533
'False', '', '', '')),
534
request.execute(name, '', 'True', 'False', 'False', '', '', '', '',
536
made_dir = controldir.ControlDir.open_from_transport(backing)
537
# no branch, tree or repository is expected with the current
539
self.assertRaises(errors.NoWorkingTree, made_dir.open_workingtree)
540
self.assertRaises(errors.NotBranchError, made_dir.open_branch)
541
self.assertRaises(errors.NoRepositoryPresent, made_dir.open_repository)
543
def test_missing_dir(self):
544
"""Initializing a missing directory should fail like the bzrdir api."""
545
backing = self.get_transport()
546
name = self.make_bzrdir('reference')._format.network_name()
547
request = smart_dir.SmartServerRequestBzrDirInitializeEx(backing)
548
self.assertRaises(errors.NoSuchFile, request.execute, name,
549
'subdir/dir', 'False', 'False', 'False', '', '', '', '', 'False')
551
def test_initialized_dir(self):
552
"""Initializing an extant directory should fail like the bzrdir api."""
553
backing = self.get_transport()
554
name = self.make_bzrdir('reference')._format.network_name()
555
request = smart_dir.SmartServerRequestBzrDirInitializeEx(backing)
556
self.make_bzrdir('subdir')
557
self.assertRaises(errors.FileExists, request.execute, name, 'subdir',
558
'False', 'False', 'False', '', '', '', '', 'False')
561
class TestSmartServerRequestOpenBzrDir(tests.TestCaseWithMemoryTransport):
563
def test_no_directory(self):
564
backing = self.get_transport()
565
request = smart_dir.SmartServerRequestOpenBzrDir(backing)
566
self.assertEqual(smart_req.SmartServerResponse(('no', )),
567
request.execute('does-not-exist'))
569
def test_empty_directory(self):
570
backing = self.get_transport()
571
backing.mkdir('empty')
572
request = smart_dir.SmartServerRequestOpenBzrDir(backing)
573
self.assertEqual(smart_req.SmartServerResponse(('no', )),
574
request.execute('empty'))
576
def test_outside_root_client_path(self):
577
backing = self.get_transport()
578
request = smart_dir.SmartServerRequestOpenBzrDir(backing,
579
root_client_path='root')
580
self.assertEqual(smart_req.SmartServerResponse(('no', )),
581
request.execute('not-root'))
584
class TestSmartServerRequestOpenBzrDir_2_1(tests.TestCaseWithMemoryTransport):
586
def test_no_directory(self):
587
backing = self.get_transport()
588
request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
589
self.assertEqual(smart_req.SmartServerResponse(('no', )),
590
request.execute('does-not-exist'))
592
def test_empty_directory(self):
593
backing = self.get_transport()
594
backing.mkdir('empty')
595
request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
596
self.assertEqual(smart_req.SmartServerResponse(('no', )),
597
request.execute('empty'))
599
def test_present_without_workingtree(self):
600
backing = self.get_transport()
601
request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
602
self.make_bzrdir('.')
603
self.assertEqual(smart_req.SmartServerResponse(('yes', 'no')),
606
def test_outside_root_client_path(self):
607
backing = self.get_transport()
608
request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing,
609
root_client_path='root')
610
self.assertEqual(smart_req.SmartServerResponse(('no',)),
611
request.execute('not-root'))
614
class TestSmartServerRequestOpenBzrDir_2_1_disk(TestCaseWithChrootedTransport):
616
def test_present_with_workingtree(self):
617
self.vfs_transport_factory = test_server.LocalURLServer
618
backing = self.get_transport()
619
request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
620
bd = self.make_bzrdir('.')
621
bd.create_repository()
623
bd.create_workingtree()
624
self.assertEqual(smart_req.SmartServerResponse(('yes', 'yes')),
628
class TestSmartServerRequestOpenBranch(TestCaseWithChrootedTransport):
208
request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
209
self.make_bzrdir('subdir')
210
self.assertRaises(errors.FileExists,
211
request.execute, backing.local_abspath('subdir'))
214
class TestSmartServerRequestOpenBranch(tests.TestCaseWithTransport):
630
216
def test_no_branch(self):
631
217
"""When there is no branch, ('nobranch', ) is returned."""
632
218
backing = self.get_transport()
633
request = smart_dir.SmartServerRequestOpenBranch(backing)
219
request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
634
220
self.make_bzrdir('.')
635
self.assertEqual(smart_req.SmartServerResponse(('nobranch', )),
221
self.assertEqual(SmartServerResponse(('nobranch', )),
222
request.execute(backing.local_abspath('')))
638
224
def test_branch(self):
639
225
"""When there is a branch, 'ok' is returned."""
640
226
backing = self.get_transport()
641
request = smart_dir.SmartServerRequestOpenBranch(backing)
227
request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
642
228
self.make_branch('.')
643
self.assertEqual(smart_req.SmartServerResponse(('ok', '')),
646
def test_branch_reference(self):
647
"""When there is a branch reference, the reference URL is returned."""
648
self.vfs_transport_factory = test_server.LocalURLServer
649
backing = self.get_transport()
650
request = smart_dir.SmartServerRequestOpenBranch(backing)
651
branch = self.make_branch('branch')
652
checkout = branch.create_checkout('reference',lightweight=True)
653
reference_url = _mod_branch.BranchReferenceFormat().get_reference(
655
self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
656
self.assertEqual(smart_req.SmartServerResponse(('ok', reference_url)),
657
request.execute('reference'))
659
def test_notification_on_branch_from_repository(self):
660
"""When there is a repository, the error should return details."""
661
backing = self.get_transport()
662
request = smart_dir.SmartServerRequestOpenBranch(backing)
663
repo = self.make_repository('.')
664
self.assertEqual(smart_req.SmartServerResponse(('nobranch',)),
668
class TestSmartServerRequestOpenBranchV2(TestCaseWithChrootedTransport):
670
def test_no_branch(self):
671
"""When there is no branch, ('nobranch', ) is returned."""
672
backing = self.get_transport()
673
self.make_bzrdir('.')
674
request = smart_dir.SmartServerRequestOpenBranchV2(backing)
675
self.assertEqual(smart_req.SmartServerResponse(('nobranch', )),
678
def test_branch(self):
679
"""When there is a branch, 'ok' is returned."""
680
backing = self.get_transport()
681
expected = self.make_branch('.')._format.network_name()
682
request = smart_dir.SmartServerRequestOpenBranchV2(backing)
683
self.assertEqual(smart_req.SuccessfulSmartServerResponse(
684
('branch', expected)),
687
def test_branch_reference(self):
688
"""When there is a branch reference, the reference URL is returned."""
689
self.vfs_transport_factory = test_server.LocalURLServer
690
backing = self.get_transport()
691
request = smart_dir.SmartServerRequestOpenBranchV2(backing)
692
branch = self.make_branch('branch')
693
checkout = branch.create_checkout('reference',lightweight=True)
694
reference_url = _mod_branch.BranchReferenceFormat().get_reference(
696
self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
697
self.assertEqual(smart_req.SuccessfulSmartServerResponse(
698
('ref', reference_url)),
699
request.execute('reference'))
701
def test_stacked_branch(self):
702
"""Opening a stacked branch does not open the stacked-on branch."""
703
trunk = self.make_branch('trunk')
704
feature = self.make_branch('feature')
705
feature.set_stacked_on_url(trunk.base)
707
_mod_branch.Branch.hooks.install_named_hook(
708
'open', opened_branches.append, None)
709
backing = self.get_transport()
710
request = smart_dir.SmartServerRequestOpenBranchV2(backing)
713
response = request.execute('feature')
715
request.teardown_jail()
716
expected_format = feature._format.network_name()
717
self.assertEqual(smart_req.SuccessfulSmartServerResponse(
718
('branch', expected_format)),
720
self.assertLength(1, opened_branches)
722
def test_notification_on_branch_from_repository(self):
723
"""When there is a repository, the error should return details."""
724
backing = self.get_transport()
725
request = smart_dir.SmartServerRequestOpenBranchV2(backing)
726
repo = self.make_repository('.')
727
self.assertEqual(smart_req.SmartServerResponse(('nobranch',)),
731
class TestSmartServerRequestOpenBranchV3(TestCaseWithChrootedTransport):
733
def test_no_branch(self):
734
"""When there is no branch, ('nobranch', ) is returned."""
735
backing = self.get_transport()
736
self.make_bzrdir('.')
737
request = smart_dir.SmartServerRequestOpenBranchV3(backing)
738
self.assertEqual(smart_req.SmartServerResponse(('nobranch',)),
741
def test_branch(self):
742
"""When there is a branch, 'ok' is returned."""
743
backing = self.get_transport()
744
expected = self.make_branch('.')._format.network_name()
745
request = smart_dir.SmartServerRequestOpenBranchV3(backing)
746
self.assertEqual(smart_req.SuccessfulSmartServerResponse(
747
('branch', expected)),
750
def test_branch_reference(self):
751
"""When there is a branch reference, the reference URL is returned."""
752
self.vfs_transport_factory = test_server.LocalURLServer
753
backing = self.get_transport()
754
request = smart_dir.SmartServerRequestOpenBranchV3(backing)
755
branch = self.make_branch('branch')
756
checkout = branch.create_checkout('reference',lightweight=True)
757
reference_url = _mod_branch.BranchReferenceFormat().get_reference(
759
self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
760
self.assertEqual(smart_req.SuccessfulSmartServerResponse(
761
('ref', reference_url)),
762
request.execute('reference'))
764
def test_stacked_branch(self):
765
"""Opening a stacked branch does not open the stacked-on branch."""
766
trunk = self.make_branch('trunk')
767
feature = self.make_branch('feature')
768
feature.set_stacked_on_url(trunk.base)
770
_mod_branch.Branch.hooks.install_named_hook(
771
'open', opened_branches.append, None)
772
backing = self.get_transport()
773
request = smart_dir.SmartServerRequestOpenBranchV3(backing)
776
response = request.execute('feature')
778
request.teardown_jail()
779
expected_format = feature._format.network_name()
780
self.assertEqual(smart_req.SuccessfulSmartServerResponse(
781
('branch', expected_format)),
783
self.assertLength(1, opened_branches)
785
def test_notification_on_branch_from_repository(self):
786
"""When there is a repository, the error should return details."""
787
backing = self.get_transport()
788
request = smart_dir.SmartServerRequestOpenBranchV3(backing)
789
repo = self.make_repository('.')
790
self.assertEqual(smart_req.SmartServerResponse(
791
('nobranch', 'location is a repository')),
795
class TestSmartServerRequestRevisionHistory(tests.TestCaseWithMemoryTransport):
229
self.assertEqual(SmartServerResponse(('ok', '')),
230
request.execute(backing.local_abspath('')))
232
def test_branch_reference(self):
233
"""When there is a branch reference, the reference URL is returned."""
234
backing = self.get_transport()
235
request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
236
branch = self.make_branch('branch')
237
checkout = branch.create_checkout('reference',lightweight=True)
238
# TODO: once we have an API to probe for references of any sort, we
240
reference_url = backing.abspath('branch') + '/'
241
self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
242
self.assertEqual(SmartServerResponse(('ok', reference_url)),
243
request.execute(backing.local_abspath('reference')))
246
class TestSmartServerRequestRevisionHistory(tests.TestCaseWithTransport):
797
248
def test_empty(self):
798
249
"""For an empty branch, the body is empty."""
799
250
backing = self.get_transport()
800
request = smart_branch.SmartServerRequestRevisionHistory(backing)
251
request = smart.branch.SmartServerRequestRevisionHistory(backing)
801
252
self.make_branch('.')
802
self.assertEqual(smart_req.SmartServerResponse(('ok', ), ''),
253
self.assertEqual(SmartServerResponse(('ok', ), ''),
254
request.execute(backing.local_abspath('')))
805
256
def test_not_empty(self):
806
257
"""For a non-empty branch, the body is empty."""
807
258
backing = self.get_transport()
808
request = smart_branch.SmartServerRequestRevisionHistory(backing)
259
request = smart.branch.SmartServerRequestRevisionHistory(backing)
809
260
tree = self.make_branch_and_memory_tree('.')
810
261
tree.lock_write()
860
310
r2 = tree.commit('2nd commit', rev_id=rev_id_utf8)
862
312
self.assertEqual(
863
smart_req.SmartServerResponse(('ok', '2', rev_id_utf8)),
867
class TestSmartServerBranchRequestRevisionIdToRevno(
868
tests.TestCaseWithMemoryTransport):
871
backing = self.get_transport()
872
request = smart_branch.SmartServerBranchRequestRevisionIdToRevno(
874
self.make_branch('.')
875
self.assertEqual(smart_req.SmartServerResponse(('ok', '0')),
876
request.execute('', 'null:'))
878
def test_simple(self):
879
backing = self.get_transport()
880
request = smart_branch.SmartServerBranchRequestRevisionIdToRevno(
882
tree = self.make_branch_and_memory_tree('.')
885
r1 = tree.commit('1st commit')
888
smart_req.SmartServerResponse(('ok', '1')),
889
request.execute('', r1))
891
def test_not_found(self):
892
backing = self.get_transport()
893
request = smart_branch.SmartServerBranchRequestRevisionIdToRevno(
895
branch = self.make_branch('.')
897
smart_req.FailedSmartServerResponse(
898
('NoSuchRevision', 'idontexist')),
899
request.execute('', 'idontexist'))
902
class TestSmartServerBranchRequestGetConfigFile(
903
tests.TestCaseWithMemoryTransport):
313
SmartServerResponse(('ok', '2', rev_id_utf8)),
314
request.execute(backing.local_abspath('')))
317
class TestSmartServerBranchRequestGetConfigFile(tests.TestCaseWithTransport):
905
319
def test_default(self):
906
320
"""With no file, we get empty content."""
907
321
backing = self.get_transport()
908
request = smart_branch.SmartServerBranchGetConfigFile(backing)
322
request = smart.branch.SmartServerBranchGetConfigFile(backing)
909
323
branch = self.make_branch('.')
910
324
# there should be no file by default
912
self.assertEqual(smart_req.SmartServerResponse(('ok', ), content),
326
self.assertEqual(SmartServerResponse(('ok', ), content),
327
request.execute(backing.local_abspath('')))
915
329
def test_with_content(self):
916
330
# SmartServerBranchGetConfigFile should return the content from
917
331
# branch.control_files.get('branch.conf') for now - in the future it may
918
# perform more complex processing.
919
backing = self.get_transport()
920
request = smart_branch.SmartServerBranchGetConfigFile(backing)
921
branch = self.make_branch('.')
922
branch._transport.put_bytes('branch.conf', 'foo bar baz')
923
self.assertEqual(smart_req.SmartServerResponse(('ok', ), 'foo bar baz'),
927
class TestLockedBranch(tests.TestCaseWithMemoryTransport):
929
def get_lock_tokens(self, branch):
930
branch_token = branch.lock_write().branch_token
931
repo_token = branch.repository.lock_write().repository_token
932
branch.repository.unlock()
933
return branch_token, repo_token
936
class TestSmartServerBranchRequestPutConfigFile(TestLockedBranch):
938
def test_with_content(self):
939
backing = self.get_transport()
940
request = smart_branch.SmartServerBranchPutConfigFile(backing)
941
branch = self.make_branch('.')
942
branch_token, repo_token = self.get_lock_tokens(branch)
943
self.assertIs(None, request.execute('', branch_token, repo_token))
945
smart_req.SmartServerResponse(('ok', )),
946
request.do_body('foo bar baz'))
948
branch.control_transport.get_bytes('branch.conf'),
953
class TestSmartServerBranchRequestSetConfigOption(TestLockedBranch):
955
def test_value_name(self):
956
branch = self.make_branch('.')
957
request = smart_branch.SmartServerBranchRequestSetConfigOption(
958
branch.bzrdir.root_transport)
959
branch_token, repo_token = self.get_lock_tokens(branch)
960
config = branch._get_config()
961
result = request.execute('', branch_token, repo_token, 'bar', 'foo',
963
self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), result)
964
self.assertEqual('bar', config.get_option('foo'))
968
def test_value_name_section(self):
969
branch = self.make_branch('.')
970
request = smart_branch.SmartServerBranchRequestSetConfigOption(
971
branch.bzrdir.root_transport)
972
branch_token, repo_token = self.get_lock_tokens(branch)
973
config = branch._get_config()
974
result = request.execute('', branch_token, repo_token, 'bar', 'foo',
976
self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), result)
977
self.assertEqual('bar', config.get_option('foo', 'gam'))
982
class TestSmartServerBranchRequestSetConfigOptionDict(TestLockedBranch):
985
TestLockedBranch.setUp(self)
986
# A dict with non-ascii keys and values to exercise unicode
988
self.encoded_value_dict = (
989
'd5:ascii1:a11:unicode \xe2\x8c\x9a3:\xe2\x80\xbde')
991
'ascii': 'a', u'unicode \N{WATCH}': u'\N{INTERROBANG}'}
993
def test_value_name(self):
994
branch = self.make_branch('.')
995
request = smart_branch.SmartServerBranchRequestSetConfigOptionDict(
996
branch.bzrdir.root_transport)
997
branch_token, repo_token = self.get_lock_tokens(branch)
998
config = branch._get_config()
999
result = request.execute('', branch_token, repo_token,
1000
self.encoded_value_dict, 'foo', '')
1001
self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), result)
1002
self.assertEqual(self.value_dict, config.get_option('foo'))
1006
def test_value_name_section(self):
1007
branch = self.make_branch('.')
1008
request = smart_branch.SmartServerBranchRequestSetConfigOptionDict(
1009
branch.bzrdir.root_transport)
1010
branch_token, repo_token = self.get_lock_tokens(branch)
1011
config = branch._get_config()
1012
result = request.execute('', branch_token, repo_token,
1013
self.encoded_value_dict, 'foo', 'gam')
1014
self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), result)
1015
self.assertEqual(self.value_dict, config.get_option('foo', 'gam'))
1020
class TestSmartServerBranchRequestSetTagsBytes(TestLockedBranch):
1021
# Only called when the branch format and tags match [yay factory
1022
# methods] so only need to test straight forward cases.
1024
def test_set_bytes(self):
1025
base_branch = self.make_branch('base')
1026
tag_bytes = base_branch._get_tags_bytes()
1027
# get_lock_tokens takes out a lock.
1028
branch_token, repo_token = self.get_lock_tokens(base_branch)
1029
request = smart_branch.SmartServerBranchSetTagsBytes(
1030
self.get_transport())
1031
response = request.execute('base', branch_token, repo_token)
1032
self.assertEqual(None, response)
1033
response = request.do_chunk(tag_bytes)
1034
self.assertEqual(None, response)
1035
response = request.do_end()
1037
smart_req.SuccessfulSmartServerResponse(()), response)
1038
base_branch.unlock()
1040
def test_lock_failed(self):
1041
base_branch = self.make_branch('base')
1042
base_branch.lock_write()
1043
tag_bytes = base_branch._get_tags_bytes()
1044
request = smart_branch.SmartServerBranchSetTagsBytes(
1045
self.get_transport())
1046
self.assertRaises(errors.TokenMismatch, request.execute,
1047
'base', 'wrong token', 'wrong token')
1048
# The request handler will keep processing the message parts, so even
1049
# if the request fails immediately do_chunk and do_end are still
1051
request.do_chunk(tag_bytes)
1053
base_branch.unlock()
1057
class SetLastRevisionTestBase(TestLockedBranch):
1058
"""Base test case for verbs that implement set_last_revision."""
1061
super(SetLastRevisionTestBase, self).setUp()
1062
backing_transport = self.get_transport()
1063
self.request = self.request_class(backing_transport)
1064
self.tree = self.make_branch_and_memory_tree('.')
1066
def lock_branch(self):
1067
return self.get_lock_tokens(self.tree.branch)
1069
def unlock_branch(self):
1070
self.tree.branch.unlock()
1072
def set_last_revision(self, revision_id, revno):
1073
branch_token, repo_token = self.lock_branch()
1074
response = self._set_last_revision(
1075
revision_id, revno, branch_token, repo_token)
1076
self.unlock_branch()
1079
def assertRequestSucceeds(self, revision_id, revno):
1080
response = self.set_last_revision(revision_id, revno)
1081
self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
1085
class TestSetLastRevisionVerbMixin(object):
1086
"""Mixin test case for verbs that implement set_last_revision."""
1088
def test_set_null_to_null(self):
1089
"""An empty branch can have its last revision set to 'null:'."""
1090
self.assertRequestSucceeds('null:', 0)
1092
def test_NoSuchRevision(self):
1093
"""If the revision_id is not present, the verb returns NoSuchRevision.
1095
revision_id = 'non-existent revision'
1096
self.assertEqual(smart_req.FailedSmartServerResponse(('NoSuchRevision',
1098
self.set_last_revision(revision_id, 1))
1100
def make_tree_with_two_commits(self):
1101
self.tree.lock_write()
1103
rev_id_utf8 = u'\xc8'.encode('utf-8')
1104
r1 = self.tree.commit('1st commit', rev_id=rev_id_utf8)
1105
r2 = self.tree.commit('2nd commit', rev_id='rev-2')
1108
def test_branch_last_revision_info_is_updated(self):
1109
"""A branch's tip can be set to a revision that is present in its
1112
# Make a branch with an empty revision history, but two revisions in
1114
self.make_tree_with_two_commits()
1115
rev_id_utf8 = u'\xc8'.encode('utf-8')
1116
self.tree.branch.set_last_revision_info(0, 'null:')
1118
(0, 'null:'), self.tree.branch.last_revision_info())
1119
# We can update the branch to a revision that is present in the
1121
self.assertRequestSucceeds(rev_id_utf8, 1)
1123
(1, rev_id_utf8), self.tree.branch.last_revision_info())
1125
def test_branch_last_revision_info_rewind(self):
1126
"""A branch's tip can be set to a revision that is an ancestor of the
1129
self.make_tree_with_two_commits()
1130
rev_id_utf8 = u'\xc8'.encode('utf-8')
1132
(2, 'rev-2'), self.tree.branch.last_revision_info())
1133
self.assertRequestSucceeds(rev_id_utf8, 1)
1135
(1, rev_id_utf8), self.tree.branch.last_revision_info())
1137
def test_TipChangeRejected(self):
1138
"""If a pre_change_branch_tip hook raises TipChangeRejected, the verb
1139
returns TipChangeRejected.
1141
rejection_message = u'rejection message\N{INTERROBANG}'
1142
def hook_that_rejects(params):
1143
raise errors.TipChangeRejected(rejection_message)
1144
_mod_branch.Branch.hooks.install_named_hook(
1145
'pre_change_branch_tip', hook_that_rejects, None)
1147
smart_req.FailedSmartServerResponse(
1148
('TipChangeRejected', rejection_message.encode('utf-8'))),
1149
self.set_last_revision('null:', 0))
1152
class TestSmartServerBranchRequestSetLastRevision(
1153
SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
1154
"""Tests for Branch.set_last_revision verb."""
1156
request_class = smart_branch.SmartServerBranchRequestSetLastRevision
1158
def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
1159
return self.request.execute(
1160
'', branch_token, repo_token, revision_id)
1163
class TestSmartServerBranchRequestSetLastRevisionInfo(
1164
SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
1165
"""Tests for Branch.set_last_revision_info verb."""
1167
request_class = smart_branch.SmartServerBranchRequestSetLastRevisionInfo
1169
def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
1170
return self.request.execute(
1171
'', branch_token, repo_token, revno, revision_id)
1173
def test_NoSuchRevision(self):
1174
"""Branch.set_last_revision_info does not have to return
1175
NoSuchRevision if the revision_id is absent.
1177
raise tests.TestNotApplicable()
1180
class TestSmartServerBranchRequestSetLastRevisionEx(
1181
SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
1182
"""Tests for Branch.set_last_revision_ex verb."""
1184
request_class = smart_branch.SmartServerBranchRequestSetLastRevisionEx
1186
def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
1187
return self.request.execute(
1188
'', branch_token, repo_token, revision_id, 0, 0)
1190
def assertRequestSucceeds(self, revision_id, revno):
1191
response = self.set_last_revision(revision_id, revno)
1193
smart_req.SuccessfulSmartServerResponse(('ok', revno, revision_id)),
1196
def test_branch_last_revision_info_rewind(self):
1197
"""A branch's tip can be set to a revision that is an ancestor of the
1198
current tip, but only if allow_overwrite_descendant is passed.
1200
self.make_tree_with_two_commits()
1201
rev_id_utf8 = u'\xc8'.encode('utf-8')
1203
(2, 'rev-2'), self.tree.branch.last_revision_info())
1204
# If allow_overwrite_descendant flag is 0, then trying to set the tip
1205
# to an older revision ID has no effect.
1206
branch_token, repo_token = self.lock_branch()
1207
response = self.request.execute(
1208
'', branch_token, repo_token, rev_id_utf8, 0, 0)
1210
smart_req.SuccessfulSmartServerResponse(('ok', 2, 'rev-2')),
1213
(2, 'rev-2'), self.tree.branch.last_revision_info())
1215
# If allow_overwrite_descendant flag is 1, then setting the tip to an
1217
response = self.request.execute(
1218
'', branch_token, repo_token, rev_id_utf8, 0, 1)
1220
smart_req.SuccessfulSmartServerResponse(('ok', 1, rev_id_utf8)),
1222
self.unlock_branch()
1224
(1, rev_id_utf8), self.tree.branch.last_revision_info())
1226
def make_branch_with_divergent_history(self):
1227
"""Make a branch with divergent history in its repo.
1229
The branch's tip will be 'child-2', and the repo will also contain
1230
'child-1', which diverges from a common base revision.
1232
self.tree.lock_write()
1234
r1 = self.tree.commit('1st commit')
1235
revno_1, revid_1 = self.tree.branch.last_revision_info()
1236
r2 = self.tree.commit('2nd commit', rev_id='child-1')
1237
# Undo the second commit
1238
self.tree.branch.set_last_revision_info(revno_1, revid_1)
1239
self.tree.set_parent_ids([revid_1])
1240
# Make a new second commit, child-2. child-2 has diverged from
1242
new_r2 = self.tree.commit('2nd commit', rev_id='child-2')
1245
def test_not_allow_diverged(self):
1246
"""If allow_diverged is not passed, then setting a divergent history
1247
returns a Diverged error.
1249
self.make_branch_with_divergent_history()
1251
smart_req.FailedSmartServerResponse(('Diverged',)),
1252
self.set_last_revision('child-1', 2))
1253
# The branch tip was not changed.
1254
self.assertEqual('child-2', self.tree.branch.last_revision())
1256
def test_allow_diverged(self):
1257
"""If allow_diverged is passed, then setting a divergent history
1260
self.make_branch_with_divergent_history()
1261
branch_token, repo_token = self.lock_branch()
1262
response = self.request.execute(
1263
'', branch_token, repo_token, 'child-1', 1, 0)
1265
smart_req.SuccessfulSmartServerResponse(('ok', 2, 'child-1')),
1267
self.unlock_branch()
1268
# The branch tip was changed.
1269
self.assertEqual('child-1', self.tree.branch.last_revision())
1272
class TestSmartServerBranchBreakLock(tests.TestCaseWithMemoryTransport):
1274
def test_lock_to_break(self):
1275
base_branch = self.make_branch('base')
1276
request = smart_branch.SmartServerBranchBreakLock(
1277
self.get_transport())
1278
base_branch.lock_write()
1280
smart_req.SuccessfulSmartServerResponse(('ok', ), None),
1281
request.execute('base'))
1283
def test_nothing_to_break(self):
1284
base_branch = self.make_branch('base')
1285
request = smart_branch.SmartServerBranchBreakLock(
1286
self.get_transport())
1288
smart_req.SuccessfulSmartServerResponse(('ok', ), None),
1289
request.execute('base'))
1292
class TestSmartServerBranchRequestGetParent(tests.TestCaseWithMemoryTransport):
1294
def test_get_parent_none(self):
1295
base_branch = self.make_branch('base')
1296
request = smart_branch.SmartServerBranchGetParent(self.get_transport())
1297
response = request.execute('base')
1299
smart_req.SuccessfulSmartServerResponse(('',)), response)
1301
def test_get_parent_something(self):
1302
base_branch = self.make_branch('base')
1303
base_branch.set_parent(self.get_url('foo'))
1304
request = smart_branch.SmartServerBranchGetParent(self.get_transport())
1305
response = request.execute('base')
1307
smart_req.SuccessfulSmartServerResponse(("../foo",)),
1311
class TestSmartServerBranchRequestSetParent(TestLockedBranch):
1313
def test_set_parent_none(self):
1314
branch = self.make_branch('base', format="1.9")
1316
branch._set_parent_location('foo')
1318
request = smart_branch.SmartServerBranchRequestSetParentLocation(
1319
self.get_transport())
1320
branch_token, repo_token = self.get_lock_tokens(branch)
1322
response = request.execute('base', branch_token, repo_token, '')
1325
self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), response)
1326
# Refresh branch as SetParentLocation modified it
1327
branch = branch.bzrdir.open_branch()
1328
self.assertEqual(None, branch.get_parent())
1330
def test_set_parent_something(self):
1331
branch = self.make_branch('base', format="1.9")
1332
request = smart_branch.SmartServerBranchRequestSetParentLocation(
1333
self.get_transport())
1334
branch_token, repo_token = self.get_lock_tokens(branch)
1336
response = request.execute('base', branch_token, repo_token,
1340
self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), response)
1341
refreshed = _mod_branch.Branch.open(branch.base)
1342
self.assertEqual('http://bar/', refreshed.get_parent())
1345
class TestSmartServerBranchRequestGetTagsBytes(
1346
tests.TestCaseWithMemoryTransport):
1347
# Only called when the branch format and tags match [yay factory
1348
# methods] so only need to test straight forward cases.
1350
def test_get_bytes(self):
1351
base_branch = self.make_branch('base')
1352
request = smart_branch.SmartServerBranchGetTagsBytes(
1353
self.get_transport())
1354
response = request.execute('base')
1356
smart_req.SuccessfulSmartServerResponse(('',)), response)
1359
class TestSmartServerBranchRequestGetStackedOnURL(tests.TestCaseWithMemoryTransport):
1361
def test_get_stacked_on_url(self):
1362
base_branch = self.make_branch('base', format='1.6')
1363
stacked_branch = self.make_branch('stacked', format='1.6')
1364
# typically should be relative
1365
stacked_branch.set_stacked_on_url('../base')
1366
request = smart_branch.SmartServerBranchRequestGetStackedOnURL(
1367
self.get_transport())
1368
response = request.execute('stacked')
1370
smart_req.SmartServerResponse(('ok', '../base')),
1374
class TestSmartServerBranchRequestLockWrite(TestLockedBranch):
332
# perform more complex processing.
333
backing = self.get_transport()
334
request = smart.branch.SmartServerBranchGetConfigFile(backing)
335
branch = self.make_branch('.')
336
branch.control_files.put_utf8('branch.conf', 'foo bar baz')
337
self.assertEqual(SmartServerResponse(('ok', ), 'foo bar baz'),
338
request.execute(backing.local_abspath('')))
341
class TestSmartServerBranchRequestSetLastRevision(tests.TestCaseWithTransport):
343
def test_empty(self):
344
backing = self.get_transport()
345
request = smart.branch.SmartServerBranchRequestSetLastRevision(backing)
346
b = self.make_branch('.')
347
branch_token = b.lock_write()
348
repo_token = b.repository.lock_write()
349
b.repository.unlock()
351
self.assertEqual(SmartServerResponse(('ok',)),
353
backing.local_abspath(''), branch_token, repo_token,
358
def test_not_present_revision_id(self):
359
backing = self.get_transport()
360
request = smart.branch.SmartServerBranchRequestSetLastRevision(backing)
361
b = self.make_branch('.')
362
branch_token = b.lock_write()
363
repo_token = b.repository.lock_write()
364
b.repository.unlock()
366
revision_id = 'non-existent revision'
368
SmartServerResponse(('NoSuchRevision', revision_id)),
370
backing.local_abspath(''), branch_token, repo_token,
375
def test_revision_id_present(self):
376
backing = self.get_transport()
377
request = smart.branch.SmartServerBranchRequestSetLastRevision(backing)
378
tree = self.make_branch_and_memory_tree('.')
381
rev_id_utf8 = u'\xc8'.encode('utf-8')
382
r1 = tree.commit('1st commit', rev_id=rev_id_utf8)
383
r2 = tree.commit('2nd commit')
385
branch_token = tree.branch.lock_write()
386
repo_token = tree.branch.repository.lock_write()
387
tree.branch.repository.unlock()
390
SmartServerResponse(('ok',)),
392
backing.local_abspath(''), branch_token, repo_token,
394
self.assertEqual([rev_id_utf8], tree.branch.revision_history())
398
def test_revision_id_present2(self):
399
backing = self.get_transport()
400
request = smart.branch.SmartServerBranchRequestSetLastRevision(backing)
401
tree = self.make_branch_and_memory_tree('.')
404
rev_id_utf8 = u'\xc8'.encode('utf-8')
405
r1 = tree.commit('1st commit', rev_id=rev_id_utf8)
406
r2 = tree.commit('2nd commit')
408
tree.branch.set_revision_history([])
409
branch_token = tree.branch.lock_write()
410
repo_token = tree.branch.repository.lock_write()
411
tree.branch.repository.unlock()
414
SmartServerResponse(('ok',)),
416
backing.local_abspath(''), branch_token, repo_token,
418
self.assertEqual([rev_id_utf8], tree.branch.revision_history())
423
class TestSmartServerBranchRequestLockWrite(tests.TestCaseWithTransport):
426
tests.TestCaseWithTransport.setUp(self)
427
self.reduceLockdirTimeout()
1376
429
def test_lock_write_on_unlocked_branch(self):
1377
430
backing = self.get_transport()
1378
request = smart_branch.SmartServerBranchRequestLockWrite(backing)
431
request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1379
432
branch = self.make_branch('.', format='knit')
1380
433
repository = branch.repository
1381
response = request.execute('')
434
response = request.execute(backing.local_abspath(''))
1382
435
branch_nonce = branch.control_files._lock.peek().get('nonce')
1383
436
repository_nonce = repository.control_files._lock.peek().get('nonce')
1384
self.assertEqual(smart_req.SmartServerResponse(
1385
('ok', branch_nonce, repository_nonce)),
438
SmartServerResponse(('ok', branch_nonce, repository_nonce)),
1387
440
# The branch (and associated repository) is now locked. Verify that
1388
441
# with a new branch object.
1389
442
new_branch = repository.bzrdir.open_branch()
1390
443
self.assertRaises(errors.LockContention, new_branch.lock_write)
1392
request = smart_branch.SmartServerBranchRequestUnlock(backing)
1393
response = request.execute('', branch_nonce, repository_nonce)
1395
445
def test_lock_write_on_locked_branch(self):
1396
446
backing = self.get_transport()
1397
request = smart_branch.SmartServerBranchRequestLockWrite(backing)
447
request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1398
448
branch = self.make_branch('.')
1399
branch_token = branch.lock_write().branch_token
1400
450
branch.leave_lock_in_place()
1402
response = request.execute('')
452
response = request.execute(backing.local_abspath(''))
1403
453
self.assertEqual(
1404
smart_req.SmartServerResponse(('LockContention',)), response)
1406
branch.lock_write(branch_token)
1407
branch.dont_leave_lock_in_place()
454
SmartServerResponse(('LockContention',)), response)
1410
456
def test_lock_write_with_tokens_on_locked_branch(self):
1411
457
backing = self.get_transport()
1412
request = smart_branch.SmartServerBranchRequestLockWrite(backing)
458
request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1413
459
branch = self.make_branch('.', format='knit')
1414
branch_token, repo_token = self.get_lock_tokens(branch)
460
branch_token = branch.lock_write()
461
repo_token = branch.repository.lock_write()
462
branch.repository.unlock()
1415
463
branch.leave_lock_in_place()
1416
464
branch.repository.leave_lock_in_place()
1418
response = request.execute('',
466
response = request.execute(backing.local_abspath(''),
1419
467
branch_token, repo_token)
1420
468
self.assertEqual(
1421
smart_req.SmartServerResponse(('ok', branch_token, repo_token)),
1424
branch.repository.lock_write(repo_token)
1425
branch.repository.dont_leave_lock_in_place()
1426
branch.repository.unlock()
1427
branch.lock_write(branch_token)
1428
branch.dont_leave_lock_in_place()
469
SmartServerResponse(('ok', branch_token, repo_token)), response)
1431
471
def test_lock_write_with_mismatched_tokens_on_locked_branch(self):
1432
472
backing = self.get_transport()
1433
request = smart_branch.SmartServerBranchRequestLockWrite(backing)
473
request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1434
474
branch = self.make_branch('.', format='knit')
1435
branch_token, repo_token = self.get_lock_tokens(branch)
475
branch_token = branch.lock_write()
476
repo_token = branch.repository.lock_write()
477
branch.repository.unlock()
1436
478
branch.leave_lock_in_place()
1437
479
branch.repository.leave_lock_in_place()
1439
response = request.execute('',
481
response = request.execute(backing.local_abspath(''),
1440
482
branch_token+'xxx', repo_token)
1441
483
self.assertEqual(
1442
smart_req.SmartServerResponse(('TokenMismatch',)), response)
1444
branch.repository.lock_write(repo_token)
1445
branch.repository.dont_leave_lock_in_place()
1446
branch.repository.unlock()
1447
branch.lock_write(branch_token)
1448
branch.dont_leave_lock_in_place()
484
SmartServerResponse(('TokenMismatch',)), response)
1451
486
def test_lock_write_on_locked_repo(self):
1452
487
backing = self.get_transport()
1453
request = smart_branch.SmartServerBranchRequestLockWrite(backing)
488
request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1454
489
branch = self.make_branch('.', format='knit')
1455
repo = branch.repository
1456
repo_token = repo.lock_write().repository_token
1457
repo.leave_lock_in_place()
1459
response = request.execute('')
490
branch.repository.lock_write()
491
branch.repository.leave_lock_in_place()
492
branch.repository.unlock()
493
response = request.execute(backing.local_abspath(''))
1460
494
self.assertEqual(
1461
smart_req.SmartServerResponse(('LockContention',)), response)
1463
repo.lock_write(repo_token)
1464
repo.dont_leave_lock_in_place()
495
SmartServerResponse(('LockContention',)), response)
1467
497
def test_lock_write_on_readonly_transport(self):
1468
498
backing = self.get_readonly_transport()
1469
request = smart_branch.SmartServerBranchRequestLockWrite(backing)
499
request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1470
500
branch = self.make_branch('.')
1471
root = self.get_transport().clone('/')
1472
path = urlutils.relative_url(root.base, self.get_transport().base)
1473
response = request.execute(path)
501
response = request.execute('')
1474
502
error_name, lock_str, why_str = response.args
1475
503
self.assertFalse(response.is_successful())
1476
504
self.assertEqual('LockFailed', error_name)
1479
class TestSmartServerBranchRequestGetPhysicalLockStatus(TestLockedBranch):
1481
def test_true(self):
1482
backing = self.get_transport()
1483
request = smart_branch.SmartServerBranchRequestGetPhysicalLockStatus(
1485
branch = self.make_branch('.')
1486
branch_token, repo_token = self.get_lock_tokens(branch)
1487
self.assertEqual(True, branch.get_physical_lock_status())
1488
response = request.execute('')
1490
smart_req.SmartServerResponse(('yes',)), response)
1493
def test_false(self):
1494
backing = self.get_transport()
1495
request = smart_branch.SmartServerBranchRequestGetPhysicalLockStatus(
1497
branch = self.make_branch('.')
1498
self.assertEqual(False, branch.get_physical_lock_status())
1499
response = request.execute('')
1501
smart_req.SmartServerResponse(('no',)), response)
1504
class TestSmartServerBranchRequestUnlock(TestLockedBranch):
507
class TestSmartServerBranchRequestUnlock(tests.TestCaseWithTransport):
510
tests.TestCaseWithTransport.setUp(self)
511
self.reduceLockdirTimeout()
1506
513
def test_unlock_on_locked_branch_and_repo(self):
1507
514
backing = self.get_transport()
1508
request = smart_branch.SmartServerBranchRequestUnlock(backing)
515
request = smart.branch.SmartServerBranchRequestUnlock(backing)
1509
516
branch = self.make_branch('.', format='knit')
1510
517
# Lock the branch
1511
branch_token, repo_token = self.get_lock_tokens(branch)
518
branch_token = branch.lock_write()
519
repo_token = branch.repository.lock_write()
520
branch.repository.unlock()
1512
521
# Unlock the branch (and repo) object, leaving the physical locks
1514
523
branch.leave_lock_in_place()
1515
524
branch.repository.leave_lock_in_place()
1517
response = request.execute('',
526
response = request.execute(backing.local_abspath(''),
1518
527
branch_token, repo_token)
1519
528
self.assertEqual(
1520
smart_req.SmartServerResponse(('ok',)), response)
529
SmartServerResponse(('ok',)), response)
1521
530
# The branch is now unlocked. Verify that with a new branch
1523
532
new_branch = branch.bzrdir.open_branch()
1717
637
# Note that it still returns body (of zero bytes).
1718
self.assertEqual(smart_req.SmartServerResponse(
1719
('nosuchrevision', 'missingrevision', ), ''),
1720
request.execute('', 'missingrevision'))
1723
class TestSmartServerRepositoryGetRevIdForRevno(
1724
tests.TestCaseWithMemoryTransport):
1726
def test_revno_found(self):
1727
backing = self.get_transport()
1728
request = smart_repo.SmartServerRepositoryGetRevIdForRevno(backing)
1729
tree = self.make_branch_and_memory_tree('.')
1732
rev1_id_utf8 = u'\xc8'.encode('utf-8')
1733
rev2_id_utf8 = u'\xc9'.encode('utf-8')
1734
tree.commit('1st commit', rev_id=rev1_id_utf8)
1735
tree.commit('2nd commit', rev_id=rev2_id_utf8)
1738
self.assertEqual(smart_req.SmartServerResponse(('ok', rev1_id_utf8)),
1739
request.execute('', 1, (2, rev2_id_utf8)))
1741
def test_known_revid_missing(self):
1742
backing = self.get_transport()
1743
request = smart_repo.SmartServerRepositoryGetRevIdForRevno(backing)
1744
repo = self.make_repository('.')
1746
smart_req.FailedSmartServerResponse(('nosuchrevision', 'ghost')),
1747
request.execute('', 1, (2, 'ghost')))
1749
def test_history_incomplete(self):
1750
backing = self.get_transport()
1751
request = smart_repo.SmartServerRepositoryGetRevIdForRevno(backing)
1752
parent = self.make_branch_and_memory_tree('parent', format='1.9')
1754
parent.add([''], ['TREE_ROOT'])
1755
r1 = parent.commit(message='first commit')
1756
r2 = parent.commit(message='second commit')
1758
local = self.make_branch_and_memory_tree('local', format='1.9')
1759
local.branch.pull(parent.branch)
1760
local.set_parent_ids([r2])
1761
r3 = local.commit(message='local commit')
1762
local.branch.create_clone_on_transport(
1763
self.get_transport('stacked'), stacked_on=self.get_url('parent'))
1765
smart_req.SmartServerResponse(('history-incomplete', 2, r2)),
1766
request.execute('stacked', 1, (3, r3)))
1769
class TestSmartServerRepositoryIterRevisions(
1770
tests.TestCaseWithMemoryTransport):
1772
def test_basic(self):
1773
backing = self.get_transport()
1774
request = smart_repo.SmartServerRepositoryIterRevisions(backing)
1775
tree = self.make_branch_and_memory_tree('.', format='2a')
1778
tree.commit('1st commit', rev_id="rev1")
1779
tree.commit('2nd commit', rev_id="rev2")
1782
self.assertIs(None, request.execute(''))
1783
response = request.do_body("rev1\nrev2")
1784
self.assertTrue(response.is_successful())
1785
# Format 2a uses serializer format 10
1786
self.assertEqual(response.args, ("ok", "10"))
1788
self.addCleanup(tree.branch.lock_read().unlock)
1789
entries = [zlib.compress(record.get_bytes_as("fulltext")) for record in
1790
tree.branch.repository.revisions.get_record_stream(
1791
[("rev1", ), ("rev2", )], "unordered", True)]
1793
contents = "".join(response.body_stream)
1794
self.assertTrue(contents in (
1795
"".join([entries[0], entries[1]]),
1796
"".join([entries[1], entries[0]])))
1798
def test_missing(self):
1799
backing = self.get_transport()
1800
request = smart_repo.SmartServerRepositoryIterRevisions(backing)
1801
tree = self.make_branch_and_memory_tree('.', format='2a')
1803
self.assertIs(None, request.execute(''))
1804
response = request.do_body("rev1\nrev2")
1805
self.assertTrue(response.is_successful())
1806
# Format 2a uses serializer format 10
1807
self.assertEqual(response.args, ("ok", "10"))
1809
contents = "".join(response.body_stream)
1810
self.assertEqual(contents, "")
1813
class GetStreamTestBase(tests.TestCaseWithMemoryTransport):
1815
def make_two_commit_repo(self):
1816
tree = self.make_branch_and_memory_tree('.')
1819
r1 = tree.commit('1st commit')
1820
r2 = tree.commit('2nd commit', rev_id=u'\xc8'.encode('utf-8'))
1822
repo = tree.branch.repository
1826
class TestSmartServerRepositoryGetStream(GetStreamTestBase):
1828
def test_ancestry_of(self):
1829
"""The search argument may be a 'ancestry-of' some heads'."""
1830
backing = self.get_transport()
1831
request = smart_repo.SmartServerRepositoryGetStream(backing)
1832
repo, r1, r2 = self.make_two_commit_repo()
1833
fetch_spec = ['ancestry-of', r2]
1834
lines = '\n'.join(fetch_spec)
1835
request.execute('', repo._format.network_name())
1836
response = request.do_body(lines)
1837
self.assertEqual(('ok',), response.args)
1838
stream_bytes = ''.join(response.body_stream)
1839
self.assertStartsWith(stream_bytes, 'Bazaar pack format 1')
1841
def test_search(self):
1842
"""The search argument may be a 'search' of some explicit keys."""
1843
backing = self.get_transport()
1844
request = smart_repo.SmartServerRepositoryGetStream(backing)
1845
repo, r1, r2 = self.make_two_commit_repo()
1846
fetch_spec = ['search', '%s %s' % (r1, r2), 'null:', '2']
1847
lines = '\n'.join(fetch_spec)
1848
request.execute('', repo._format.network_name())
1849
response = request.do_body(lines)
1850
self.assertEqual(('ok',), response.args)
1851
stream_bytes = ''.join(response.body_stream)
1852
self.assertStartsWith(stream_bytes, 'Bazaar pack format 1')
1854
def test_search_everything(self):
1855
"""A search of 'everything' returns a stream."""
1856
backing = self.get_transport()
1857
request = smart_repo.SmartServerRepositoryGetStream_1_19(backing)
1858
repo, r1, r2 = self.make_two_commit_repo()
1859
serialised_fetch_spec = 'everything'
1860
request.execute('', repo._format.network_name())
1861
response = request.do_body(serialised_fetch_spec)
1862
self.assertEqual(('ok',), response.args)
1863
stream_bytes = ''.join(response.body_stream)
1864
self.assertStartsWith(stream_bytes, 'Bazaar pack format 1')
1867
class TestSmartServerRequestHasRevision(tests.TestCaseWithMemoryTransport):
639
SmartServerResponse(('nosuchrevision', 'missingrevision', ), ''),
640
request.execute(backing.local_abspath(''), 'missingrevision'))
643
class TestSmartServerRequestHasRevision(tests.TestCaseWithTransport):
1869
645
def test_missing_revision(self):
1870
646
"""For a missing revision, ('no', ) is returned."""
1871
647
backing = self.get_transport()
1872
request = smart_repo.SmartServerRequestHasRevision(backing)
648
request = smart.repository.SmartServerRequestHasRevision(backing)
1873
649
self.make_repository('.')
1874
self.assertEqual(smart_req.SmartServerResponse(('no', )),
1875
request.execute('', 'revid'))
650
self.assertEqual(SmartServerResponse(('no', )),
651
request.execute(backing.local_abspath(''), 'revid'))
1877
653
def test_present_revision(self):
1878
654
"""For a present revision, ('yes', ) is returned."""
1879
655
backing = self.get_transport()
1880
request = smart_repo.SmartServerRequestHasRevision(backing)
656
request = smart.repository.SmartServerRequestHasRevision(backing)
1881
657
tree = self.make_branch_and_memory_tree('.')
1882
658
tree.lock_write()
2017
719
stats = tree.branch.repository.gather_stats()
2019
722
expected_body = ('committers: 2\n'
2020
723
'firstrev: 123456.200 3600\n'
2021
724
'latestrev: 654321.400 0\n'
2023
self.assertEqual(smart_req.SmartServerResponse(('ok', ), expected_body),
727
self.assertEqual(SmartServerResponse(('ok', ), expected_body),
728
request.execute(backing.local_abspath(''),
2025
729
rev_id_utf8, 'yes'))
2027
def test_unknown_revid(self):
2028
"""An unknown revision id causes a 'nosuchrevision' error."""
2029
backing = self.get_transport()
2030
request = smart_repo.SmartServerRepositoryGatherStats(backing)
2031
repository = self.make_repository('.')
2032
expected_body = 'revisions: 0\n'
2034
smart_req.FailedSmartServerResponse(
2035
('nosuchrevision', 'mia'), None),
2036
request.execute('', 'mia', 'yes'))
2039
class TestSmartServerRepositoryIsShared(tests.TestCaseWithMemoryTransport):
732
class TestSmartServerRepositoryIsShared(tests.TestCaseWithTransport):
2041
734
def test_is_shared(self):
2042
735
"""For a shared repository, ('yes', ) is returned."""
2043
736
backing = self.get_transport()
2044
request = smart_repo.SmartServerRepositoryIsShared(backing)
737
request = smart.repository.SmartServerRepositoryIsShared(backing)
2045
738
self.make_repository('.', shared=True)
2046
self.assertEqual(smart_req.SmartServerResponse(('yes', )),
2047
request.execute('', ))
739
self.assertEqual(SmartServerResponse(('yes', )),
740
request.execute(backing.local_abspath(''), ))
2049
742
def test_is_not_shared(self):
2050
743
"""For a shared repository, ('no', ) is returned."""
2051
744
backing = self.get_transport()
2052
request = smart_repo.SmartServerRepositoryIsShared(backing)
745
request = smart.repository.SmartServerRepositoryIsShared(backing)
2053
746
self.make_repository('.', shared=False)
2054
self.assertEqual(smart_req.SmartServerResponse(('no', )),
2055
request.execute('', ))
2058
class TestSmartServerRepositoryGetRevisionSignatureText(
2059
tests.TestCaseWithMemoryTransport):
2061
def test_get_signature(self):
2062
backing = self.get_transport()
2063
request = smart_repo.SmartServerRepositoryGetRevisionSignatureText(
2065
bb = self.make_branch_builder('.')
2066
bb.build_commit(rev_id='A')
2067
repo = bb.get_branch().repository
2068
strategy = gpg.LoopbackGPGStrategy(None)
2069
self.addCleanup(repo.lock_write().unlock)
2070
repo.start_write_group()
2071
repo.sign_revision('A', strategy)
2072
repo.commit_write_group()
2074
'-----BEGIN PSEUDO-SIGNED CONTENT-----\n' +
2075
Testament.from_revision(repo, 'A').as_short_text() +
2076
'-----END PSEUDO-SIGNED CONTENT-----\n')
2078
smart_req.SmartServerResponse(('ok', ), expected_body),
2079
request.execute('', 'A'))
2082
class TestSmartServerRepositoryMakeWorkingTrees(
2083
tests.TestCaseWithMemoryTransport):
2085
def test_make_working_trees(self):
2086
"""For a repository with working trees, ('yes', ) is returned."""
2087
backing = self.get_transport()
2088
request = smart_repo.SmartServerRepositoryMakeWorkingTrees(backing)
2089
r = self.make_repository('.')
2090
r.set_make_working_trees(True)
2091
self.assertEqual(smart_req.SmartServerResponse(('yes', )),
2092
request.execute('', ))
2094
def test_is_not_shared(self):
2095
"""For a repository with working trees, ('no', ) is returned."""
2096
backing = self.get_transport()
2097
request = smart_repo.SmartServerRepositoryMakeWorkingTrees(backing)
2098
r = self.make_repository('.')
2099
r.set_make_working_trees(False)
2100
self.assertEqual(smart_req.SmartServerResponse(('no', )),
2101
request.execute('', ))
2104
class TestSmartServerRepositoryLockWrite(tests.TestCaseWithMemoryTransport):
747
self.assertEqual(SmartServerResponse(('no', )),
748
request.execute(backing.local_abspath(''), ))
751
class TestSmartServerRepositoryLockWrite(tests.TestCaseWithTransport):
754
tests.TestCaseWithTransport.setUp(self)
755
self.reduceLockdirTimeout()
2106
757
def test_lock_write_on_unlocked_repo(self):
2107
758
backing = self.get_transport()
2108
request = smart_repo.SmartServerRepositoryLockWrite(backing)
759
request = smart.repository.SmartServerRepositoryLockWrite(backing)
2109
760
repository = self.make_repository('.', format='knit')
2110
response = request.execute('')
761
response = request.execute(backing.local_abspath(''))
2111
762
nonce = repository.control_files._lock.peek().get('nonce')
2112
self.assertEqual(smart_req.SmartServerResponse(('ok', nonce)), response)
763
self.assertEqual(SmartServerResponse(('ok', nonce)), response)
2113
764
# The repository is now locked. Verify that with a new repository
2115
766
new_repo = repository.bzrdir.open_repository()
2116
767
self.assertRaises(errors.LockContention, new_repo.lock_write)
2118
request = smart_repo.SmartServerRepositoryUnlock(backing)
2119
response = request.execute('', nonce)
2121
769
def test_lock_write_on_locked_repo(self):
2122
770
backing = self.get_transport()
2123
request = smart_repo.SmartServerRepositoryLockWrite(backing)
771
request = smart.repository.SmartServerRepositoryLockWrite(backing)
2124
772
repository = self.make_repository('.', format='knit')
2125
repo_token = repository.lock_write().repository_token
773
repository.lock_write()
2126
774
repository.leave_lock_in_place()
2127
775
repository.unlock()
2128
response = request.execute('')
776
response = request.execute(backing.local_abspath(''))
2129
777
self.assertEqual(
2130
smart_req.SmartServerResponse(('LockContention',)), response)
2132
repository.lock_write(repo_token)
2133
repository.dont_leave_lock_in_place()
778
SmartServerResponse(('LockContention',)), response)
2136
780
def test_lock_write_on_readonly_transport(self):
2137
781
backing = self.get_readonly_transport()
2138
request = smart_repo.SmartServerRepositoryLockWrite(backing)
782
request = smart.repository.SmartServerRepositoryLockWrite(backing)
2139
783
repository = self.make_repository('.', format='knit')
2140
784
response = request.execute('')
2141
785
self.assertFalse(response.is_successful())
2142
786
self.assertEqual('LockFailed', response.args[0])
2145
class TestInsertStreamBase(tests.TestCaseWithMemoryTransport):
2147
def make_empty_byte_stream(self, repo):
2148
byte_stream = smart_repo._stream_to_byte_stream([], repo._format)
2149
return ''.join(byte_stream)
2152
class TestSmartServerRepositoryInsertStream(TestInsertStreamBase):
2154
def test_insert_stream_empty(self):
2155
backing = self.get_transport()
2156
request = smart_repo.SmartServerRepositoryInsertStream(backing)
2157
repository = self.make_repository('.')
2158
response = request.execute('', '')
2159
self.assertEqual(None, response)
2160
response = request.do_chunk(self.make_empty_byte_stream(repository))
2161
self.assertEqual(None, response)
2162
response = request.do_end()
2163
self.assertEqual(smart_req.SmartServerResponse(('ok', )), response)
2166
class TestSmartServerRepositoryInsertStreamLocked(TestInsertStreamBase):
2168
def test_insert_stream_empty(self):
2169
backing = self.get_transport()
2170
request = smart_repo.SmartServerRepositoryInsertStreamLocked(
2172
repository = self.make_repository('.', format='knit')
2173
lock_token = repository.lock_write().repository_token
2174
response = request.execute('', '', lock_token)
2175
self.assertEqual(None, response)
2176
response = request.do_chunk(self.make_empty_byte_stream(repository))
2177
self.assertEqual(None, response)
2178
response = request.do_end()
2179
self.assertEqual(smart_req.SmartServerResponse(('ok', )), response)
2182
def test_insert_stream_with_wrong_lock_token(self):
2183
backing = self.get_transport()
2184
request = smart_repo.SmartServerRepositoryInsertStreamLocked(
2186
repository = self.make_repository('.', format='knit')
2187
lock_token = repository.lock_write().repository_token
2189
errors.TokenMismatch, request.execute, '', '', 'wrong-token')
2193
class TestSmartServerRepositoryUnlock(tests.TestCaseWithMemoryTransport):
789
class TestSmartServerRepositoryUnlock(tests.TestCaseWithTransport):
792
tests.TestCaseWithTransport.setUp(self)
793
self.reduceLockdirTimeout()
2195
795
def test_unlock_on_locked_repo(self):
2196
796
backing = self.get_transport()
2197
request = smart_repo.SmartServerRepositoryUnlock(backing)
797
request = smart.repository.SmartServerRepositoryUnlock(backing)
2198
798
repository = self.make_repository('.', format='knit')
2199
token = repository.lock_write().repository_token
799
token = repository.lock_write()
2200
800
repository.leave_lock_in_place()
2201
801
repository.unlock()
2202
response = request.execute('', token)
802
response = request.execute(backing.local_abspath(''), token)
2203
803
self.assertEqual(
2204
smart_req.SmartServerResponse(('ok',)), response)
804
SmartServerResponse(('ok',)), response)
2205
805
# The repository is now unlocked. Verify that with a new repository
2207
807
new_repo = repository.bzrdir.open_repository()
2211
811
def test_unlock_on_unlocked_repo(self):
2212
812
backing = self.get_transport()
2213
request = smart_repo.SmartServerRepositoryUnlock(backing)
813
request = smart.repository.SmartServerRepositoryUnlock(backing)
2214
814
repository = self.make_repository('.', format='knit')
2215
response = request.execute('', 'some token')
2217
smart_req.SmartServerResponse(('TokenMismatch',)), response)
2220
class TestSmartServerRepositoryGetPhysicalLockStatus(
2221
tests.TestCaseWithTransport):
2223
def test_with_write_lock(self):
2224
backing = self.get_transport()
2225
repo = self.make_repository('.')
2226
self.addCleanup(repo.lock_write().unlock)
2227
# lock_write() doesn't necessarily actually take a physical
2229
if repo.get_physical_lock_status():
2233
request_class = smart_repo.SmartServerRepositoryGetPhysicalLockStatus
2234
request = request_class(backing)
2235
self.assertEqual(smart_req.SuccessfulSmartServerResponse((expected,)),
2236
request.execute('', ))
2238
def test_without_write_lock(self):
2239
backing = self.get_transport()
2240
repo = self.make_repository('.')
2241
self.assertEqual(False, repo.get_physical_lock_status())
2242
request_class = smart_repo.SmartServerRepositoryGetPhysicalLockStatus
2243
request = request_class(backing)
2244
self.assertEqual(smart_req.SuccessfulSmartServerResponse(('no',)),
2245
request.execute('', ))
2248
class TestSmartServerRepositoryReconcile(tests.TestCaseWithTransport):
2250
def test_reconcile(self):
2251
backing = self.get_transport()
2252
repo = self.make_repository('.')
2253
token = repo.lock_write().repository_token
2254
self.addCleanup(repo.unlock)
2255
request_class = smart_repo.SmartServerRepositoryReconcile
2256
request = request_class(backing)
2257
self.assertEqual(smart_req.SuccessfulSmartServerResponse(
2259
'garbage_inventories: 0\n'
2260
'inconsistent_parents: 0\n'),
2261
request.execute('', token))
2264
class TestSmartServerIsReadonly(tests.TestCaseWithMemoryTransport):
815
response = request.execute(backing.local_abspath(''), 'some token')
817
SmartServerResponse(('TokenMismatch',)), response)
820
class TestSmartServerRepositoryTarball(tests.TestCaseWithTransport):
822
def test_repository_tarball(self):
823
backing = self.get_transport()
824
request = smart.repository.SmartServerRepositoryTarball(backing)
825
repository = self.make_repository('.')
826
# make some extraneous junk in the repository directory which should
828
self.build_tree(['.bzr/repository/extra-junk'])
829
response = request.execute(backing.local_abspath(''), 'bz2')
830
self.assertEqual(('ok',), response.args)
831
# body should be a tbz2
832
body_file = StringIO(response.body)
833
body_tar = tarfile.open('body_tar.tbz2', fileobj=body_file,
835
# let's make sure there are some key repository components inside it.
836
# the tarfile returns directories with trailing slashes...
837
names = set([n.rstrip('/') for n in body_tar.getnames()])
838
self.assertTrue('.bzr/repository/lock' in names)
839
self.assertTrue('.bzr/repository/format' in names)
840
self.assertTrue('.bzr/repository/extra-junk' not in names,
841
"extraneous file present in tar file")
844
class TestSmartServerRepositoryStreamKnitData(tests.TestCaseWithTransport):
846
def test_fetch_revisions(self):
847
backing = self.get_transport()
848
request = smart.repository.SmartServerRepositoryStreamKnitDataForRevisions(backing)
849
tree = self.make_branch_and_memory_tree('.')
852
rev_id1_utf8 = u'\xc8'.encode('utf-8')
853
rev_id2_utf8 = u'\xc9'.encode('utf-8')
854
r1 = tree.commit('1st commit', rev_id=rev_id1_utf8)
855
r1 = tree.commit('2nd commit', rev_id=rev_id2_utf8)
858
response = request.execute(backing.local_abspath(''), rev_id2_utf8)
859
self.assertEqual(('ok',), response.args)
860
from cStringIO import StringIO
861
unpacker = pack.ContainerReader(StringIO(response.body))
863
for [name], read_bytes in unpacker.iter_records():
865
bytes = read_bytes(None)
866
# The bytes should be a valid bencoded string.
867
bencode.bdecode(bytes)
868
# XXX: assert that the bencoded knit records have the right
871
def test_no_such_revision_error(self):
872
backing = self.get_transport()
873
request = smart.repository.SmartServerRepositoryStreamKnitDataForRevisions(backing)
874
repo = self.make_repository('.')
875
rev_id1_utf8 = u'\xc8'.encode('utf-8')
876
response = request.execute(backing.local_abspath(''), rev_id1_utf8)
878
SmartServerResponse(('NoSuchRevision', rev_id1_utf8)),
882
class TestSmartServerRepositoryStreamRevisionsChunked(tests.TestCaseWithTransport):
884
def test_fetch_revisions(self):
885
backing = self.get_transport()
886
request = smart.repository.SmartServerRepositoryStreamRevisionsChunked(
888
tree = self.make_branch_and_memory_tree('.')
891
rev_id1_utf8 = u'\xc8'.encode('utf-8')
892
rev_id2_utf8 = u'\xc9'.encode('utf-8')
893
tree.commit('1st commit', rev_id=rev_id1_utf8)
894
tree.commit('2nd commit', rev_id=rev_id2_utf8)
897
response = request.execute(backing.local_abspath(''))
898
self.assertEqual(None, response)
899
response = request.do_body("%s\n%s\n1" % (rev_id2_utf8, rev_id1_utf8))
900
self.assertEqual(('ok',), response.args)
901
from cStringIO import StringIO
902
parser = pack.ContainerPushParser()
904
for stream_bytes in response.body_stream:
905
parser.accept_bytes(stream_bytes)
906
for [name], record_bytes in parser.read_pending_records():
908
# The bytes should be a valid bencoded string.
909
bencode.bdecode(record_bytes)
910
# XXX: assert that the bencoded knit records have the right
913
def test_no_such_revision_error(self):
914
backing = self.get_transport()
915
request = smart.repository.SmartServerRepositoryStreamRevisionsChunked(
917
repo = self.make_repository('.')
918
rev_id1_utf8 = u'\xc8'.encode('utf-8')
919
response = request.execute(backing.local_abspath(''))
920
self.assertEqual(None, response)
921
response = request.do_body("%s\n\n1" % (rev_id1_utf8,))
923
FailedSmartServerResponse(('NoSuchRevision', )),
927
class TestSmartServerIsReadonly(tests.TestCaseWithTransport):
2266
929
def test_is_readonly_no(self):
2267
930
backing = self.get_transport()
2268
request = smart_req.SmartServerIsReadonly(backing)
931
request = smart.request.SmartServerIsReadonly(backing)
2269
932
response = request.execute()
2270
933
self.assertEqual(
2271
smart_req.SmartServerResponse(('no',)), response)
934
SmartServerResponse(('no',)), response)
2273
936
def test_is_readonly_yes(self):
2274
937
backing = self.get_readonly_transport()
2275
request = smart_req.SmartServerIsReadonly(backing)
938
request = smart.request.SmartServerIsReadonly(backing)
2276
939
response = request.execute()
2277
940
self.assertEqual(
2278
smart_req.SmartServerResponse(('yes',)), response)
2281
class TestSmartServerRepositorySetMakeWorkingTrees(
2282
tests.TestCaseWithMemoryTransport):
2284
def test_set_false(self):
2285
backing = self.get_transport()
2286
repo = self.make_repository('.', shared=True)
2287
repo.set_make_working_trees(True)
2288
request_class = smart_repo.SmartServerRepositorySetMakeWorkingTrees
2289
request = request_class(backing)
2290
self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
2291
request.execute('', 'False'))
2292
repo = repo.bzrdir.open_repository()
2293
self.assertFalse(repo.make_working_trees())
2295
def test_set_true(self):
2296
backing = self.get_transport()
2297
repo = self.make_repository('.', shared=True)
2298
repo.set_make_working_trees(False)
2299
request_class = smart_repo.SmartServerRepositorySetMakeWorkingTrees
2300
request = request_class(backing)
2301
self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
2302
request.execute('', 'True'))
2303
repo = repo.bzrdir.open_repository()
2304
self.assertTrue(repo.make_working_trees())
2307
class TestSmartServerRepositoryGetSerializerFormat(
2308
tests.TestCaseWithMemoryTransport):
2310
def test_get_serializer_format(self):
2311
backing = self.get_transport()
2312
repo = self.make_repository('.', format='2a')
2313
request_class = smart_repo.SmartServerRepositoryGetSerializerFormat
2314
request = request_class(backing)
2316
smart_req.SuccessfulSmartServerResponse(('ok', '10')),
2317
request.execute(''))
2320
class TestSmartServerRepositoryWriteGroup(
2321
tests.TestCaseWithMemoryTransport):
2323
def test_start_write_group(self):
2324
backing = self.get_transport()
2325
repo = self.make_repository('.')
2326
lock_token = repo.lock_write().repository_token
2327
self.addCleanup(repo.unlock)
2328
request_class = smart_repo.SmartServerRepositoryStartWriteGroup
2329
request = request_class(backing)
2330
self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok', [])),
2331
request.execute('', lock_token))
2333
def test_start_write_group_unsuspendable(self):
2334
backing = self.get_transport()
2335
repo = self.make_repository('.', format='knit')
2336
lock_token = repo.lock_write().repository_token
2337
self.addCleanup(repo.unlock)
2338
request_class = smart_repo.SmartServerRepositoryStartWriteGroup
2339
request = request_class(backing)
2341
smart_req.FailedSmartServerResponse(('UnsuspendableWriteGroup',)),
2342
request.execute('', lock_token))
2344
def test_commit_write_group(self):
2345
backing = self.get_transport()
2346
repo = self.make_repository('.')
2347
lock_token = repo.lock_write().repository_token
2348
self.addCleanup(repo.unlock)
2349
repo.start_write_group()
2350
tokens = repo.suspend_write_group()
2351
request_class = smart_repo.SmartServerRepositoryCommitWriteGroup
2352
request = request_class(backing)
2353
self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
2354
request.execute('', lock_token, tokens))
2356
def test_abort_write_group(self):
2357
backing = self.get_transport()
2358
repo = self.make_repository('.')
2359
lock_token = repo.lock_write().repository_token
2360
repo.start_write_group()
2361
tokens = repo.suspend_write_group()
2362
self.addCleanup(repo.unlock)
2363
request_class = smart_repo.SmartServerRepositoryAbortWriteGroup
2364
request = request_class(backing)
2365
self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
2366
request.execute('', lock_token, tokens))
2368
def test_check_write_group(self):
2369
backing = self.get_transport()
2370
repo = self.make_repository('.')
2371
lock_token = repo.lock_write().repository_token
2372
repo.start_write_group()
2373
tokens = repo.suspend_write_group()
2374
self.addCleanup(repo.unlock)
2375
request_class = smart_repo.SmartServerRepositoryCheckWriteGroup
2376
request = request_class(backing)
2377
self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
2378
request.execute('', lock_token, tokens))
2380
def test_check_write_group_invalid(self):
2381
backing = self.get_transport()
2382
repo = self.make_repository('.')
2383
lock_token = repo.lock_write().repository_token
2384
self.addCleanup(repo.unlock)
2385
request_class = smart_repo.SmartServerRepositoryCheckWriteGroup
2386
request = request_class(backing)
2387
self.assertEqual(smart_req.FailedSmartServerResponse(
2388
('UnresumableWriteGroup', ['random'],
2389
'Malformed write group token')),
2390
request.execute('', lock_token, ["random"]))
2393
class TestSmartServerPackRepositoryAutopack(tests.TestCaseWithTransport):
2395
def make_repo_needing_autopacking(self, path='.'):
2396
# Make a repo in need of autopacking.
2397
tree = self.make_branch_and_tree('.', format='pack-0.92')
2398
repo = tree.branch.repository
2399
# monkey-patch the pack collection to disable autopacking
2400
repo._pack_collection._max_pack_count = lambda count: count
2402
tree.commit('commit %s' % x)
2403
self.assertEqual(10, len(repo._pack_collection.names()))
2404
del repo._pack_collection._max_pack_count
2407
def test_autopack_needed(self):
2408
repo = self.make_repo_needing_autopacking()
2410
self.addCleanup(repo.unlock)
2411
backing = self.get_transport()
2412
request = smart_packrepo.SmartServerPackRepositoryAutopack(
2414
response = request.execute('')
2415
self.assertEqual(smart_req.SmartServerResponse(('ok',)), response)
2416
repo._pack_collection.reload_pack_names()
2417
self.assertEqual(1, len(repo._pack_collection.names()))
2419
def test_autopack_not_needed(self):
2420
tree = self.make_branch_and_tree('.', format='pack-0.92')
2421
repo = tree.branch.repository
2423
self.addCleanup(repo.unlock)
2425
tree.commit('commit %s' % x)
2426
backing = self.get_transport()
2427
request = smart_packrepo.SmartServerPackRepositoryAutopack(
2429
response = request.execute('')
2430
self.assertEqual(smart_req.SmartServerResponse(('ok',)), response)
2431
repo._pack_collection.reload_pack_names()
2432
self.assertEqual(9, len(repo._pack_collection.names()))
2434
def test_autopack_on_nonpack_format(self):
2435
"""A request to autopack a non-pack repo is a no-op."""
2436
repo = self.make_repository('.', format='knit')
2437
backing = self.get_transport()
2438
request = smart_packrepo.SmartServerPackRepositoryAutopack(
2440
response = request.execute('')
2441
self.assertEqual(smart_req.SmartServerResponse(('ok',)), response)
2444
class TestSmartServerVfsGet(tests.TestCaseWithMemoryTransport):
2446
def test_unicode_path(self):
2447
"""VFS requests expect unicode paths to be escaped."""
2448
filename = u'foo\N{INTERROBANG}'
2449
filename_escaped = urlutils.escape(filename)
2450
backing = self.get_transport()
2451
request = vfs.GetRequest(backing)
2452
backing.put_bytes_non_atomic(filename_escaped, 'contents')
2453
self.assertEqual(smart_req.SmartServerResponse(('ok', ), 'contents'),
2454
request.execute(filename_escaped))
941
SmartServerResponse(('yes',)), response)
2457
944
class TestHandlers(tests.TestCase):
2458
945
"""Tests for the request.request_handlers object."""
2460
def test_all_registrations_exist(self):
2461
"""All registered request_handlers can be found."""
2462
# If there's a typo in a register_lazy call, this loop will fail with
2463
# an AttributeError.
2464
for key in smart_req.request_handlers.keys():
2466
item = smart_req.request_handlers.get(key)
2467
except AttributeError, e:
2468
raise AttributeError('failed to get %s: %s' % (key, e))
2470
def assertHandlerEqual(self, verb, handler):
2471
self.assertEqual(smart_req.request_handlers.get(verb), handler)
2473
947
def test_registered_methods(self):
2474
948
"""Test that known methods are registered to the correct object."""
2475
self.assertHandlerEqual('Branch.break_lock',
2476
smart_branch.SmartServerBranchBreakLock)
2477
self.assertHandlerEqual('Branch.get_config_file',
2478
smart_branch.SmartServerBranchGetConfigFile)
2479
self.assertHandlerEqual('Branch.put_config_file',
2480
smart_branch.SmartServerBranchPutConfigFile)
2481
self.assertHandlerEqual('Branch.get_parent',
2482
smart_branch.SmartServerBranchGetParent)
2483
self.assertHandlerEqual('Branch.get_physical_lock_status',
2484
smart_branch.SmartServerBranchRequestGetPhysicalLockStatus)
2485
self.assertHandlerEqual('Branch.get_tags_bytes',
2486
smart_branch.SmartServerBranchGetTagsBytes)
2487
self.assertHandlerEqual('Branch.lock_write',
2488
smart_branch.SmartServerBranchRequestLockWrite)
2489
self.assertHandlerEqual('Branch.last_revision_info',
2490
smart_branch.SmartServerBranchRequestLastRevisionInfo)
2491
self.assertHandlerEqual('Branch.revision_history',
2492
smart_branch.SmartServerRequestRevisionHistory)
2493
self.assertHandlerEqual('Branch.revision_id_to_revno',
2494
smart_branch.SmartServerBranchRequestRevisionIdToRevno)
2495
self.assertHandlerEqual('Branch.set_config_option',
2496
smart_branch.SmartServerBranchRequestSetConfigOption)
2497
self.assertHandlerEqual('Branch.set_last_revision',
2498
smart_branch.SmartServerBranchRequestSetLastRevision)
2499
self.assertHandlerEqual('Branch.set_last_revision_info',
2500
smart_branch.SmartServerBranchRequestSetLastRevisionInfo)
2501
self.assertHandlerEqual('Branch.set_last_revision_ex',
2502
smart_branch.SmartServerBranchRequestSetLastRevisionEx)
2503
self.assertHandlerEqual('Branch.set_parent_location',
2504
smart_branch.SmartServerBranchRequestSetParentLocation)
2505
self.assertHandlerEqual('Branch.unlock',
2506
smart_branch.SmartServerBranchRequestUnlock)
2507
self.assertHandlerEqual('BzrDir.destroy_branch',
2508
smart_dir.SmartServerBzrDirRequestDestroyBranch)
2509
self.assertHandlerEqual('BzrDir.find_repository',
2510
smart_dir.SmartServerRequestFindRepositoryV1)
2511
self.assertHandlerEqual('BzrDir.find_repositoryV2',
2512
smart_dir.SmartServerRequestFindRepositoryV2)
2513
self.assertHandlerEqual('BzrDirFormat.initialize',
2514
smart_dir.SmartServerRequestInitializeBzrDir)
2515
self.assertHandlerEqual('BzrDirFormat.initialize_ex_1.16',
2516
smart_dir.SmartServerRequestBzrDirInitializeEx)
2517
self.assertHandlerEqual('BzrDir.checkout_metadir',
2518
smart_dir.SmartServerBzrDirRequestCheckoutMetaDir)
2519
self.assertHandlerEqual('BzrDir.cloning_metadir',
2520
smart_dir.SmartServerBzrDirRequestCloningMetaDir)
2521
self.assertHandlerEqual('BzrDir.get_branches',
2522
smart_dir.SmartServerBzrDirRequestGetBranches)
2523
self.assertHandlerEqual('BzrDir.get_config_file',
2524
smart_dir.SmartServerBzrDirRequestConfigFile)
2525
self.assertHandlerEqual('BzrDir.open_branch',
2526
smart_dir.SmartServerRequestOpenBranch)
2527
self.assertHandlerEqual('BzrDir.open_branchV2',
2528
smart_dir.SmartServerRequestOpenBranchV2)
2529
self.assertHandlerEqual('BzrDir.open_branchV3',
2530
smart_dir.SmartServerRequestOpenBranchV3)
2531
self.assertHandlerEqual('PackRepository.autopack',
2532
smart_packrepo.SmartServerPackRepositoryAutopack)
2533
self.assertHandlerEqual('Repository.add_signature_text',
2534
smart_repo.SmartServerRepositoryAddSignatureText)
2535
self.assertHandlerEqual('Repository.all_revision_ids',
2536
smart_repo.SmartServerRepositoryAllRevisionIds)
2537
self.assertHandlerEqual('Repository.break_lock',
2538
smart_repo.SmartServerRepositoryBreakLock)
2539
self.assertHandlerEqual('Repository.gather_stats',
2540
smart_repo.SmartServerRepositoryGatherStats)
2541
self.assertHandlerEqual('Repository.get_parent_map',
2542
smart_repo.SmartServerRepositoryGetParentMap)
2543
self.assertHandlerEqual('Repository.get_physical_lock_status',
2544
smart_repo.SmartServerRepositoryGetPhysicalLockStatus)
2545
self.assertHandlerEqual('Repository.get_rev_id_for_revno',
2546
smart_repo.SmartServerRepositoryGetRevIdForRevno)
2547
self.assertHandlerEqual('Repository.get_revision_graph',
2548
smart_repo.SmartServerRepositoryGetRevisionGraph)
2549
self.assertHandlerEqual('Repository.get_revision_signature_text',
2550
smart_repo.SmartServerRepositoryGetRevisionSignatureText)
2551
self.assertHandlerEqual('Repository.get_stream',
2552
smart_repo.SmartServerRepositoryGetStream)
2553
self.assertHandlerEqual('Repository.get_stream_1.19',
2554
smart_repo.SmartServerRepositoryGetStream_1_19)
2555
self.assertHandlerEqual('Repository.iter_revisions',
2556
smart_repo.SmartServerRepositoryIterRevisions)
2557
self.assertHandlerEqual('Repository.has_revision',
2558
smart_repo.SmartServerRequestHasRevision)
2559
self.assertHandlerEqual('Repository.insert_stream',
2560
smart_repo.SmartServerRepositoryInsertStream)
2561
self.assertHandlerEqual('Repository.insert_stream_locked',
2562
smart_repo.SmartServerRepositoryInsertStreamLocked)
2563
self.assertHandlerEqual('Repository.is_shared',
2564
smart_repo.SmartServerRepositoryIsShared)
2565
self.assertHandlerEqual('Repository.iter_files_bytes',
2566
smart_repo.SmartServerRepositoryIterFilesBytes)
2567
self.assertHandlerEqual('Repository.lock_write',
2568
smart_repo.SmartServerRepositoryLockWrite)
2569
self.assertHandlerEqual('Repository.make_working_trees',
2570
smart_repo.SmartServerRepositoryMakeWorkingTrees)
2571
self.assertHandlerEqual('Repository.pack',
2572
smart_repo.SmartServerRepositoryPack)
2573
self.assertHandlerEqual('Repository.reconcile',
2574
smart_repo.SmartServerRepositoryReconcile)
2575
self.assertHandlerEqual('Repository.tarball',
2576
smart_repo.SmartServerRepositoryTarball)
2577
self.assertHandlerEqual('Repository.unlock',
2578
smart_repo.SmartServerRepositoryUnlock)
2579
self.assertHandlerEqual('Repository.start_write_group',
2580
smart_repo.SmartServerRepositoryStartWriteGroup)
2581
self.assertHandlerEqual('Repository.check_write_group',
2582
smart_repo.SmartServerRepositoryCheckWriteGroup)
2583
self.assertHandlerEqual('Repository.commit_write_group',
2584
smart_repo.SmartServerRepositoryCommitWriteGroup)
2585
self.assertHandlerEqual('Repository.abort_write_group',
2586
smart_repo.SmartServerRepositoryAbortWriteGroup)
2587
self.assertHandlerEqual('VersionedFileRepository.get_serializer_format',
2588
smart_repo.SmartServerRepositoryGetSerializerFormat)
2589
self.assertHandlerEqual('VersionedFileRepository.get_inventories',
2590
smart_repo.SmartServerRepositoryGetInventories)
2591
self.assertHandlerEqual('Transport.is_readonly',
2592
smart_req.SmartServerIsReadonly)
2595
class SmartTCPServerHookTests(tests.TestCaseWithMemoryTransport):
2596
"""Tests for SmartTCPServer hooks."""
2599
super(SmartTCPServerHookTests, self).setUp()
2600
self.server = server.SmartTCPServer(self.get_transport())
2602
def test_run_server_started_hooks(self):
2603
"""Test the server started hooks get fired properly."""
2605
server.SmartTCPServer.hooks.install_named_hook('server_started',
2606
lambda backing_urls, url: started_calls.append((backing_urls, url)),
2608
started_ex_calls = []
2609
server.SmartTCPServer.hooks.install_named_hook('server_started_ex',
2610
lambda backing_urls, url: started_ex_calls.append((backing_urls, url)),
2612
self.server._sockname = ('example.com', 42)
2613
self.server.run_server_started_hooks()
2614
self.assertEqual(started_calls,
2615
[([self.get_transport().base], 'bzr://example.com:42/')])
2616
self.assertEqual(started_ex_calls,
2617
[([self.get_transport().base], self.server)])
2619
def test_run_server_started_hooks_ipv6(self):
2620
"""Test that socknames can contain 4-tuples."""
2621
self.server._sockname = ('::', 42, 0, 0)
2623
server.SmartTCPServer.hooks.install_named_hook('server_started',
2624
lambda backing_urls, url: started_calls.append((backing_urls, url)),
2626
self.server.run_server_started_hooks()
2627
self.assertEqual(started_calls,
2628
[([self.get_transport().base], 'bzr://:::42/')])
2630
def test_run_server_stopped_hooks(self):
2631
"""Test the server stopped hooks."""
2632
self.server._sockname = ('example.com', 42)
2634
server.SmartTCPServer.hooks.install_named_hook('server_stopped',
2635
lambda backing_urls, url: stopped_calls.append((backing_urls, url)),
2637
self.server.run_server_stopped_hooks()
2638
self.assertEqual(stopped_calls,
2639
[([self.get_transport().base], 'bzr://example.com:42/')])
2642
class TestSmartServerRepositoryPack(tests.TestCaseWithMemoryTransport):
2644
def test_pack(self):
2645
backing = self.get_transport()
2646
request = smart_repo.SmartServerRepositoryPack(backing)
2647
tree = self.make_branch_and_memory_tree('.')
2648
repo_token = tree.branch.repository.lock_write().repository_token
2650
self.assertIs(None, request.execute('', repo_token, False))
2653
smart_req.SuccessfulSmartServerResponse(('ok', ), ),
2654
request.do_body(''))
2657
class TestSmartServerRepositoryGetInventories(tests.TestCaseWithTransport):
2659
def _get_serialized_inventory_delta(self, repository, base_revid, revid):
2660
base_inv = repository.revision_tree(base_revid).root_inventory
2661
inv = repository.revision_tree(revid).root_inventory
2662
inv_delta = inv._make_delta(base_inv)
2663
serializer = inventory_delta.InventoryDeltaSerializer(True, False)
2664
return "".join(serializer.delta_to_lines(base_revid, revid, inv_delta))
2666
def test_single(self):
2667
backing = self.get_transport()
2668
request = smart_repo.SmartServerRepositoryGetInventories(backing)
2669
t = self.make_branch_and_tree('.', format='2a')
2670
self.addCleanup(t.lock_write().unlock)
2671
self.build_tree_contents([("file", "somecontents")])
2672
t.add(["file"], ["thefileid"])
2673
t.commit(rev_id='somerev', message="add file")
2674
self.assertIs(None, request.execute('', 'unordered'))
2675
response = request.do_body("somerev\n")
2676
self.assertTrue(response.is_successful())
2677
self.assertEqual(response.args, ("ok", ))
2678
stream = [('inventory-deltas', [
2679
versionedfile.FulltextContentFactory('somerev', None, None,
2680
self._get_serialized_inventory_delta(
2681
t.branch.repository, 'null:', 'somerev'))])]
2682
fmt = controldir.format_registry.get('2a')().repository_format
2684
"".join(response.body_stream),
2685
"".join(smart_repo._stream_to_byte_stream(stream, fmt)))
2687
def test_empty(self):
2688
backing = self.get_transport()
2689
request = smart_repo.SmartServerRepositoryGetInventories(backing)
2690
t = self.make_branch_and_tree('.', format='2a')
2691
self.addCleanup(t.lock_write().unlock)
2692
self.build_tree_contents([("file", "somecontents")])
2693
t.add(["file"], ["thefileid"])
2694
t.commit(rev_id='somerev', message="add file")
2695
self.assertIs(None, request.execute('', 'unordered'))
2696
response = request.do_body("")
2697
self.assertTrue(response.is_successful())
2698
self.assertEqual(response.args, ("ok", ))
2699
self.assertEqual("".join(response.body_stream),
2700
"Bazaar pack format 1 (introduced in 0.18)\nB54\n\nBazaar repository format 2a (needs bzr 1.16 or later)\nE")
950
smart.request.request_handlers.get('Branch.get_config_file'),
951
smart.branch.SmartServerBranchGetConfigFile)
953
smart.request.request_handlers.get('Branch.lock_write'),
954
smart.branch.SmartServerBranchRequestLockWrite)
956
smart.request.request_handlers.get('Branch.last_revision_info'),
957
smart.branch.SmartServerBranchRequestLastRevisionInfo)
959
smart.request.request_handlers.get('Branch.revision_history'),
960
smart.branch.SmartServerRequestRevisionHistory)
962
smart.request.request_handlers.get('Branch.set_last_revision'),
963
smart.branch.SmartServerBranchRequestSetLastRevision)
965
smart.request.request_handlers.get('Branch.unlock'),
966
smart.branch.SmartServerBranchRequestUnlock)
968
smart.request.request_handlers.get('BzrDir.find_repository'),
969
smart.bzrdir.SmartServerRequestFindRepositoryV1)
971
smart.request.request_handlers.get('BzrDir.find_repositoryV2'),
972
smart.bzrdir.SmartServerRequestFindRepositoryV2)
974
smart.request.request_handlers.get('BzrDirFormat.initialize'),
975
smart.bzrdir.SmartServerRequestInitializeBzrDir)
977
smart.request.request_handlers.get('BzrDir.open_branch'),
978
smart.bzrdir.SmartServerRequestOpenBranch)
980
smart.request.request_handlers.get('Repository.gather_stats'),
981
smart.repository.SmartServerRepositoryGatherStats)
983
smart.request.request_handlers.get('Repository.get_parent_map'),
984
smart.repository.SmartServerRepositoryGetParentMap)
986
smart.request.request_handlers.get(
987
'Repository.get_revision_graph'),
988
smart.repository.SmartServerRepositoryGetRevisionGraph)
990
smart.request.request_handlers.get('Repository.has_revision'),
991
smart.repository.SmartServerRequestHasRevision)
993
smart.request.request_handlers.get('Repository.is_shared'),
994
smart.repository.SmartServerRepositoryIsShared)
996
smart.request.request_handlers.get('Repository.lock_write'),
997
smart.repository.SmartServerRepositoryLockWrite)
999
smart.request.request_handlers.get('Repository.tarball'),
1000
smart.repository.SmartServerRepositoryTarball)
1002
smart.request.request_handlers.get('Repository.unlock'),
1003
smart.repository.SmartServerRepositoryUnlock)
1005
smart.request.request_handlers.get('Transport.is_readonly'),
1006
smart.request.SmartServerIsReadonly)
added
removed
bzrlib/tests/test_smart.py
