99
35
# the default or a parameterized class, but rather use the
100
36
# TestCaseWithTransport infrastructure to set up a smart server and
102
self.overrideAttr(self, "transport_server", self.make_transport_server)
104
def make_transport_server(self):
105
return test_server.SmartTCPServer_for_testing('-' + self.id())
38
self.transport_server = smart.server.SmartTCPServer_for_testing
107
40
def get_smart_medium(self):
108
41
"""Get a smart medium to use in tests."""
109
42
return self.get_transport().get_smart_medium()
112
class TestByteStreamToStream(tests.TestCase):
114
def test_repeated_substreams_same_kind_are_one_stream(self):
115
# Make a stream - an iterable of bytestrings.
116
stream = [('text', [versionedfile.FulltextContentFactory(('k1',), None,
117
None, 'foo')]),('text', [
118
versionedfile.FulltextContentFactory(('k2',), None, None, 'bar')])]
119
fmt = bzrdir.format_registry.get('pack-0.92')().repository_format
120
bytes = smart_repo._stream_to_byte_stream(stream, fmt)
122
# Iterate the resulting iterable; checking that we get only one stream
124
fmt, stream = smart_repo._byte_stream_to_stream(bytes)
125
for kind, substream in stream:
126
streams.append((kind, list(substream)))
127
self.assertLength(1, streams)
128
self.assertLength(2, streams[0][1])
131
45
class TestSmartServerResponse(tests.TestCase):
133
47
def test__eq__(self):
134
self.assertEqual(smart_req.SmartServerResponse(('ok', )),
135
smart_req.SmartServerResponse(('ok', )))
136
self.assertEqual(smart_req.SmartServerResponse(('ok', ), 'body'),
137
smart_req.SmartServerResponse(('ok', ), 'body'))
138
self.assertNotEqual(smart_req.SmartServerResponse(('ok', )),
139
smart_req.SmartServerResponse(('notok', )))
140
self.assertNotEqual(smart_req.SmartServerResponse(('ok', ), 'body'),
141
smart_req.SmartServerResponse(('ok', )))
48
self.assertEqual(SmartServerResponse(('ok', )),
49
SmartServerResponse(('ok', )))
50
self.assertEqual(SmartServerResponse(('ok', ), 'body'),
51
SmartServerResponse(('ok', ), 'body'))
52
self.assertNotEqual(SmartServerResponse(('ok', )),
53
SmartServerResponse(('notok', )))
54
self.assertNotEqual(SmartServerResponse(('ok', ), 'body'),
55
SmartServerResponse(('ok', )))
142
56
self.assertNotEqual(None,
143
smart_req.SmartServerResponse(('ok', )))
145
def test__str__(self):
146
"""SmartServerResponses can be stringified."""
148
"<SuccessfulSmartServerResponse args=('args',) body='body'>",
149
str(smart_req.SuccessfulSmartServerResponse(('args',), 'body')))
151
"<FailedSmartServerResponse args=('args',) body='body'>",
152
str(smart_req.FailedSmartServerResponse(('args',), 'body')))
155
class TestSmartServerRequest(tests.TestCaseWithMemoryTransport):
157
def test_translate_client_path(self):
158
transport = self.get_transport()
159
request = smart_req.SmartServerRequest(transport, 'foo/')
160
self.assertEqual('./', request.translate_client_path('foo/'))
162
errors.InvalidURLJoin, request.translate_client_path, 'foo/..')
164
errors.PathNotChild, request.translate_client_path, '/')
166
errors.PathNotChild, request.translate_client_path, 'bar/')
167
self.assertEqual('./baz', request.translate_client_path('foo/baz'))
168
e_acute = u'\N{LATIN SMALL LETTER E WITH ACUTE}'.encode('utf-8')
169
self.assertEqual('./' + urlutils.escape(e_acute),
170
request.translate_client_path('foo/' + e_acute))
172
def test_translate_client_path_vfs(self):
173
"""VfsRequests receive escaped paths rather than raw UTF-8."""
174
transport = self.get_transport()
175
request = vfs.VfsRequest(transport, 'foo/')
176
e_acute = u'\N{LATIN SMALL LETTER E WITH ACUTE}'.encode('utf-8')
177
escaped = urlutils.escape('foo/' + e_acute)
178
self.assertEqual('./' + urlutils.escape(e_acute),
179
request.translate_client_path(escaped))
181
def test_transport_from_client_path(self):
182
transport = self.get_transport()
183
request = smart_req.SmartServerRequest(transport, 'foo/')
186
request.transport_from_client_path('foo/').base)
189
class TestSmartServerBzrDirRequestCloningMetaDir(
190
tests.TestCaseWithMemoryTransport):
191
"""Tests for BzrDir.cloning_metadir."""
193
def test_cloning_metadir(self):
194
"""When there is a bzrdir present, the call succeeds."""
195
backing = self.get_transport()
196
dir = self.make_bzrdir('.')
197
local_result = dir.cloning_metadir()
198
request_class = smart_dir.SmartServerBzrDirRequestCloningMetaDir
199
request = request_class(backing)
200
expected = smart_req.SuccessfulSmartServerResponse(
201
(local_result.network_name(),
202
local_result.repository_format.network_name(),
203
('branch', local_result.get_branch_format().network_name())))
204
self.assertEqual(expected, request.execute('', 'False'))
206
def test_cloning_metadir_reference(self):
207
"""The request fails when bzrdir contains a branch reference."""
208
backing = self.get_transport()
209
referenced_branch = self.make_branch('referenced')
210
dir = self.make_bzrdir('.')
211
local_result = dir.cloning_metadir()
212
reference = _mod_branch.BranchReferenceFormat().initialize(
213
dir, target_branch=referenced_branch)
214
reference_url = _mod_branch.BranchReferenceFormat().get_reference(dir)
215
# The server shouldn't try to follow the branch reference, so it's fine
216
# if the referenced branch isn't reachable.
217
backing.rename('referenced', 'moved')
218
request_class = smart_dir.SmartServerBzrDirRequestCloningMetaDir
219
request = request_class(backing)
220
expected = smart_req.FailedSmartServerResponse(('BranchReference',))
221
self.assertEqual(expected, request.execute('', 'False'))
224
class TestSmartServerRequestCreateRepository(tests.TestCaseWithMemoryTransport):
225
"""Tests for BzrDir.create_repository."""
227
def test_makes_repository(self):
228
"""When there is a bzrdir present, the call succeeds."""
229
backing = self.get_transport()
230
self.make_bzrdir('.')
231
request_class = smart_dir.SmartServerRequestCreateRepository
232
request = request_class(backing)
233
reference_bzrdir_format = bzrdir.format_registry.get('pack-0.92')()
234
reference_format = reference_bzrdir_format.repository_format
235
network_name = reference_format.network_name()
236
expected = smart_req.SuccessfulSmartServerResponse(
237
('ok', 'no', 'no', 'no', network_name))
238
self.assertEqual(expected, request.execute('', network_name, 'True'))
241
class TestSmartServerRequestFindRepository(tests.TestCaseWithMemoryTransport):
57
SmartServerResponse(('ok', )))
60
class TestSmartServerRequestFindRepository(tests.TestCaseWithTransport):
242
61
"""Tests for BzrDir.find_repository."""
244
63
def test_no_repository(self):
245
64
"""When there is no repository to be found, ('norepository', ) is returned."""
246
65
backing = self.get_transport()
247
request = self._request_class(backing)
66
request = smart.bzrdir.SmartServerRequestFindRepository(backing)
248
67
self.make_bzrdir('.')
249
self.assertEqual(smart_req.SmartServerResponse(('norepository', )),
68
self.assertEqual(SmartServerResponse(('norepository', )),
69
request.execute(backing.local_abspath('')))
252
71
def test_nonshared_repository(self):
253
# nonshared repositorys only allow 'find' to return a handle when the
254
# path the repository is being searched on is the same as that that
72
# nonshared repositorys only allow 'find' to return a handle when the
73
# path the repository is being searched on is the same as that that
255
74
# the repository is at.
256
75
backing = self.get_transport()
257
request = self._request_class(backing)
76
request = smart.bzrdir.SmartServerRequestFindRepository(backing)
258
77
result = self._make_repository_and_result()
259
self.assertEqual(result, request.execute(''))
78
self.assertEqual(result, request.execute(backing.local_abspath('')))
260
79
self.make_bzrdir('subdir')
261
self.assertEqual(smart_req.SmartServerResponse(('norepository', )),
262
request.execute('subdir'))
80
self.assertEqual(SmartServerResponse(('norepository', )),
81
request.execute(backing.local_abspath('subdir')))
264
83
def _make_repository_and_result(self, shared=False, format=None):
265
84
"""Convenience function to setup a repository.
374
140
def test_missing_dir(self):
375
141
"""Initializing a missing directory should fail like the bzrdir api."""
376
142
backing = self.get_transport()
377
request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
143
request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
378
144
self.assertRaises(errors.NoSuchFile,
379
request.execute, 'subdir')
145
request.execute, backing.local_abspath('subdir'))
381
147
def test_initialized_dir(self):
382
148
"""Initializing an extant bzrdir should fail like the bzrdir api."""
383
149
backing = self.get_transport()
384
request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
150
request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
385
151
self.make_bzrdir('subdir')
386
152
self.assertRaises(errors.FileExists,
387
request.execute, 'subdir')
390
class TestSmartServerRequestBzrDirInitializeEx(
391
tests.TestCaseWithMemoryTransport):
392
"""Basic tests for BzrDir.initialize_ex_1.16 in the smart server.
394
The main unit tests in test_bzrdir exercise the API comprehensively.
397
def test_empty_dir(self):
398
"""Initializing an empty dir should succeed and do it."""
399
backing = self.get_transport()
400
name = self.make_bzrdir('reference')._format.network_name()
401
request = smart_dir.SmartServerRequestBzrDirInitializeEx(backing)
403
smart_req.SmartServerResponse(('', '', '', '', '', '', name,
404
'False', '', '', '')),
405
request.execute(name, '', 'True', 'False', 'False', '', '', '', '',
407
made_dir = bzrdir.BzrDir.open_from_transport(backing)
408
# no branch, tree or repository is expected with the current
410
self.assertRaises(errors.NoWorkingTree, made_dir.open_workingtree)
411
self.assertRaises(errors.NotBranchError, made_dir.open_branch)
412
self.assertRaises(errors.NoRepositoryPresent, made_dir.open_repository)
414
def test_missing_dir(self):
415
"""Initializing a missing directory should fail like the bzrdir api."""
416
backing = self.get_transport()
417
name = self.make_bzrdir('reference')._format.network_name()
418
request = smart_dir.SmartServerRequestBzrDirInitializeEx(backing)
419
self.assertRaises(errors.NoSuchFile, request.execute, name,
420
'subdir/dir', 'False', 'False', 'False', '', '', '', '', 'False')
422
def test_initialized_dir(self):
423
"""Initializing an extant directory should fail like the bzrdir api."""
424
backing = self.get_transport()
425
name = self.make_bzrdir('reference')._format.network_name()
426
request = smart_dir.SmartServerRequestBzrDirInitializeEx(backing)
427
self.make_bzrdir('subdir')
428
self.assertRaises(errors.FileExists, request.execute, name, 'subdir',
429
'False', 'False', 'False', '', '', '', '', 'False')
432
class TestSmartServerRequestOpenBzrDir(tests.TestCaseWithMemoryTransport):
434
def test_no_directory(self):
435
backing = self.get_transport()
436
request = smart_dir.SmartServerRequestOpenBzrDir(backing)
437
self.assertEqual(smart_req.SmartServerResponse(('no', )),
438
request.execute('does-not-exist'))
440
def test_empty_directory(self):
441
backing = self.get_transport()
442
backing.mkdir('empty')
443
request = smart_dir.SmartServerRequestOpenBzrDir(backing)
444
self.assertEqual(smart_req.SmartServerResponse(('no', )),
445
request.execute('empty'))
447
def test_outside_root_client_path(self):
448
backing = self.get_transport()
449
request = smart_dir.SmartServerRequestOpenBzrDir(backing,
450
root_client_path='root')
451
self.assertEqual(smart_req.SmartServerResponse(('no', )),
452
request.execute('not-root'))
455
class TestSmartServerRequestOpenBzrDir_2_1(tests.TestCaseWithMemoryTransport):
457
def test_no_directory(self):
458
backing = self.get_transport()
459
request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
460
self.assertEqual(smart_req.SmartServerResponse(('no', )),
461
request.execute('does-not-exist'))
463
def test_empty_directory(self):
464
backing = self.get_transport()
465
backing.mkdir('empty')
466
request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
467
self.assertEqual(smart_req.SmartServerResponse(('no', )),
468
request.execute('empty'))
470
def test_present_without_workingtree(self):
471
backing = self.get_transport()
472
request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
473
self.make_bzrdir('.')
474
self.assertEqual(smart_req.SmartServerResponse(('yes', 'no')),
477
def test_outside_root_client_path(self):
478
backing = self.get_transport()
479
request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing,
480
root_client_path='root')
481
self.assertEqual(smart_req.SmartServerResponse(('no',)),
482
request.execute('not-root'))
485
class TestSmartServerRequestOpenBzrDir_2_1_disk(TestCaseWithChrootedTransport):
487
def test_present_with_workingtree(self):
488
self.vfs_transport_factory = test_server.LocalURLServer
489
backing = self.get_transport()
490
request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
491
bd = self.make_bzrdir('.')
492
bd.create_repository()
494
bd.create_workingtree()
495
self.assertEqual(smart_req.SmartServerResponse(('yes', 'yes')),
499
class TestSmartServerRequestOpenBranch(TestCaseWithChrootedTransport):
153
request.execute, backing.local_abspath('subdir'))
156
class TestSmartServerRequestOpenBranch(tests.TestCaseWithTransport):
501
158
def test_no_branch(self):
502
159
"""When there is no branch, ('nobranch', ) is returned."""
503
160
backing = self.get_transport()
504
request = smart_dir.SmartServerRequestOpenBranch(backing)
161
request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
505
162
self.make_bzrdir('.')
506
self.assertEqual(smart_req.SmartServerResponse(('nobranch', )),
163
self.assertEqual(SmartServerResponse(('nobranch', )),
164
request.execute(backing.local_abspath('')))
509
166
def test_branch(self):
510
167
"""When there is a branch, 'ok' is returned."""
511
168
backing = self.get_transport()
512
request = smart_dir.SmartServerRequestOpenBranch(backing)
169
request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
513
170
self.make_branch('.')
514
self.assertEqual(smart_req.SmartServerResponse(('ok', '')),
517
def test_branch_reference(self):
518
"""When there is a branch reference, the reference URL is returned."""
519
self.vfs_transport_factory = test_server.LocalURLServer
520
backing = self.get_transport()
521
request = smart_dir.SmartServerRequestOpenBranch(backing)
522
branch = self.make_branch('branch')
523
checkout = branch.create_checkout('reference',lightweight=True)
524
reference_url = _mod_branch.BranchReferenceFormat().get_reference(
526
self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
527
self.assertEqual(smart_req.SmartServerResponse(('ok', reference_url)),
528
request.execute('reference'))
530
def test_notification_on_branch_from_repository(self):
531
"""When there is a repository, the error should return details."""
532
backing = self.get_transport()
533
request = smart_dir.SmartServerRequestOpenBranch(backing)
534
repo = self.make_repository('.')
535
self.assertEqual(smart_req.SmartServerResponse(('nobranch',)),
539
class TestSmartServerRequestOpenBranchV2(TestCaseWithChrootedTransport):
541
def test_no_branch(self):
542
"""When there is no branch, ('nobranch', ) is returned."""
543
backing = self.get_transport()
544
self.make_bzrdir('.')
545
request = smart_dir.SmartServerRequestOpenBranchV2(backing)
546
self.assertEqual(smart_req.SmartServerResponse(('nobranch', )),
549
def test_branch(self):
550
"""When there is a branch, 'ok' is returned."""
551
backing = self.get_transport()
552
expected = self.make_branch('.')._format.network_name()
553
request = smart_dir.SmartServerRequestOpenBranchV2(backing)
554
self.assertEqual(smart_req.SuccessfulSmartServerResponse(
555
('branch', expected)),
558
def test_branch_reference(self):
559
"""When there is a branch reference, the reference URL is returned."""
560
self.vfs_transport_factory = test_server.LocalURLServer
561
backing = self.get_transport()
562
request = smart_dir.SmartServerRequestOpenBranchV2(backing)
563
branch = self.make_branch('branch')
564
checkout = branch.create_checkout('reference',lightweight=True)
565
reference_url = _mod_branch.BranchReferenceFormat().get_reference(
567
self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
568
self.assertEqual(smart_req.SuccessfulSmartServerResponse(
569
('ref', reference_url)),
570
request.execute('reference'))
572
def test_stacked_branch(self):
573
"""Opening a stacked branch does not open the stacked-on branch."""
574
trunk = self.make_branch('trunk')
575
feature = self.make_branch('feature')
576
feature.set_stacked_on_url(trunk.base)
578
_mod_branch.Branch.hooks.install_named_hook(
579
'open', opened_branches.append, None)
580
backing = self.get_transport()
581
request = smart_dir.SmartServerRequestOpenBranchV2(backing)
584
response = request.execute('feature')
586
request.teardown_jail()
587
expected_format = feature._format.network_name()
588
self.assertEqual(smart_req.SuccessfulSmartServerResponse(
589
('branch', expected_format)),
591
self.assertLength(1, opened_branches)
593
def test_notification_on_branch_from_repository(self):
594
"""When there is a repository, the error should return details."""
595
backing = self.get_transport()
596
request = smart_dir.SmartServerRequestOpenBranchV2(backing)
597
repo = self.make_repository('.')
598
self.assertEqual(smart_req.SmartServerResponse(('nobranch',)),
602
class TestSmartServerRequestOpenBranchV3(TestCaseWithChrootedTransport):
604
def test_no_branch(self):
605
"""When there is no branch, ('nobranch', ) is returned."""
606
backing = self.get_transport()
607
self.make_bzrdir('.')
608
request = smart_dir.SmartServerRequestOpenBranchV3(backing)
609
self.assertEqual(smart_req.SmartServerResponse(('nobranch',)),
612
def test_branch(self):
613
"""When there is a branch, 'ok' is returned."""
614
backing = self.get_transport()
615
expected = self.make_branch('.')._format.network_name()
616
request = smart_dir.SmartServerRequestOpenBranchV3(backing)
617
self.assertEqual(smart_req.SuccessfulSmartServerResponse(
618
('branch', expected)),
621
def test_branch_reference(self):
622
"""When there is a branch reference, the reference URL is returned."""
623
self.vfs_transport_factory = test_server.LocalURLServer
624
backing = self.get_transport()
625
request = smart_dir.SmartServerRequestOpenBranchV3(backing)
626
branch = self.make_branch('branch')
627
checkout = branch.create_checkout('reference',lightweight=True)
628
reference_url = _mod_branch.BranchReferenceFormat().get_reference(
630
self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
631
self.assertEqual(smart_req.SuccessfulSmartServerResponse(
632
('ref', reference_url)),
633
request.execute('reference'))
635
def test_stacked_branch(self):
636
"""Opening a stacked branch does not open the stacked-on branch."""
637
trunk = self.make_branch('trunk')
638
feature = self.make_branch('feature')
639
feature.set_stacked_on_url(trunk.base)
641
_mod_branch.Branch.hooks.install_named_hook(
642
'open', opened_branches.append, None)
643
backing = self.get_transport()
644
request = smart_dir.SmartServerRequestOpenBranchV3(backing)
647
response = request.execute('feature')
649
request.teardown_jail()
650
expected_format = feature._format.network_name()
651
self.assertEqual(smart_req.SuccessfulSmartServerResponse(
652
('branch', expected_format)),
654
self.assertLength(1, opened_branches)
656
def test_notification_on_branch_from_repository(self):
657
"""When there is a repository, the error should return details."""
658
backing = self.get_transport()
659
request = smart_dir.SmartServerRequestOpenBranchV3(backing)
660
repo = self.make_repository('.')
661
self.assertEqual(smart_req.SmartServerResponse(
662
('nobranch', 'location is a repository')),
666
class TestSmartServerRequestRevisionHistory(tests.TestCaseWithMemoryTransport):
171
self.assertEqual(SmartServerResponse(('ok', '')),
172
request.execute(backing.local_abspath('')))
174
def test_branch_reference(self):
175
"""When there is a branch reference, the reference URL is returned."""
176
backing = self.get_transport()
177
request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
178
branch = self.make_branch('branch')
179
checkout = branch.create_checkout('reference',lightweight=True)
180
# TODO: once we have an API to probe for references of any sort, we
182
reference_url = backing.abspath('branch') + '/'
183
self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
184
self.assertEqual(SmartServerResponse(('ok', reference_url)),
185
request.execute(backing.local_abspath('reference')))
188
class TestSmartServerRequestRevisionHistory(tests.TestCaseWithTransport):
668
190
def test_empty(self):
669
191
"""For an empty branch, the body is empty."""
670
192
backing = self.get_transport()
671
request = smart_branch.SmartServerRequestRevisionHistory(backing)
193
request = smart.branch.SmartServerRequestRevisionHistory(backing)
672
194
self.make_branch('.')
673
self.assertEqual(smart_req.SmartServerResponse(('ok', ), ''),
195
self.assertEqual(SmartServerResponse(('ok', ), ''),
196
request.execute(backing.local_abspath('')))
676
198
def test_not_empty(self):
677
199
"""For a non-empty branch, the body is empty."""
678
200
backing = self.get_transport()
679
request = smart_branch.SmartServerRequestRevisionHistory(backing)
201
request = smart.branch.SmartServerRequestRevisionHistory(backing)
680
202
tree = self.make_branch_and_memory_tree('.')
681
203
tree.lock_write()
731
252
r2 = tree.commit('2nd commit', rev_id=rev_id_utf8)
733
254
self.assertEqual(
734
smart_req.SmartServerResponse(('ok', '2', rev_id_utf8)),
738
class TestSmartServerBranchRequestGetConfigFile(
739
tests.TestCaseWithMemoryTransport):
255
SmartServerResponse(('ok', '2', rev_id_utf8)),
256
request.execute(backing.local_abspath('')))
259
class TestSmartServerBranchRequestGetConfigFile(tests.TestCaseWithTransport):
741
261
def test_default(self):
742
262
"""With no file, we get empty content."""
743
263
backing = self.get_transport()
744
request = smart_branch.SmartServerBranchGetConfigFile(backing)
264
request = smart.branch.SmartServerBranchGetConfigFile(backing)
745
265
branch = self.make_branch('.')
746
266
# there should be no file by default
748
self.assertEqual(smart_req.SmartServerResponse(('ok', ), content),
268
self.assertEqual(SmartServerResponse(('ok', ), content),
269
request.execute(backing.local_abspath('')))
751
271
def test_with_content(self):
752
272
# SmartServerBranchGetConfigFile should return the content from
753
273
# branch.control_files.get('branch.conf') for now - in the future it may
754
# perform more complex processing.
755
backing = self.get_transport()
756
request = smart_branch.SmartServerBranchGetConfigFile(backing)
757
branch = self.make_branch('.')
758
branch._transport.put_bytes('branch.conf', 'foo bar baz')
759
self.assertEqual(smart_req.SmartServerResponse(('ok', ), 'foo bar baz'),
763
class TestLockedBranch(tests.TestCaseWithMemoryTransport):
765
def get_lock_tokens(self, branch):
766
branch_token = branch.lock_write().branch_token
767
repo_token = branch.repository.lock_write().repository_token
768
branch.repository.unlock()
769
return branch_token, repo_token
772
class TestSmartServerBranchRequestSetConfigOption(TestLockedBranch):
774
def test_value_name(self):
775
branch = self.make_branch('.')
776
request = smart_branch.SmartServerBranchRequestSetConfigOption(
777
branch.bzrdir.root_transport)
778
branch_token, repo_token = self.get_lock_tokens(branch)
779
config = branch._get_config()
780
result = request.execute('', branch_token, repo_token, 'bar', 'foo',
782
self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), result)
783
self.assertEqual('bar', config.get_option('foo'))
787
def test_value_name_section(self):
788
branch = self.make_branch('.')
789
request = smart_branch.SmartServerBranchRequestSetConfigOption(
790
branch.bzrdir.root_transport)
791
branch_token, repo_token = self.get_lock_tokens(branch)
792
config = branch._get_config()
793
result = request.execute('', branch_token, repo_token, 'bar', 'foo',
795
self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), result)
796
self.assertEqual('bar', config.get_option('foo', 'gam'))
801
class TestSmartServerBranchRequestSetConfigOptionDict(TestLockedBranch):
804
TestLockedBranch.setUp(self)
805
# A dict with non-ascii keys and values to exercise unicode
807
self.encoded_value_dict = (
808
'd5:ascii1:a11:unicode \xe2\x8c\x9a3:\xe2\x80\xbde')
810
'ascii': 'a', u'unicode \N{WATCH}': u'\N{INTERROBANG}'}
812
def test_value_name(self):
813
branch = self.make_branch('.')
814
request = smart_branch.SmartServerBranchRequestSetConfigOptionDict(
815
branch.bzrdir.root_transport)
816
branch_token, repo_token = self.get_lock_tokens(branch)
817
config = branch._get_config()
818
result = request.execute('', branch_token, repo_token,
819
self.encoded_value_dict, 'foo', '')
820
self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), result)
821
self.assertEqual(self.value_dict, config.get_option('foo'))
825
def test_value_name_section(self):
826
branch = self.make_branch('.')
827
request = smart_branch.SmartServerBranchRequestSetConfigOptionDict(
828
branch.bzrdir.root_transport)
829
branch_token, repo_token = self.get_lock_tokens(branch)
830
config = branch._get_config()
831
result = request.execute('', branch_token, repo_token,
832
self.encoded_value_dict, 'foo', 'gam')
833
self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), result)
834
self.assertEqual(self.value_dict, config.get_option('foo', 'gam'))
839
class TestSmartServerBranchRequestSetTagsBytes(TestLockedBranch):
840
# Only called when the branch format and tags match [yay factory
841
# methods] so only need to test straight forward cases.
843
def test_set_bytes(self):
844
base_branch = self.make_branch('base')
845
tag_bytes = base_branch._get_tags_bytes()
846
# get_lock_tokens takes out a lock.
847
branch_token, repo_token = self.get_lock_tokens(base_branch)
848
request = smart_branch.SmartServerBranchSetTagsBytes(
849
self.get_transport())
850
response = request.execute('base', branch_token, repo_token)
851
self.assertEqual(None, response)
852
response = request.do_chunk(tag_bytes)
853
self.assertEqual(None, response)
854
response = request.do_end()
856
smart_req.SuccessfulSmartServerResponse(()), response)
859
def test_lock_failed(self):
860
base_branch = self.make_branch('base')
861
base_branch.lock_write()
862
tag_bytes = base_branch._get_tags_bytes()
863
request = smart_branch.SmartServerBranchSetTagsBytes(
864
self.get_transport())
865
self.assertRaises(errors.TokenMismatch, request.execute,
866
'base', 'wrong token', 'wrong token')
867
# The request handler will keep processing the message parts, so even
868
# if the request fails immediately do_chunk and do_end are still
870
request.do_chunk(tag_bytes)
876
class SetLastRevisionTestBase(TestLockedBranch):
877
"""Base test case for verbs that implement set_last_revision."""
880
tests.TestCaseWithMemoryTransport.setUp(self)
881
backing_transport = self.get_transport()
882
self.request = self.request_class(backing_transport)
883
self.tree = self.make_branch_and_memory_tree('.')
885
def lock_branch(self):
886
return self.get_lock_tokens(self.tree.branch)
888
def unlock_branch(self):
889
self.tree.branch.unlock()
891
def set_last_revision(self, revision_id, revno):
892
branch_token, repo_token = self.lock_branch()
893
response = self._set_last_revision(
894
revision_id, revno, branch_token, repo_token)
898
def assertRequestSucceeds(self, revision_id, revno):
899
response = self.set_last_revision(revision_id, revno)
900
self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
904
class TestSetLastRevisionVerbMixin(object):
905
"""Mixin test case for verbs that implement set_last_revision."""
907
def test_set_null_to_null(self):
908
"""An empty branch can have its last revision set to 'null:'."""
909
self.assertRequestSucceeds('null:', 0)
911
def test_NoSuchRevision(self):
912
"""If the revision_id is not present, the verb returns NoSuchRevision.
914
revision_id = 'non-existent revision'
915
self.assertEqual(smart_req.FailedSmartServerResponse(('NoSuchRevision',
917
self.set_last_revision(revision_id, 1))
919
def make_tree_with_two_commits(self):
920
self.tree.lock_write()
922
rev_id_utf8 = u'\xc8'.encode('utf-8')
923
r1 = self.tree.commit('1st commit', rev_id=rev_id_utf8)
924
r2 = self.tree.commit('2nd commit', rev_id='rev-2')
927
def test_branch_last_revision_info_is_updated(self):
928
"""A branch's tip can be set to a revision that is present in its
931
# Make a branch with an empty revision history, but two revisions in
933
self.make_tree_with_two_commits()
934
rev_id_utf8 = u'\xc8'.encode('utf-8')
935
self.tree.branch.set_last_revision_info(0, 'null:')
937
(0, 'null:'), self.tree.branch.last_revision_info())
938
# We can update the branch to a revision that is present in the
940
self.assertRequestSucceeds(rev_id_utf8, 1)
942
(1, rev_id_utf8), self.tree.branch.last_revision_info())
944
def test_branch_last_revision_info_rewind(self):
945
"""A branch's tip can be set to a revision that is an ancestor of the
948
self.make_tree_with_two_commits()
949
rev_id_utf8 = u'\xc8'.encode('utf-8')
951
(2, 'rev-2'), self.tree.branch.last_revision_info())
952
self.assertRequestSucceeds(rev_id_utf8, 1)
954
(1, rev_id_utf8), self.tree.branch.last_revision_info())
956
def test_TipChangeRejected(self):
957
"""If a pre_change_branch_tip hook raises TipChangeRejected, the verb
958
returns TipChangeRejected.
960
rejection_message = u'rejection message\N{INTERROBANG}'
961
def hook_that_rejects(params):
962
raise errors.TipChangeRejected(rejection_message)
963
_mod_branch.Branch.hooks.install_named_hook(
964
'pre_change_branch_tip', hook_that_rejects, None)
966
smart_req.FailedSmartServerResponse(
967
('TipChangeRejected', rejection_message.encode('utf-8'))),
968
self.set_last_revision('null:', 0))
971
class TestSmartServerBranchRequestSetLastRevision(
972
SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
973
"""Tests for Branch.set_last_revision verb."""
975
request_class = smart_branch.SmartServerBranchRequestSetLastRevision
977
def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
978
return self.request.execute(
979
'', branch_token, repo_token, revision_id)
982
class TestSmartServerBranchRequestSetLastRevisionInfo(
983
SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
984
"""Tests for Branch.set_last_revision_info verb."""
986
request_class = smart_branch.SmartServerBranchRequestSetLastRevisionInfo
988
def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
989
return self.request.execute(
990
'', branch_token, repo_token, revno, revision_id)
992
def test_NoSuchRevision(self):
993
"""Branch.set_last_revision_info does not have to return
994
NoSuchRevision if the revision_id is absent.
996
raise tests.TestNotApplicable()
999
class TestSmartServerBranchRequestSetLastRevisionEx(
1000
SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
1001
"""Tests for Branch.set_last_revision_ex verb."""
1003
request_class = smart_branch.SmartServerBranchRequestSetLastRevisionEx
1005
def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
1006
return self.request.execute(
1007
'', branch_token, repo_token, revision_id, 0, 0)
1009
def assertRequestSucceeds(self, revision_id, revno):
1010
response = self.set_last_revision(revision_id, revno)
1012
smart_req.SuccessfulSmartServerResponse(('ok', revno, revision_id)),
1015
def test_branch_last_revision_info_rewind(self):
1016
"""A branch's tip can be set to a revision that is an ancestor of the
1017
current tip, but only if allow_overwrite_descendant is passed.
1019
self.make_tree_with_two_commits()
1020
rev_id_utf8 = u'\xc8'.encode('utf-8')
1022
(2, 'rev-2'), self.tree.branch.last_revision_info())
1023
# If allow_overwrite_descendant flag is 0, then trying to set the tip
1024
# to an older revision ID has no effect.
1025
branch_token, repo_token = self.lock_branch()
1026
response = self.request.execute(
1027
'', branch_token, repo_token, rev_id_utf8, 0, 0)
1029
smart_req.SuccessfulSmartServerResponse(('ok', 2, 'rev-2')),
1032
(2, 'rev-2'), self.tree.branch.last_revision_info())
1034
# If allow_overwrite_descendant flag is 1, then setting the tip to an
1036
response = self.request.execute(
1037
'', branch_token, repo_token, rev_id_utf8, 0, 1)
1039
smart_req.SuccessfulSmartServerResponse(('ok', 1, rev_id_utf8)),
1041
self.unlock_branch()
1043
(1, rev_id_utf8), self.tree.branch.last_revision_info())
1045
def make_branch_with_divergent_history(self):
1046
"""Make a branch with divergent history in its repo.
1048
The branch's tip will be 'child-2', and the repo will also contain
1049
'child-1', which diverges from a common base revision.
1051
self.tree.lock_write()
1053
r1 = self.tree.commit('1st commit')
1054
revno_1, revid_1 = self.tree.branch.last_revision_info()
1055
r2 = self.tree.commit('2nd commit', rev_id='child-1')
1056
# Undo the second commit
1057
self.tree.branch.set_last_revision_info(revno_1, revid_1)
1058
self.tree.set_parent_ids([revid_1])
1059
# Make a new second commit, child-2. child-2 has diverged from
1061
new_r2 = self.tree.commit('2nd commit', rev_id='child-2')
1064
def test_not_allow_diverged(self):
1065
"""If allow_diverged is not passed, then setting a divergent history
1066
returns a Diverged error.
1068
self.make_branch_with_divergent_history()
1070
smart_req.FailedSmartServerResponse(('Diverged',)),
1071
self.set_last_revision('child-1', 2))
1072
# The branch tip was not changed.
1073
self.assertEqual('child-2', self.tree.branch.last_revision())
1075
def test_allow_diverged(self):
1076
"""If allow_diverged is passed, then setting a divergent history
1079
self.make_branch_with_divergent_history()
1080
branch_token, repo_token = self.lock_branch()
1081
response = self.request.execute(
1082
'', branch_token, repo_token, 'child-1', 1, 0)
1084
smart_req.SuccessfulSmartServerResponse(('ok', 2, 'child-1')),
1086
self.unlock_branch()
1087
# The branch tip was changed.
1088
self.assertEqual('child-1', self.tree.branch.last_revision())
1091
class TestSmartServerBranchRequestGetParent(tests.TestCaseWithMemoryTransport):
1093
def test_get_parent_none(self):
1094
base_branch = self.make_branch('base')
1095
request = smart_branch.SmartServerBranchGetParent(self.get_transport())
1096
response = request.execute('base')
1098
smart_req.SuccessfulSmartServerResponse(('',)), response)
1100
def test_get_parent_something(self):
1101
base_branch = self.make_branch('base')
1102
base_branch.set_parent(self.get_url('foo'))
1103
request = smart_branch.SmartServerBranchGetParent(self.get_transport())
1104
response = request.execute('base')
1106
smart_req.SuccessfulSmartServerResponse(("../foo",)),
1110
class TestSmartServerBranchRequestSetParent(TestLockedBranch):
1112
def test_set_parent_none(self):
1113
branch = self.make_branch('base', format="1.9")
1115
branch._set_parent_location('foo')
1117
request = smart_branch.SmartServerBranchRequestSetParentLocation(
1118
self.get_transport())
1119
branch_token, repo_token = self.get_lock_tokens(branch)
1121
response = request.execute('base', branch_token, repo_token, '')
1124
self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), response)
1125
self.assertEqual(None, branch.get_parent())
1127
def test_set_parent_something(self):
1128
branch = self.make_branch('base', format="1.9")
1129
request = smart_branch.SmartServerBranchRequestSetParentLocation(
1130
self.get_transport())
1131
branch_token, repo_token = self.get_lock_tokens(branch)
1133
response = request.execute('base', branch_token, repo_token,
1137
self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), response)
1138
self.assertEqual('http://bar/', branch.get_parent())
1141
class TestSmartServerBranchRequestGetTagsBytes(
1142
tests.TestCaseWithMemoryTransport):
1143
# Only called when the branch format and tags match [yay factory
1144
# methods] so only need to test straight forward cases.
1146
def test_get_bytes(self):
1147
base_branch = self.make_branch('base')
1148
request = smart_branch.SmartServerBranchGetTagsBytes(
1149
self.get_transport())
1150
response = request.execute('base')
1152
smart_req.SuccessfulSmartServerResponse(('',)), response)
1155
class TestSmartServerBranchRequestGetStackedOnURL(tests.TestCaseWithMemoryTransport):
1157
def test_get_stacked_on_url(self):
1158
base_branch = self.make_branch('base', format='1.6')
1159
stacked_branch = self.make_branch('stacked', format='1.6')
1160
# typically should be relative
1161
stacked_branch.set_stacked_on_url('../base')
1162
request = smart_branch.SmartServerBranchRequestGetStackedOnURL(
1163
self.get_transport())
1164
response = request.execute('stacked')
1166
smart_req.SmartServerResponse(('ok', '../base')),
1170
class TestSmartServerBranchRequestLockWrite(TestLockedBranch):
1173
tests.TestCaseWithMemoryTransport.setUp(self)
274
# perform more complex processing.
275
backing = self.get_transport()
276
request = smart.branch.SmartServerBranchGetConfigFile(backing)
277
branch = self.make_branch('.')
278
branch.control_files.put_utf8('branch.conf', 'foo bar baz')
279
self.assertEqual(SmartServerResponse(('ok', ), 'foo bar baz'),
280
request.execute(backing.local_abspath('')))
283
class TestSmartServerBranchRequestSetLastRevision(tests.TestCaseWithTransport):
285
def test_empty(self):
286
backing = self.get_transport()
287
request = smart.branch.SmartServerBranchRequestSetLastRevision(backing)
288
b = self.make_branch('.')
289
branch_token = b.lock_write()
290
repo_token = b.repository.lock_write()
291
b.repository.unlock()
293
self.assertEqual(SmartServerResponse(('ok',)),
295
backing.local_abspath(''), branch_token, repo_token,
300
def test_not_present_revision_id(self):
301
backing = self.get_transport()
302
request = smart.branch.SmartServerBranchRequestSetLastRevision(backing)
303
b = self.make_branch('.')
304
branch_token = b.lock_write()
305
repo_token = b.repository.lock_write()
306
b.repository.unlock()
308
revision_id = 'non-existent revision'
310
SmartServerResponse(('NoSuchRevision', revision_id)),
312
backing.local_abspath(''), branch_token, repo_token,
317
def test_revision_id_present(self):
318
backing = self.get_transport()
319
request = smart.branch.SmartServerBranchRequestSetLastRevision(backing)
320
tree = self.make_branch_and_memory_tree('.')
323
rev_id_utf8 = u'\xc8'.encode('utf-8')
324
r1 = tree.commit('1st commit', rev_id=rev_id_utf8)
325
r2 = tree.commit('2nd commit')
327
branch_token = tree.branch.lock_write()
328
repo_token = tree.branch.repository.lock_write()
329
tree.branch.repository.unlock()
332
SmartServerResponse(('ok',)),
334
backing.local_abspath(''), branch_token, repo_token,
336
self.assertEqual([rev_id_utf8], tree.branch.revision_history())
340
def test_revision_id_present2(self):
341
backing = self.get_transport()
342
request = smart.branch.SmartServerBranchRequestSetLastRevision(backing)
343
tree = self.make_branch_and_memory_tree('.')
346
rev_id_utf8 = u'\xc8'.encode('utf-8')
347
r1 = tree.commit('1st commit', rev_id=rev_id_utf8)
348
r2 = tree.commit('2nd commit')
350
tree.branch.set_revision_history([])
351
branch_token = tree.branch.lock_write()
352
repo_token = tree.branch.repository.lock_write()
353
tree.branch.repository.unlock()
356
SmartServerResponse(('ok',)),
358
backing.local_abspath(''), branch_token, repo_token,
360
self.assertEqual([rev_id_utf8], tree.branch.revision_history())
365
class TestSmartServerBranchRequestLockWrite(tests.TestCaseWithTransport):
368
tests.TestCaseWithTransport.setUp(self)
369
self.reduceLockdirTimeout()
1175
371
def test_lock_write_on_unlocked_branch(self):
1176
372
backing = self.get_transport()
1177
request = smart_branch.SmartServerBranchRequestLockWrite(backing)
1178
branch = self.make_branch('.', format='knit')
373
request = smart.branch.SmartServerBranchRequestLockWrite(backing)
374
branch = self.make_branch('.')
1179
375
repository = branch.repository
1180
response = request.execute('')
376
response = request.execute(backing.local_abspath(''))
1181
377
branch_nonce = branch.control_files._lock.peek().get('nonce')
1182
378
repository_nonce = repository.control_files._lock.peek().get('nonce')
1183
self.assertEqual(smart_req.SmartServerResponse(
1184
('ok', branch_nonce, repository_nonce)),
380
SmartServerResponse(('ok', branch_nonce, repository_nonce)),
1186
382
# The branch (and associated repository) is now locked. Verify that
1187
383
# with a new branch object.
1188
384
new_branch = repository.bzrdir.open_branch()
1189
385
self.assertRaises(errors.LockContention, new_branch.lock_write)
1191
request = smart_branch.SmartServerBranchRequestUnlock(backing)
1192
response = request.execute('', branch_nonce, repository_nonce)
1194
387
def test_lock_write_on_locked_branch(self):
1195
388
backing = self.get_transport()
1196
request = smart_branch.SmartServerBranchRequestLockWrite(backing)
389
request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1197
390
branch = self.make_branch('.')
1198
branch_token = branch.lock_write().branch_token
1199
392
branch.leave_lock_in_place()
1201
response = request.execute('')
394
response = request.execute(backing.local_abspath(''))
1202
395
self.assertEqual(
1203
smart_req.SmartServerResponse(('LockContention',)), response)
1205
branch.lock_write(branch_token)
1206
branch.dont_leave_lock_in_place()
396
SmartServerResponse(('LockContention',)), response)
1209
398
def test_lock_write_with_tokens_on_locked_branch(self):
1210
399
backing = self.get_transport()
1211
request = smart_branch.SmartServerBranchRequestLockWrite(backing)
1212
branch = self.make_branch('.', format='knit')
1213
branch_token, repo_token = self.get_lock_tokens(branch)
400
request = smart.branch.SmartServerBranchRequestLockWrite(backing)
401
branch = self.make_branch('.')
402
branch_token = branch.lock_write()
403
repo_token = branch.repository.lock_write()
404
branch.repository.unlock()
1214
405
branch.leave_lock_in_place()
1215
406
branch.repository.leave_lock_in_place()
1217
response = request.execute('',
408
response = request.execute(backing.local_abspath(''),
1218
409
branch_token, repo_token)
1219
410
self.assertEqual(
1220
smart_req.SmartServerResponse(('ok', branch_token, repo_token)),
1223
branch.repository.lock_write(repo_token)
1224
branch.repository.dont_leave_lock_in_place()
1225
branch.repository.unlock()
1226
branch.lock_write(branch_token)
1227
branch.dont_leave_lock_in_place()
411
SmartServerResponse(('ok', branch_token, repo_token)), response)
1230
413
def test_lock_write_with_mismatched_tokens_on_locked_branch(self):
1231
414
backing = self.get_transport()
1232
request = smart_branch.SmartServerBranchRequestLockWrite(backing)
1233
branch = self.make_branch('.', format='knit')
1234
branch_token, repo_token = self.get_lock_tokens(branch)
415
request = smart.branch.SmartServerBranchRequestLockWrite(backing)
416
branch = self.make_branch('.')
417
branch_token = branch.lock_write()
418
repo_token = branch.repository.lock_write()
419
branch.repository.unlock()
1235
420
branch.leave_lock_in_place()
1236
421
branch.repository.leave_lock_in_place()
1238
response = request.execute('',
423
response = request.execute(backing.local_abspath(''),
1239
424
branch_token+'xxx', repo_token)
1240
425
self.assertEqual(
1241
smart_req.SmartServerResponse(('TokenMismatch',)), response)
1243
branch.repository.lock_write(repo_token)
1244
branch.repository.dont_leave_lock_in_place()
1245
branch.repository.unlock()
1246
branch.lock_write(branch_token)
1247
branch.dont_leave_lock_in_place()
426
SmartServerResponse(('TokenMismatch',)), response)
1250
428
def test_lock_write_on_locked_repo(self):
1251
429
backing = self.get_transport()
1252
request = smart_branch.SmartServerBranchRequestLockWrite(backing)
1253
branch = self.make_branch('.', format='knit')
1254
repo = branch.repository
1255
repo_token = repo.lock_write().repository_token
1256
repo.leave_lock_in_place()
1258
response = request.execute('')
430
request = smart.branch.SmartServerBranchRequestLockWrite(backing)
431
branch = self.make_branch('.')
432
branch.repository.lock_write()
433
branch.repository.leave_lock_in_place()
434
branch.repository.unlock()
435
response = request.execute(backing.local_abspath(''))
1259
436
self.assertEqual(
1260
smart_req.SmartServerResponse(('LockContention',)), response)
1262
repo.lock_write(repo_token)
1263
repo.dont_leave_lock_in_place()
437
SmartServerResponse(('LockContention',)), response)
1266
439
def test_lock_write_on_readonly_transport(self):
1267
440
backing = self.get_readonly_transport()
1268
request = smart_branch.SmartServerBranchRequestLockWrite(backing)
441
request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1269
442
branch = self.make_branch('.')
1270
root = self.get_transport().clone('/')
1271
path = urlutils.relative_url(root.base, self.get_transport().base)
1272
response = request.execute(path)
1273
error_name, lock_str, why_str = response.args
1274
self.assertFalse(response.is_successful())
1275
self.assertEqual('LockFailed', error_name)
1278
class TestSmartServerBranchRequestUnlock(TestLockedBranch):
443
response = request.execute('')
445
SmartServerResponse(('UnlockableTransport',)), response)
448
class TestSmartServerBranchRequestUnlock(tests.TestCaseWithTransport):
1280
450
def setUp(self):
1281
tests.TestCaseWithMemoryTransport.setUp(self)
451
tests.TestCaseWithTransport.setUp(self)
452
self.reduceLockdirTimeout()
1283
454
def test_unlock_on_locked_branch_and_repo(self):
1284
455
backing = self.get_transport()
1285
request = smart_branch.SmartServerBranchRequestUnlock(backing)
1286
branch = self.make_branch('.', format='knit')
456
request = smart.branch.SmartServerBranchRequestUnlock(backing)
457
branch = self.make_branch('.')
1287
458
# Lock the branch
1288
branch_token, repo_token = self.get_lock_tokens(branch)
459
branch_token = branch.lock_write()
460
repo_token = branch.repository.lock_write()
461
branch.repository.unlock()
1289
462
# Unlock the branch (and repo) object, leaving the physical locks
1291
464
branch.leave_lock_in_place()
1292
465
branch.repository.leave_lock_in_place()
1294
response = request.execute('',
467
response = request.execute(backing.local_abspath(''),
1295
468
branch_token, repo_token)
1296
469
self.assertEqual(
1297
smart_req.SmartServerResponse(('ok',)), response)
470
SmartServerResponse(('ok',)), response)
1298
471
# The branch is now unlocked. Verify that with a new branch
1300
473
new_branch = branch.bzrdir.open_branch()
1421
562
# Note that it still returns body (of zero bytes).
1422
self.assertEqual(smart_req.SmartServerResponse(
1423
('nosuchrevision', 'missingrevision', ), ''),
1424
request.execute('', 'missingrevision'))
1427
class TestSmartServerRepositoryGetRevIdForRevno(
1428
tests.TestCaseWithMemoryTransport):
1430
def test_revno_found(self):
1431
backing = self.get_transport()
1432
request = smart_repo.SmartServerRepositoryGetRevIdForRevno(backing)
1433
tree = self.make_branch_and_memory_tree('.')
1436
rev1_id_utf8 = u'\xc8'.encode('utf-8')
1437
rev2_id_utf8 = u'\xc9'.encode('utf-8')
1438
tree.commit('1st commit', rev_id=rev1_id_utf8)
1439
tree.commit('2nd commit', rev_id=rev2_id_utf8)
1442
self.assertEqual(smart_req.SmartServerResponse(('ok', rev1_id_utf8)),
1443
request.execute('', 1, (2, rev2_id_utf8)))
1445
def test_known_revid_missing(self):
1446
backing = self.get_transport()
1447
request = smart_repo.SmartServerRepositoryGetRevIdForRevno(backing)
1448
repo = self.make_repository('.')
1450
smart_req.FailedSmartServerResponse(('nosuchrevision', 'ghost')),
1451
request.execute('', 1, (2, 'ghost')))
1453
def test_history_incomplete(self):
1454
backing = self.get_transport()
1455
request = smart_repo.SmartServerRepositoryGetRevIdForRevno(backing)
1456
parent = self.make_branch_and_memory_tree('parent', format='1.9')
1458
parent.add([''], ['TREE_ROOT'])
1459
r1 = parent.commit(message='first commit')
1460
r2 = parent.commit(message='second commit')
1462
local = self.make_branch_and_memory_tree('local', format='1.9')
1463
local.branch.pull(parent.branch)
1464
local.set_parent_ids([r2])
1465
r3 = local.commit(message='local commit')
1466
local.branch.create_clone_on_transport(
1467
self.get_transport('stacked'), stacked_on=self.get_url('parent'))
1469
smart_req.SmartServerResponse(('history-incomplete', 2, r2)),
1470
request.execute('stacked', 1, (3, r3)))
1473
class GetStreamTestBase(tests.TestCaseWithMemoryTransport):
1475
def make_two_commit_repo(self):
1476
tree = self.make_branch_and_memory_tree('.')
1479
r1 = tree.commit('1st commit')
1480
r2 = tree.commit('2nd commit', rev_id=u'\xc8'.encode('utf-8'))
1482
repo = tree.branch.repository
1486
class TestSmartServerRepositoryGetStream(GetStreamTestBase):
1488
def test_ancestry_of(self):
1489
"""The search argument may be a 'ancestry-of' some heads'."""
1490
backing = self.get_transport()
1491
request = smart_repo.SmartServerRepositoryGetStream(backing)
1492
repo, r1, r2 = self.make_two_commit_repo()
1493
fetch_spec = ['ancestry-of', r2]
1494
lines = '\n'.join(fetch_spec)
1495
request.execute('', repo._format.network_name())
1496
response = request.do_body(lines)
1497
self.assertEqual(('ok',), response.args)
1498
stream_bytes = ''.join(response.body_stream)
1499
self.assertStartsWith(stream_bytes, 'Bazaar pack format 1')
1501
def test_search(self):
1502
"""The search argument may be a 'search' of some explicit keys."""
1503
backing = self.get_transport()
1504
request = smart_repo.SmartServerRepositoryGetStream(backing)
1505
repo, r1, r2 = self.make_two_commit_repo()
1506
fetch_spec = ['search', '%s %s' % (r1, r2), 'null:', '2']
1507
lines = '\n'.join(fetch_spec)
1508
request.execute('', repo._format.network_name())
1509
response = request.do_body(lines)
1510
self.assertEqual(('ok',), response.args)
1511
stream_bytes = ''.join(response.body_stream)
1512
self.assertStartsWith(stream_bytes, 'Bazaar pack format 1')
1514
def test_search_everything(self):
1515
"""A search of 'everything' returns a stream."""
1516
backing = self.get_transport()
1517
request = smart_repo.SmartServerRepositoryGetStream_1_19(backing)
1518
repo, r1, r2 = self.make_two_commit_repo()
1519
serialised_fetch_spec = 'everything'
1520
request.execute('', repo._format.network_name())
1521
response = request.do_body(serialised_fetch_spec)
1522
self.assertEqual(('ok',), response.args)
1523
stream_bytes = ''.join(response.body_stream)
1524
self.assertStartsWith(stream_bytes, 'Bazaar pack format 1')
1527
class TestSmartServerRequestHasRevision(tests.TestCaseWithMemoryTransport):
564
SmartServerResponse(('nosuchrevision', 'missingrevision', ), ''),
565
request.execute(backing.local_abspath(''), 'missingrevision'))
568
class TestSmartServerRequestHasRevision(tests.TestCaseWithTransport):
1529
570
def test_missing_revision(self):
1530
571
"""For a missing revision, ('no', ) is returned."""
1531
572
backing = self.get_transport()
1532
request = smart_repo.SmartServerRequestHasRevision(backing)
573
request = smart.repository.SmartServerRequestHasRevision(backing)
1533
574
self.make_repository('.')
1534
self.assertEqual(smart_req.SmartServerResponse(('no', )),
1535
request.execute('', 'revid'))
575
self.assertEqual(SmartServerResponse(('no', )),
576
request.execute(backing.local_abspath(''), 'revid'))
1537
578
def test_present_revision(self):
1538
579
"""For a present revision, ('yes', ) is returned."""
1539
580
backing = self.get_transport()
1540
request = smart_repo.SmartServerRequestHasRevision(backing)
581
request = smart.repository.SmartServerRequestHasRevision(backing)
1541
582
tree = self.make_branch_and_memory_tree('.')
1542
583
tree.lock_write()
1600
644
stats = tree.branch.repository.gather_stats()
1602
647
expected_body = ('committers: 2\n'
1603
648
'firstrev: 123456.200 3600\n'
1604
649
'latestrev: 654321.400 0\n'
1606
self.assertEqual(smart_req.SmartServerResponse(('ok', ), expected_body),
652
self.assertEqual(SmartServerResponse(('ok', ), expected_body),
653
request.execute(backing.local_abspath(''),
1608
654
rev_id_utf8, 'yes'))
1611
class TestSmartServerRepositoryIsShared(tests.TestCaseWithMemoryTransport):
657
class TestSmartServerRepositoryIsShared(tests.TestCaseWithTransport):
1613
659
def test_is_shared(self):
1614
660
"""For a shared repository, ('yes', ) is returned."""
1615
661
backing = self.get_transport()
1616
request = smart_repo.SmartServerRepositoryIsShared(backing)
662
request = smart.repository.SmartServerRepositoryIsShared(backing)
1617
663
self.make_repository('.', shared=True)
1618
self.assertEqual(smart_req.SmartServerResponse(('yes', )),
1619
request.execute('', ))
664
self.assertEqual(SmartServerResponse(('yes', )),
665
request.execute(backing.local_abspath(''), ))
1621
667
def test_is_not_shared(self):
1622
668
"""For a shared repository, ('no', ) is returned."""
1623
669
backing = self.get_transport()
1624
request = smart_repo.SmartServerRepositoryIsShared(backing)
670
request = smart.repository.SmartServerRepositoryIsShared(backing)
1625
671
self.make_repository('.', shared=False)
1626
self.assertEqual(smart_req.SmartServerResponse(('no', )),
1627
request.execute('', ))
1630
class TestSmartServerRepositoryLockWrite(tests.TestCaseWithMemoryTransport):
672
self.assertEqual(SmartServerResponse(('no', )),
673
request.execute(backing.local_abspath(''), ))
676
class TestSmartServerRepositoryLockWrite(tests.TestCaseWithTransport):
679
tests.TestCaseWithTransport.setUp(self)
680
self.reduceLockdirTimeout()
1632
682
def test_lock_write_on_unlocked_repo(self):
1633
683
backing = self.get_transport()
1634
request = smart_repo.SmartServerRepositoryLockWrite(backing)
1635
repository = self.make_repository('.', format='knit')
1636
response = request.execute('')
684
request = smart.repository.SmartServerRepositoryLockWrite(backing)
685
repository = self.make_repository('.')
686
response = request.execute(backing.local_abspath(''))
1637
687
nonce = repository.control_files._lock.peek().get('nonce')
1638
self.assertEqual(smart_req.SmartServerResponse(('ok', nonce)), response)
688
self.assertEqual(SmartServerResponse(('ok', nonce)), response)
1639
689
# The repository is now locked. Verify that with a new repository
1641
691
new_repo = repository.bzrdir.open_repository()
1642
692
self.assertRaises(errors.LockContention, new_repo.lock_write)
1644
request = smart_repo.SmartServerRepositoryUnlock(backing)
1645
response = request.execute('', nonce)
1647
694
def test_lock_write_on_locked_repo(self):
1648
695
backing = self.get_transport()
1649
request = smart_repo.SmartServerRepositoryLockWrite(backing)
1650
repository = self.make_repository('.', format='knit')
1651
repo_token = repository.lock_write().repository_token
696
request = smart.repository.SmartServerRepositoryLockWrite(backing)
697
repository = self.make_repository('.')
698
repository.lock_write()
1652
699
repository.leave_lock_in_place()
1653
700
repository.unlock()
1654
response = request.execute('')
701
response = request.execute(backing.local_abspath(''))
1655
702
self.assertEqual(
1656
smart_req.SmartServerResponse(('LockContention',)), response)
1658
repository.lock_write(repo_token)
1659
repository.dont_leave_lock_in_place()
703
SmartServerResponse(('LockContention',)), response)
1662
705
def test_lock_write_on_readonly_transport(self):
1663
706
backing = self.get_readonly_transport()
1664
request = smart_repo.SmartServerRepositoryLockWrite(backing)
1665
repository = self.make_repository('.', format='knit')
707
request = smart.repository.SmartServerRepositoryLockWrite(backing)
708
repository = self.make_repository('.')
1666
709
response = request.execute('')
1667
self.assertFalse(response.is_successful())
1668
self.assertEqual('LockFailed', response.args[0])
1671
class TestInsertStreamBase(tests.TestCaseWithMemoryTransport):
1673
def make_empty_byte_stream(self, repo):
1674
byte_stream = smart_repo._stream_to_byte_stream([], repo._format)
1675
return ''.join(byte_stream)
1678
class TestSmartServerRepositoryInsertStream(TestInsertStreamBase):
1680
def test_insert_stream_empty(self):
1681
backing = self.get_transport()
1682
request = smart_repo.SmartServerRepositoryInsertStream(backing)
1683
repository = self.make_repository('.')
1684
response = request.execute('', '')
1685
self.assertEqual(None, response)
1686
response = request.do_chunk(self.make_empty_byte_stream(repository))
1687
self.assertEqual(None, response)
1688
response = request.do_end()
1689
self.assertEqual(smart_req.SmartServerResponse(('ok', )), response)
1692
class TestSmartServerRepositoryInsertStreamLocked(TestInsertStreamBase):
1694
def test_insert_stream_empty(self):
1695
backing = self.get_transport()
1696
request = smart_repo.SmartServerRepositoryInsertStreamLocked(
1698
repository = self.make_repository('.', format='knit')
1699
lock_token = repository.lock_write().repository_token
1700
response = request.execute('', '', lock_token)
1701
self.assertEqual(None, response)
1702
response = request.do_chunk(self.make_empty_byte_stream(repository))
1703
self.assertEqual(None, response)
1704
response = request.do_end()
1705
self.assertEqual(smart_req.SmartServerResponse(('ok', )), response)
1708
def test_insert_stream_with_wrong_lock_token(self):
1709
backing = self.get_transport()
1710
request = smart_repo.SmartServerRepositoryInsertStreamLocked(
1712
repository = self.make_repository('.', format='knit')
1713
lock_token = repository.lock_write().repository_token
1715
errors.TokenMismatch, request.execute, '', '', 'wrong-token')
1719
class TestSmartServerRepositoryUnlock(tests.TestCaseWithMemoryTransport):
711
SmartServerResponse(('UnlockableTransport',)), response)
714
class TestSmartServerRepositoryUnlock(tests.TestCaseWithTransport):
1721
716
def setUp(self):
1722
tests.TestCaseWithMemoryTransport.setUp(self)
717
tests.TestCaseWithTransport.setUp(self)
718
self.reduceLockdirTimeout()
1724
720
def test_unlock_on_locked_repo(self):
1725
721
backing = self.get_transport()
1726
request = smart_repo.SmartServerRepositoryUnlock(backing)
1727
repository = self.make_repository('.', format='knit')
1728
token = repository.lock_write().repository_token
722
request = smart.repository.SmartServerRepositoryUnlock(backing)
723
repository = self.make_repository('.')
724
token = repository.lock_write()
1729
725
repository.leave_lock_in_place()
1730
726
repository.unlock()
1731
response = request.execute('', token)
727
response = request.execute(backing.local_abspath(''), token)
1732
728
self.assertEqual(
1733
smart_req.SmartServerResponse(('ok',)), response)
729
SmartServerResponse(('ok',)), response)
1734
730
# The repository is now unlocked. Verify that with a new repository
1736
732
new_repo = repository.bzrdir.open_repository()
1740
736
def test_unlock_on_unlocked_repo(self):
1741
737
backing = self.get_transport()
1742
request = smart_repo.SmartServerRepositoryUnlock(backing)
1743
repository = self.make_repository('.', format='knit')
1744
response = request.execute('', 'some token')
738
request = smart.repository.SmartServerRepositoryUnlock(backing)
739
repository = self.make_repository('.')
740
response = request.execute(backing.local_abspath(''), 'some token')
1745
741
self.assertEqual(
1746
smart_req.SmartServerResponse(('TokenMismatch',)), response)
1749
class TestSmartServerIsReadonly(tests.TestCaseWithMemoryTransport):
742
SmartServerResponse(('TokenMismatch',)), response)
745
class TestSmartServerRepositoryTarball(tests.TestCaseWithTransport):
747
def test_repository_tarball(self):
748
backing = self.get_transport()
749
request = smart.repository.SmartServerRepositoryTarball(backing)
750
repository = self.make_repository('.')
751
# make some extraneous junk in the repository directory which should
753
self.build_tree(['.bzr/repository/extra-junk'])
754
response = request.execute(backing.local_abspath(''), 'bz2')
755
self.assertEqual(('ok',), response.args)
756
# body should be a tbz2
757
body_file = StringIO(response.body)
758
body_tar = tarfile.open('body_tar.tbz2', fileobj=body_file,
760
# let's make sure there are some key repository components inside it.
761
# the tarfile returns directories with trailing slashes...
762
names = set([n.rstrip('/') for n in body_tar.getnames()])
763
self.assertTrue('.bzr/repository/lock' in names)
764
self.assertTrue('.bzr/repository/format' in names)
765
self.assertTrue('.bzr/repository/extra-junk' not in names,
766
"extraneous file present in tar file")
769
class TestSmartServerIsReadonly(tests.TestCaseWithTransport):
1751
771
def test_is_readonly_no(self):
1752
772
backing = self.get_transport()
1753
request = smart_req.SmartServerIsReadonly(backing)
773
request = smart.request.SmartServerIsReadonly(backing)
1754
774
response = request.execute()
1755
775
self.assertEqual(
1756
smart_req.SmartServerResponse(('no',)), response)
776
SmartServerResponse(('no',)), response)
1758
778
def test_is_readonly_yes(self):
1759
779
backing = self.get_readonly_transport()
1760
request = smart_req.SmartServerIsReadonly(backing)
780
request = smart.request.SmartServerIsReadonly(backing)
1761
781
response = request.execute()
1762
782
self.assertEqual(
1763
smart_req.SmartServerResponse(('yes',)), response)
1766
class TestSmartServerRepositorySetMakeWorkingTrees(
1767
tests.TestCaseWithMemoryTransport):
1769
def test_set_false(self):
1770
backing = self.get_transport()
1771
repo = self.make_repository('.', shared=True)
1772
repo.set_make_working_trees(True)
1773
request_class = smart_repo.SmartServerRepositorySetMakeWorkingTrees
1774
request = request_class(backing)
1775
self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
1776
request.execute('', 'False'))
1777
repo = repo.bzrdir.open_repository()
1778
self.assertFalse(repo.make_working_trees())
1780
def test_set_true(self):
1781
backing = self.get_transport()
1782
repo = self.make_repository('.', shared=True)
1783
repo.set_make_working_trees(False)
1784
request_class = smart_repo.SmartServerRepositorySetMakeWorkingTrees
1785
request = request_class(backing)
1786
self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
1787
request.execute('', 'True'))
1788
repo = repo.bzrdir.open_repository()
1789
self.assertTrue(repo.make_working_trees())
1792
class TestSmartServerPackRepositoryAutopack(tests.TestCaseWithTransport):
1794
def make_repo_needing_autopacking(self, path='.'):
1795
# Make a repo in need of autopacking.
1796
tree = self.make_branch_and_tree('.', format='pack-0.92')
1797
repo = tree.branch.repository
1798
# monkey-patch the pack collection to disable autopacking
1799
repo._pack_collection._max_pack_count = lambda count: count
1801
tree.commit('commit %s' % x)
1802
self.assertEqual(10, len(repo._pack_collection.names()))
1803
del repo._pack_collection._max_pack_count
1806
def test_autopack_needed(self):
1807
repo = self.make_repo_needing_autopacking()
1809
self.addCleanup(repo.unlock)
1810
backing = self.get_transport()
1811
request = smart_packrepo.SmartServerPackRepositoryAutopack(
1813
response = request.execute('')
1814
self.assertEqual(smart_req.SmartServerResponse(('ok',)), response)
1815
repo._pack_collection.reload_pack_names()
1816
self.assertEqual(1, len(repo._pack_collection.names()))
1818
def test_autopack_not_needed(self):
1819
tree = self.make_branch_and_tree('.', format='pack-0.92')
1820
repo = tree.branch.repository
1822
self.addCleanup(repo.unlock)
1824
tree.commit('commit %s' % x)
1825
backing = self.get_transport()
1826
request = smart_packrepo.SmartServerPackRepositoryAutopack(
1828
response = request.execute('')
1829
self.assertEqual(smart_req.SmartServerResponse(('ok',)), response)
1830
repo._pack_collection.reload_pack_names()
1831
self.assertEqual(9, len(repo._pack_collection.names()))
1833
def test_autopack_on_nonpack_format(self):
1834
"""A request to autopack a non-pack repo is a no-op."""
1835
repo = self.make_repository('.', format='knit')
1836
backing = self.get_transport()
1837
request = smart_packrepo.SmartServerPackRepositoryAutopack(
1839
response = request.execute('')
1840
self.assertEqual(smart_req.SmartServerResponse(('ok',)), response)
1843
class TestSmartServerVfsGet(tests.TestCaseWithMemoryTransport):
1845
def test_unicode_path(self):
1846
"""VFS requests expect unicode paths to be escaped."""
1847
filename = u'foo\N{INTERROBANG}'
1848
filename_escaped = urlutils.escape(filename)
1849
backing = self.get_transport()
1850
request = vfs.GetRequest(backing)
1851
backing.put_bytes_non_atomic(filename_escaped, 'contents')
1852
self.assertEqual(smart_req.SmartServerResponse(('ok', ), 'contents'),
1853
request.execute(filename_escaped))
783
SmartServerResponse(('yes',)), response)
1856
786
class TestHandlers(tests.TestCase):
1857
787
"""Tests for the request.request_handlers object."""
1859
def test_all_registrations_exist(self):
1860
"""All registered request_handlers can be found."""
1861
# If there's a typo in a register_lazy call, this loop will fail with
1862
# an AttributeError.
1863
for key, item in smart_req.request_handlers.iteritems():
1866
def assertHandlerEqual(self, verb, handler):
1867
self.assertEqual(smart_req.request_handlers.get(verb), handler)
1869
789
def test_registered_methods(self):
1870
790
"""Test that known methods are registered to the correct object."""
1871
self.assertHandlerEqual('Branch.get_config_file',
1872
smart_branch.SmartServerBranchGetConfigFile)
1873
self.assertHandlerEqual('Branch.get_parent',
1874
smart_branch.SmartServerBranchGetParent)
1875
self.assertHandlerEqual('Branch.get_tags_bytes',
1876
smart_branch.SmartServerBranchGetTagsBytes)
1877
self.assertHandlerEqual('Branch.lock_write',
1878
smart_branch.SmartServerBranchRequestLockWrite)
1879
self.assertHandlerEqual('Branch.last_revision_info',
1880
smart_branch.SmartServerBranchRequestLastRevisionInfo)
1881
self.assertHandlerEqual('Branch.revision_history',
1882
smart_branch.SmartServerRequestRevisionHistory)
1883
self.assertHandlerEqual('Branch.set_config_option',
1884
smart_branch.SmartServerBranchRequestSetConfigOption)
1885
self.assertHandlerEqual('Branch.set_last_revision',
1886
smart_branch.SmartServerBranchRequestSetLastRevision)
1887
self.assertHandlerEqual('Branch.set_last_revision_info',
1888
smart_branch.SmartServerBranchRequestSetLastRevisionInfo)
1889
self.assertHandlerEqual('Branch.set_last_revision_ex',
1890
smart_branch.SmartServerBranchRequestSetLastRevisionEx)
1891
self.assertHandlerEqual('Branch.set_parent_location',
1892
smart_branch.SmartServerBranchRequestSetParentLocation)
1893
self.assertHandlerEqual('Branch.unlock',
1894
smart_branch.SmartServerBranchRequestUnlock)
1895
self.assertHandlerEqual('BzrDir.find_repository',
1896
smart_dir.SmartServerRequestFindRepositoryV1)
1897
self.assertHandlerEqual('BzrDir.find_repositoryV2',
1898
smart_dir.SmartServerRequestFindRepositoryV2)
1899
self.assertHandlerEqual('BzrDirFormat.initialize',
1900
smart_dir.SmartServerRequestInitializeBzrDir)
1901
self.assertHandlerEqual('BzrDirFormat.initialize_ex_1.16',
1902
smart_dir.SmartServerRequestBzrDirInitializeEx)
1903
self.assertHandlerEqual('BzrDir.cloning_metadir',
1904
smart_dir.SmartServerBzrDirRequestCloningMetaDir)
1905
self.assertHandlerEqual('BzrDir.get_config_file',
1906
smart_dir.SmartServerBzrDirRequestConfigFile)
1907
self.assertHandlerEqual('BzrDir.open_branch',
1908
smart_dir.SmartServerRequestOpenBranch)
1909
self.assertHandlerEqual('BzrDir.open_branchV2',
1910
smart_dir.SmartServerRequestOpenBranchV2)
1911
self.assertHandlerEqual('BzrDir.open_branchV3',
1912
smart_dir.SmartServerRequestOpenBranchV3)
1913
self.assertHandlerEqual('PackRepository.autopack',
1914
smart_packrepo.SmartServerPackRepositoryAutopack)
1915
self.assertHandlerEqual('Repository.gather_stats',
1916
smart_repo.SmartServerRepositoryGatherStats)
1917
self.assertHandlerEqual('Repository.get_parent_map',
1918
smart_repo.SmartServerRepositoryGetParentMap)
1919
self.assertHandlerEqual('Repository.get_rev_id_for_revno',
1920
smart_repo.SmartServerRepositoryGetRevIdForRevno)
1921
self.assertHandlerEqual('Repository.get_revision_graph',
1922
smart_repo.SmartServerRepositoryGetRevisionGraph)
1923
self.assertHandlerEqual('Repository.get_stream',
1924
smart_repo.SmartServerRepositoryGetStream)
1925
self.assertHandlerEqual('Repository.get_stream_1.19',
1926
smart_repo.SmartServerRepositoryGetStream_1_19)
1927
self.assertHandlerEqual('Repository.has_revision',
1928
smart_repo.SmartServerRequestHasRevision)
1929
self.assertHandlerEqual('Repository.insert_stream',
1930
smart_repo.SmartServerRepositoryInsertStream)
1931
self.assertHandlerEqual('Repository.insert_stream_locked',
1932
smart_repo.SmartServerRepositoryInsertStreamLocked)
1933
self.assertHandlerEqual('Repository.is_shared',
1934
smart_repo.SmartServerRepositoryIsShared)
1935
self.assertHandlerEqual('Repository.lock_write',
1936
smart_repo.SmartServerRepositoryLockWrite)
1937
self.assertHandlerEqual('Repository.tarball',
1938
smart_repo.SmartServerRepositoryTarball)
1939
self.assertHandlerEqual('Repository.unlock',
1940
smart_repo.SmartServerRepositoryUnlock)
1941
self.assertHandlerEqual('Transport.is_readonly',
1942
smart_req.SmartServerIsReadonly)
1945
class SmartTCPServerHookTests(tests.TestCaseWithMemoryTransport):
1946
"""Tests for SmartTCPServer hooks."""
1949
super(SmartTCPServerHookTests, self).setUp()
1950
self.server = server.SmartTCPServer(self.get_transport())
1952
def test_run_server_started_hooks(self):
1953
"""Test the server started hooks get fired properly."""
1955
server.SmartTCPServer.hooks.install_named_hook('server_started',
1956
lambda backing_urls, url: started_calls.append((backing_urls, url)),
1958
started_ex_calls = []
1959
server.SmartTCPServer.hooks.install_named_hook('server_started_ex',
1960
lambda backing_urls, url: started_ex_calls.append((backing_urls, url)),
1962
self.server._sockname = ('example.com', 42)
1963
self.server.run_server_started_hooks()
1964
self.assertEquals(started_calls,
1965
[([self.get_transport().base], 'bzr://example.com:42/')])
1966
self.assertEquals(started_ex_calls,
1967
[([self.get_transport().base], self.server)])
1969
def test_run_server_started_hooks_ipv6(self):
1970
"""Test that socknames can contain 4-tuples."""
1971
self.server._sockname = ('::', 42, 0, 0)
1973
server.SmartTCPServer.hooks.install_named_hook('server_started',
1974
lambda backing_urls, url: started_calls.append((backing_urls, url)),
1976
self.server.run_server_started_hooks()
1977
self.assertEquals(started_calls,
1978
[([self.get_transport().base], 'bzr://:::42/')])
1980
def test_run_server_stopped_hooks(self):
1981
"""Test the server stopped hooks."""
1982
self.server._sockname = ('example.com', 42)
1984
server.SmartTCPServer.hooks.install_named_hook('server_stopped',
1985
lambda backing_urls, url: stopped_calls.append((backing_urls, url)),
1987
self.server.run_server_stopped_hooks()
1988
self.assertEquals(stopped_calls,
1989
[([self.get_transport().base], 'bzr://example.com:42/')])
792
smart.request.request_handlers.get('Branch.get_config_file'),
793
smart.branch.SmartServerBranchGetConfigFile)
795
smart.request.request_handlers.get('Branch.lock_write'),
796
smart.branch.SmartServerBranchRequestLockWrite)
798
smart.request.request_handlers.get('Branch.last_revision_info'),
799
smart.branch.SmartServerBranchRequestLastRevisionInfo)
801
smart.request.request_handlers.get('Branch.revision_history'),
802
smart.branch.SmartServerRequestRevisionHistory)
804
smart.request.request_handlers.get('Branch.set_last_revision'),
805
smart.branch.SmartServerBranchRequestSetLastRevision)
807
smart.request.request_handlers.get('Branch.unlock'),
808
smart.branch.SmartServerBranchRequestUnlock)
810
smart.request.request_handlers.get('BzrDir.find_repository'),
811
smart.bzrdir.SmartServerRequestFindRepository)
813
smart.request.request_handlers.get('BzrDirFormat.initialize'),
814
smart.bzrdir.SmartServerRequestInitializeBzrDir)
816
smart.request.request_handlers.get('BzrDir.open_branch'),
817
smart.bzrdir.SmartServerRequestOpenBranch)
819
smart.request.request_handlers.get('Repository.gather_stats'),
820
smart.repository.SmartServerRepositoryGatherStats)
822
smart.request.request_handlers.get('Repository.get_revision_graph'),
823
smart.repository.SmartServerRepositoryGetRevisionGraph)
825
smart.request.request_handlers.get('Repository.has_revision'),
826
smart.repository.SmartServerRequestHasRevision)
828
smart.request.request_handlers.get('Repository.is_shared'),
829
smart.repository.SmartServerRepositoryIsShared)
831
smart.request.request_handlers.get('Repository.lock_write'),
832
smart.repository.SmartServerRepositoryLockWrite)
834
smart.request.request_handlers.get('Repository.unlock'),
835
smart.repository.SmartServerRepositoryUnlock)
837
smart.request.request_handlers.get('Repository.tarball'),
838
smart.repository.SmartServerRepositoryTarball)
840
smart.request.request_handlers.get('Transport.is_readonly'),
841
smart.request.SmartServerIsReadonly)
added
removed
bzrlib/tests/test_smart.py
