103
35
# the default or a parameterized class, but rather use the
104
36
# TestCaseWithTransport infrastructure to set up a smart server and
106
self.transport_server = self.make_transport_server
108
def make_transport_server(self):
109
return test_server.SmartTCPServer_for_testing('-' + self.id())
38
self.transport_server = smart.server.SmartTCPServer_for_testing
111
40
def get_smart_medium(self):
112
41
"""Get a smart medium to use in tests."""
113
42
return self.get_transport().get_smart_medium()
116
class TestByteStreamToStream(tests.TestCase):
118
def test_repeated_substreams_same_kind_are_one_stream(self):
119
# Make a stream - an iterable of bytestrings.
120
stream = [('text', [versionedfile.FulltextContentFactory(('k1',), None,
121
None, 'foo')]),('text', [
122
versionedfile.FulltextContentFactory(('k2',), None, None, 'bar')])]
123
fmt = bzrdir.format_registry.get('pack-0.92')().repository_format
124
bytes = smart_repo._stream_to_byte_stream(stream, fmt)
126
# Iterate the resulting iterable; checking that we get only one stream
128
fmt, stream = smart_repo._byte_stream_to_stream(bytes)
129
for kind, substream in stream:
130
streams.append((kind, list(substream)))
131
self.assertLength(1, streams)
132
self.assertLength(2, streams[0][1])
135
45
class TestSmartServerResponse(tests.TestCase):
137
47
def test__eq__(self):
138
self.assertEqual(smart_req.SmartServerResponse(('ok', )),
139
smart_req.SmartServerResponse(('ok', )))
140
self.assertEqual(smart_req.SmartServerResponse(('ok', ), 'body'),
141
smart_req.SmartServerResponse(('ok', ), 'body'))
142
self.assertNotEqual(smart_req.SmartServerResponse(('ok', )),
143
smart_req.SmartServerResponse(('notok', )))
144
self.assertNotEqual(smart_req.SmartServerResponse(('ok', ), 'body'),
145
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', )))
146
56
self.assertNotEqual(None,
147
smart_req.SmartServerResponse(('ok', )))
149
def test__str__(self):
150
"""SmartServerResponses can be stringified."""
152
"<SuccessfulSmartServerResponse args=('args',) body='body'>",
153
str(smart_req.SuccessfulSmartServerResponse(('args',), 'body')))
155
"<FailedSmartServerResponse args=('args',) body='body'>",
156
str(smart_req.FailedSmartServerResponse(('args',), 'body')))
159
class TestSmartServerRequest(tests.TestCaseWithMemoryTransport):
161
def test_translate_client_path(self):
162
transport = self.get_transport()
163
request = smart_req.SmartServerRequest(transport, 'foo/')
164
self.assertEqual('./', request.translate_client_path('foo/'))
166
errors.InvalidURLJoin, request.translate_client_path, 'foo/..')
168
errors.PathNotChild, request.translate_client_path, '/')
170
errors.PathNotChild, request.translate_client_path, 'bar/')
171
self.assertEqual('./baz', request.translate_client_path('foo/baz'))
172
e_acute = u'\N{LATIN SMALL LETTER E WITH ACUTE}'.encode('utf-8')
173
self.assertEqual('./' + urlutils.escape(e_acute),
174
request.translate_client_path('foo/' + e_acute))
176
def test_translate_client_path_vfs(self):
177
"""VfsRequests receive escaped paths rather than raw UTF-8."""
178
transport = self.get_transport()
179
request = vfs.VfsRequest(transport, 'foo/')
180
e_acute = u'\N{LATIN SMALL LETTER E WITH ACUTE}'.encode('utf-8')
181
escaped = urlutils.escape('foo/' + e_acute)
182
self.assertEqual('./' + urlutils.escape(e_acute),
183
request.translate_client_path(escaped))
185
def test_transport_from_client_path(self):
186
transport = self.get_transport()
187
request = smart_req.SmartServerRequest(transport, 'foo/')
190
request.transport_from_client_path('foo/').base)
193
class TestSmartServerBzrDirRequestCloningMetaDir(
194
tests.TestCaseWithMemoryTransport):
195
"""Tests for BzrDir.cloning_metadir."""
197
def test_cloning_metadir(self):
198
"""When there is a bzrdir present, the call succeeds."""
199
backing = self.get_transport()
200
dir = self.make_bzrdir('.')
201
local_result = dir.cloning_metadir()
202
request_class = smart_dir.SmartServerBzrDirRequestCloningMetaDir
203
request = request_class(backing)
204
expected = smart_req.SuccessfulSmartServerResponse(
205
(local_result.network_name(),
206
local_result.repository_format.network_name(),
207
('branch', local_result.get_branch_format().network_name())))
208
self.assertEqual(expected, request.execute('', 'False'))
210
def test_cloning_metadir_reference(self):
211
"""The request fails when bzrdir contains a branch reference."""
212
backing = self.get_transport()
213
referenced_branch = self.make_branch('referenced')
214
dir = self.make_bzrdir('.')
215
local_result = dir.cloning_metadir()
216
reference = _mod_branch.BranchReferenceFormat().initialize(
217
dir, target_branch=referenced_branch)
218
reference_url = _mod_branch.BranchReferenceFormat().get_reference(dir)
219
# The server shouldn't try to follow the branch reference, so it's fine
220
# if the referenced branch isn't reachable.
221
backing.rename('referenced', 'moved')
222
request_class = smart_dir.SmartServerBzrDirRequestCloningMetaDir
223
request = request_class(backing)
224
expected = smart_req.FailedSmartServerResponse(('BranchReference',))
225
self.assertEqual(expected, request.execute('', 'False'))
228
class TestSmartServerRequestCreateRepository(tests.TestCaseWithMemoryTransport):
229
"""Tests for BzrDir.create_repository."""
231
def test_makes_repository(self):
232
"""When there is a bzrdir present, the call succeeds."""
233
backing = self.get_transport()
234
self.make_bzrdir('.')
235
request_class = smart_dir.SmartServerRequestCreateRepository
236
request = request_class(backing)
237
reference_bzrdir_format = bzrdir.format_registry.get('pack-0.92')()
238
reference_format = reference_bzrdir_format.repository_format
239
network_name = reference_format.network_name()
240
expected = smart_req.SuccessfulSmartServerResponse(
241
('ok', 'no', 'no', 'no', network_name))
242
self.assertEqual(expected, request.execute('', network_name, 'True'))
245
class TestSmartServerRequestFindRepository(tests.TestCaseWithMemoryTransport):
57
SmartServerResponse(('ok', )))
60
class TestSmartServerRequestFindRepository(tests.TestCaseWithTransport):
246
61
"""Tests for BzrDir.find_repository."""
248
63
def test_no_repository(self):
249
64
"""When there is no repository to be found, ('norepository', ) is returned."""
250
65
backing = self.get_transport()
251
request = self._request_class(backing)
66
request = smart.bzrdir.SmartServerRequestFindRepository(backing)
252
67
self.make_bzrdir('.')
253
self.assertEqual(smart_req.SmartServerResponse(('norepository', )),
68
self.assertEqual(SmartServerResponse(('norepository', )),
69
request.execute(backing.local_abspath('')))
256
71
def test_nonshared_repository(self):
257
# nonshared repositorys only allow 'find' to return a handle when the
258
# 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
259
74
# the repository is at.
260
75
backing = self.get_transport()
261
request = self._request_class(backing)
76
request = smart.bzrdir.SmartServerRequestFindRepository(backing)
262
77
result = self._make_repository_and_result()
263
self.assertEqual(result, request.execute(''))
78
self.assertEqual(result, request.execute(backing.local_abspath('')))
264
79
self.make_bzrdir('subdir')
265
self.assertEqual(smart_req.SmartServerResponse(('norepository', )),
266
request.execute('subdir'))
80
self.assertEqual(SmartServerResponse(('norepository', )),
81
request.execute(backing.local_abspath('subdir')))
268
83
def _make_repository_and_result(self, shared=False, format=None):
269
84
"""Convenience function to setup a repository.
378
140
def test_missing_dir(self):
379
141
"""Initializing a missing directory should fail like the bzrdir api."""
380
142
backing = self.get_transport()
381
request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
143
request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
382
144
self.assertRaises(errors.NoSuchFile,
383
request.execute, 'subdir')
145
request.execute, backing.local_abspath('subdir'))
385
147
def test_initialized_dir(self):
386
148
"""Initializing an extant bzrdir should fail like the bzrdir api."""
387
149
backing = self.get_transport()
388
request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
150
request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
389
151
self.make_bzrdir('subdir')
390
152
self.assertRaises(errors.FileExists,
391
request.execute, 'subdir')
394
class TestSmartServerRequestBzrDirInitializeEx(
395
tests.TestCaseWithMemoryTransport):
396
"""Basic tests for BzrDir.initialize_ex_1.16 in the smart server.
398
The main unit tests in test_bzrdir exercise the API comprehensively.
401
def test_empty_dir(self):
402
"""Initializing an empty dir should succeed and do it."""
403
backing = self.get_transport()
404
name = self.make_bzrdir('reference')._format.network_name()
405
request = smart_dir.SmartServerRequestBzrDirInitializeEx(backing)
407
smart_req.SmartServerResponse(('', '', '', '', '', '', name,
408
'False', '', '', '')),
409
request.execute(name, '', 'True', 'False', 'False', '', '', '', '',
411
made_dir = bzrdir.BzrDir.open_from_transport(backing)
412
# no branch, tree or repository is expected with the current
414
self.assertRaises(errors.NoWorkingTree, made_dir.open_workingtree)
415
self.assertRaises(errors.NotBranchError, made_dir.open_branch)
416
self.assertRaises(errors.NoRepositoryPresent, made_dir.open_repository)
418
def test_missing_dir(self):
419
"""Initializing a missing directory should fail like the bzrdir api."""
420
backing = self.get_transport()
421
name = self.make_bzrdir('reference')._format.network_name()
422
request = smart_dir.SmartServerRequestBzrDirInitializeEx(backing)
423
self.assertRaises(errors.NoSuchFile, request.execute, name,
424
'subdir/dir', 'False', 'False', 'False', '', '', '', '', 'False')
426
def test_initialized_dir(self):
427
"""Initializing an extant directory should fail like the bzrdir api."""
428
backing = self.get_transport()
429
name = self.make_bzrdir('reference')._format.network_name()
430
request = smart_dir.SmartServerRequestBzrDirInitializeEx(backing)
431
self.make_bzrdir('subdir')
432
self.assertRaises(errors.FileExists, request.execute, name, 'subdir',
433
'False', 'False', 'False', '', '', '', '', 'False')
436
class TestSmartServerRequestOpenBzrDir(tests.TestCaseWithMemoryTransport):
438
def test_no_directory(self):
439
backing = self.get_transport()
440
request = smart_dir.SmartServerRequestOpenBzrDir(backing)
441
self.assertEqual(smart_req.SmartServerResponse(('no', )),
442
request.execute('does-not-exist'))
444
def test_empty_directory(self):
445
backing = self.get_transport()
446
backing.mkdir('empty')
447
request = smart_dir.SmartServerRequestOpenBzrDir(backing)
448
self.assertEqual(smart_req.SmartServerResponse(('no', )),
449
request.execute('empty'))
451
def test_outside_root_client_path(self):
452
backing = self.get_transport()
453
request = smart_dir.SmartServerRequestOpenBzrDir(backing,
454
root_client_path='root')
455
self.assertEqual(smart_req.SmartServerResponse(('no', )),
456
request.execute('not-root'))
459
class TestSmartServerRequestOpenBzrDir_2_1(tests.TestCaseWithMemoryTransport):
461
def test_no_directory(self):
462
backing = self.get_transport()
463
request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
464
self.assertEqual(smart_req.SmartServerResponse(('no', )),
465
request.execute('does-not-exist'))
467
def test_empty_directory(self):
468
backing = self.get_transport()
469
backing.mkdir('empty')
470
request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
471
self.assertEqual(smart_req.SmartServerResponse(('no', )),
472
request.execute('empty'))
474
def test_present_without_workingtree(self):
475
backing = self.get_transport()
476
request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
477
self.make_bzrdir('.')
478
self.assertEqual(smart_req.SmartServerResponse(('yes', 'no')),
481
def test_outside_root_client_path(self):
482
backing = self.get_transport()
483
request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing,
484
root_client_path='root')
485
self.assertEqual(smart_req.SmartServerResponse(('no',)),
486
request.execute('not-root'))
489
class TestSmartServerRequestOpenBzrDir_2_1_disk(TestCaseWithChrootedTransport):
491
def test_present_with_workingtree(self):
492
self.vfs_transport_factory = test_server.LocalURLServer
493
backing = self.get_transport()
494
request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
495
bd = self.make_bzrdir('.')
496
bd.create_repository()
498
bd.create_workingtree()
499
self.assertEqual(smart_req.SmartServerResponse(('yes', 'yes')),
503
class TestSmartServerRequestOpenBranch(TestCaseWithChrootedTransport):
153
request.execute, backing.local_abspath('subdir'))
156
class TestSmartServerRequestOpenBranch(tests.TestCaseWithTransport):
505
158
def test_no_branch(self):
506
159
"""When there is no branch, ('nobranch', ) is returned."""
507
160
backing = self.get_transport()
508
request = smart_dir.SmartServerRequestOpenBranch(backing)
161
request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
509
162
self.make_bzrdir('.')
510
self.assertEqual(smart_req.SmartServerResponse(('nobranch', )),
163
self.assertEqual(SmartServerResponse(('nobranch', )),
164
request.execute(backing.local_abspath('')))
513
166
def test_branch(self):
514
167
"""When there is a branch, 'ok' is returned."""
515
168
backing = self.get_transport()
516
request = smart_dir.SmartServerRequestOpenBranch(backing)
169
request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
517
170
self.make_branch('.')
518
self.assertEqual(smart_req.SmartServerResponse(('ok', '')),
521
def test_branch_reference(self):
522
"""When there is a branch reference, the reference URL is returned."""
523
self.vfs_transport_factory = test_server.LocalURLServer
524
backing = self.get_transport()
525
request = smart_dir.SmartServerRequestOpenBranch(backing)
526
branch = self.make_branch('branch')
527
checkout = branch.create_checkout('reference',lightweight=True)
528
reference_url = _mod_branch.BranchReferenceFormat().get_reference(
530
self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
531
self.assertEqual(smart_req.SmartServerResponse(('ok', reference_url)),
532
request.execute('reference'))
534
def test_notification_on_branch_from_repository(self):
535
"""When there is a repository, the error should return details."""
536
backing = self.get_transport()
537
request = smart_dir.SmartServerRequestOpenBranch(backing)
538
repo = self.make_repository('.')
539
self.assertEqual(smart_req.SmartServerResponse(('nobranch',)),
543
class TestSmartServerRequestOpenBranchV2(TestCaseWithChrootedTransport):
545
def test_no_branch(self):
546
"""When there is no branch, ('nobranch', ) is returned."""
547
backing = self.get_transport()
548
self.make_bzrdir('.')
549
request = smart_dir.SmartServerRequestOpenBranchV2(backing)
550
self.assertEqual(smart_req.SmartServerResponse(('nobranch', )),
553
def test_branch(self):
554
"""When there is a branch, 'ok' is returned."""
555
backing = self.get_transport()
556
expected = self.make_branch('.')._format.network_name()
557
request = smart_dir.SmartServerRequestOpenBranchV2(backing)
558
self.assertEqual(smart_req.SuccessfulSmartServerResponse(
559
('branch', expected)),
562
def test_branch_reference(self):
563
"""When there is a branch reference, the reference URL is returned."""
564
self.vfs_transport_factory = test_server.LocalURLServer
565
backing = self.get_transport()
566
request = smart_dir.SmartServerRequestOpenBranchV2(backing)
567
branch = self.make_branch('branch')
568
checkout = branch.create_checkout('reference',lightweight=True)
569
reference_url = _mod_branch.BranchReferenceFormat().get_reference(
571
self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
572
self.assertEqual(smart_req.SuccessfulSmartServerResponse(
573
('ref', reference_url)),
574
request.execute('reference'))
576
def test_stacked_branch(self):
577
"""Opening a stacked branch does not open the stacked-on branch."""
578
trunk = self.make_branch('trunk')
579
feature = self.make_branch('feature')
580
feature.set_stacked_on_url(trunk.base)
582
_mod_branch.Branch.hooks.install_named_hook(
583
'open', opened_branches.append, None)
584
backing = self.get_transport()
585
request = smart_dir.SmartServerRequestOpenBranchV2(backing)
588
response = request.execute('feature')
590
request.teardown_jail()
591
expected_format = feature._format.network_name()
592
self.assertEqual(smart_req.SuccessfulSmartServerResponse(
593
('branch', expected_format)),
595
self.assertLength(1, opened_branches)
597
def test_notification_on_branch_from_repository(self):
598
"""When there is a repository, the error should return details."""
599
backing = self.get_transport()
600
request = smart_dir.SmartServerRequestOpenBranchV2(backing)
601
repo = self.make_repository('.')
602
self.assertEqual(smart_req.SmartServerResponse(('nobranch',)),
606
class TestSmartServerRequestOpenBranchV3(TestCaseWithChrootedTransport):
608
def test_no_branch(self):
609
"""When there is no branch, ('nobranch', ) is returned."""
610
backing = self.get_transport()
611
self.make_bzrdir('.')
612
request = smart_dir.SmartServerRequestOpenBranchV3(backing)
613
self.assertEqual(smart_req.SmartServerResponse(('nobranch',)),
616
def test_branch(self):
617
"""When there is a branch, 'ok' is returned."""
618
backing = self.get_transport()
619
expected = self.make_branch('.')._format.network_name()
620
request = smart_dir.SmartServerRequestOpenBranchV3(backing)
621
self.assertEqual(smart_req.SuccessfulSmartServerResponse(
622
('branch', expected)),
625
def test_branch_reference(self):
626
"""When there is a branch reference, the reference URL is returned."""
627
self.vfs_transport_factory = test_server.LocalURLServer
628
backing = self.get_transport()
629
request = smart_dir.SmartServerRequestOpenBranchV3(backing)
630
branch = self.make_branch('branch')
631
checkout = branch.create_checkout('reference',lightweight=True)
632
reference_url = _mod_branch.BranchReferenceFormat().get_reference(
634
self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
635
self.assertEqual(smart_req.SuccessfulSmartServerResponse(
636
('ref', reference_url)),
637
request.execute('reference'))
639
def test_stacked_branch(self):
640
"""Opening a stacked branch does not open the stacked-on branch."""
641
trunk = self.make_branch('trunk')
642
feature = self.make_branch('feature')
643
feature.set_stacked_on_url(trunk.base)
645
_mod_branch.Branch.hooks.install_named_hook(
646
'open', opened_branches.append, None)
647
backing = self.get_transport()
648
request = smart_dir.SmartServerRequestOpenBranchV3(backing)
651
response = request.execute('feature')
653
request.teardown_jail()
654
expected_format = feature._format.network_name()
655
self.assertEqual(smart_req.SuccessfulSmartServerResponse(
656
('branch', expected_format)),
658
self.assertLength(1, opened_branches)
660
def test_notification_on_branch_from_repository(self):
661
"""When there is a repository, the error should return details."""
662
backing = self.get_transport()
663
request = smart_dir.SmartServerRequestOpenBranchV3(backing)
664
repo = self.make_repository('.')
665
self.assertEqual(smart_req.SmartServerResponse(
666
('nobranch', 'location is a repository')),
670
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):
672
190
def test_empty(self):
673
191
"""For an empty branch, the body is empty."""
674
192
backing = self.get_transport()
675
request = smart_branch.SmartServerRequestRevisionHistory(backing)
193
request = smart.branch.SmartServerRequestRevisionHistory(backing)
676
194
self.make_branch('.')
677
self.assertEqual(smart_req.SmartServerResponse(('ok', ), ''),
195
self.assertEqual(SmartServerResponse(('ok', ), ''),
196
request.execute(backing.local_abspath('')))
680
198
def test_not_empty(self):
681
199
"""For a non-empty branch, the body is empty."""
682
200
backing = self.get_transport()
683
request = smart_branch.SmartServerRequestRevisionHistory(backing)
201
request = smart.branch.SmartServerRequestRevisionHistory(backing)
684
202
tree = self.make_branch_and_memory_tree('.')
685
203
tree.lock_write()
735
252
r2 = tree.commit('2nd commit', rev_id=rev_id_utf8)
737
254
self.assertEqual(
738
smart_req.SmartServerResponse(('ok', '2', rev_id_utf8)),
742
class TestSmartServerBranchRequestGetConfigFile(
743
tests.TestCaseWithMemoryTransport):
255
SmartServerResponse(('ok', '2', rev_id_utf8)),
256
request.execute(backing.local_abspath('')))
259
class TestSmartServerBranchRequestGetConfigFile(tests.TestCaseWithTransport):
745
261
def test_default(self):
746
262
"""With no file, we get empty content."""
747
263
backing = self.get_transport()
748
request = smart_branch.SmartServerBranchGetConfigFile(backing)
264
request = smart.branch.SmartServerBranchGetConfigFile(backing)
749
265
branch = self.make_branch('.')
750
266
# there should be no file by default
752
self.assertEqual(smart_req.SmartServerResponse(('ok', ), content),
268
self.assertEqual(SmartServerResponse(('ok', ), content),
269
request.execute(backing.local_abspath('')))
755
271
def test_with_content(self):
756
272
# SmartServerBranchGetConfigFile should return the content from
757
273
# branch.control_files.get('branch.conf') for now - in the future it may
758
# perform more complex processing.
759
backing = self.get_transport()
760
request = smart_branch.SmartServerBranchGetConfigFile(backing)
761
branch = self.make_branch('.')
762
branch._transport.put_bytes('branch.conf', 'foo bar baz')
763
self.assertEqual(smart_req.SmartServerResponse(('ok', ), 'foo bar baz'),
767
class TestLockedBranch(tests.TestCaseWithMemoryTransport):
769
def get_lock_tokens(self, branch):
770
branch_token = branch.lock_write().branch_token
771
repo_token = branch.repository.lock_write().repository_token
772
branch.repository.unlock()
773
return branch_token, repo_token
776
class TestSmartServerBranchRequestSetConfigOption(TestLockedBranch):
778
def test_value_name(self):
779
branch = self.make_branch('.')
780
request = smart_branch.SmartServerBranchRequestSetConfigOption(
781
branch.bzrdir.root_transport)
782
branch_token, repo_token = self.get_lock_tokens(branch)
783
config = branch._get_config()
784
result = request.execute('', branch_token, repo_token, 'bar', 'foo',
786
self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), result)
787
self.assertEqual('bar', config.get_option('foo'))
791
def test_value_name_section(self):
792
branch = self.make_branch('.')
793
request = smart_branch.SmartServerBranchRequestSetConfigOption(
794
branch.bzrdir.root_transport)
795
branch_token, repo_token = self.get_lock_tokens(branch)
796
config = branch._get_config()
797
result = request.execute('', branch_token, repo_token, 'bar', 'foo',
799
self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), result)
800
self.assertEqual('bar', config.get_option('foo', 'gam'))
805
class TestSmartServerBranchRequestSetConfigOptionDict(TestLockedBranch):
808
TestLockedBranch.setUp(self)
809
# A dict with non-ascii keys and values to exercise unicode
811
self.encoded_value_dict = (
812
'd5:ascii1:a11:unicode \xe2\x8c\x9a3:\xe2\x80\xbde')
814
'ascii': 'a', u'unicode \N{WATCH}': u'\N{INTERROBANG}'}
816
def test_value_name(self):
817
branch = self.make_branch('.')
818
request = smart_branch.SmartServerBranchRequestSetConfigOptionDict(
819
branch.bzrdir.root_transport)
820
branch_token, repo_token = self.get_lock_tokens(branch)
821
config = branch._get_config()
822
result = request.execute('', branch_token, repo_token,
823
self.encoded_value_dict, 'foo', '')
824
self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), result)
825
self.assertEqual(self.value_dict, config.get_option('foo'))
829
def test_value_name_section(self):
830
branch = self.make_branch('.')
831
request = smart_branch.SmartServerBranchRequestSetConfigOptionDict(
832
branch.bzrdir.root_transport)
833
branch_token, repo_token = self.get_lock_tokens(branch)
834
config = branch._get_config()
835
result = request.execute('', branch_token, repo_token,
836
self.encoded_value_dict, 'foo', 'gam')
837
self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), result)
838
self.assertEqual(self.value_dict, config.get_option('foo', 'gam'))
843
class TestSmartServerBranchRequestSetTagsBytes(TestLockedBranch):
844
# Only called when the branch format and tags match [yay factory
845
# methods] so only need to test straight forward cases.
847
def test_set_bytes(self):
848
base_branch = self.make_branch('base')
849
tag_bytes = base_branch._get_tags_bytes()
850
# get_lock_tokens takes out a lock.
851
branch_token, repo_token = self.get_lock_tokens(base_branch)
852
request = smart_branch.SmartServerBranchSetTagsBytes(
853
self.get_transport())
854
response = request.execute('base', branch_token, repo_token)
855
self.assertEqual(None, response)
856
response = request.do_chunk(tag_bytes)
857
self.assertEqual(None, response)
858
response = request.do_end()
860
smart_req.SuccessfulSmartServerResponse(()), response)
863
def test_lock_failed(self):
864
base_branch = self.make_branch('base')
865
base_branch.lock_write()
866
tag_bytes = base_branch._get_tags_bytes()
867
request = smart_branch.SmartServerBranchSetTagsBytes(
868
self.get_transport())
869
self.assertRaises(errors.TokenMismatch, request.execute,
870
'base', 'wrong token', 'wrong token')
871
# The request handler will keep processing the message parts, so even
872
# if the request fails immediately do_chunk and do_end are still
874
request.do_chunk(tag_bytes)
880
class SetLastRevisionTestBase(TestLockedBranch):
881
"""Base test case for verbs that implement set_last_revision."""
884
tests.TestCaseWithMemoryTransport.setUp(self)
885
backing_transport = self.get_transport()
886
self.request = self.request_class(backing_transport)
887
self.tree = self.make_branch_and_memory_tree('.')
889
def lock_branch(self):
890
return self.get_lock_tokens(self.tree.branch)
892
def unlock_branch(self):
893
self.tree.branch.unlock()
895
def set_last_revision(self, revision_id, revno):
896
branch_token, repo_token = self.lock_branch()
897
response = self._set_last_revision(
898
revision_id, revno, branch_token, repo_token)
902
def assertRequestSucceeds(self, revision_id, revno):
903
response = self.set_last_revision(revision_id, revno)
904
self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
908
class TestSetLastRevisionVerbMixin(object):
909
"""Mixin test case for verbs that implement set_last_revision."""
911
def test_set_null_to_null(self):
912
"""An empty branch can have its last revision set to 'null:'."""
913
self.assertRequestSucceeds('null:', 0)
915
def test_NoSuchRevision(self):
916
"""If the revision_id is not present, the verb returns NoSuchRevision.
918
revision_id = 'non-existent revision'
919
self.assertEqual(smart_req.FailedSmartServerResponse(('NoSuchRevision',
921
self.set_last_revision(revision_id, 1))
923
def make_tree_with_two_commits(self):
924
self.tree.lock_write()
926
rev_id_utf8 = u'\xc8'.encode('utf-8')
927
r1 = self.tree.commit('1st commit', rev_id=rev_id_utf8)
928
r2 = self.tree.commit('2nd commit', rev_id='rev-2')
931
def test_branch_last_revision_info_is_updated(self):
932
"""A branch's tip can be set to a revision that is present in its
935
# Make a branch with an empty revision history, but two revisions in
937
self.make_tree_with_two_commits()
938
rev_id_utf8 = u'\xc8'.encode('utf-8')
939
self.tree.branch.set_revision_history([])
941
(0, 'null:'), self.tree.branch.last_revision_info())
942
# We can update the branch to a revision that is present in the
944
self.assertRequestSucceeds(rev_id_utf8, 1)
946
(1, rev_id_utf8), self.tree.branch.last_revision_info())
948
def test_branch_last_revision_info_rewind(self):
949
"""A branch's tip can be set to a revision that is an ancestor of the
952
self.make_tree_with_two_commits()
953
rev_id_utf8 = u'\xc8'.encode('utf-8')
955
(2, 'rev-2'), self.tree.branch.last_revision_info())
956
self.assertRequestSucceeds(rev_id_utf8, 1)
958
(1, rev_id_utf8), self.tree.branch.last_revision_info())
960
def test_TipChangeRejected(self):
961
"""If a pre_change_branch_tip hook raises TipChangeRejected, the verb
962
returns TipChangeRejected.
964
rejection_message = u'rejection message\N{INTERROBANG}'
965
def hook_that_rejects(params):
966
raise errors.TipChangeRejected(rejection_message)
967
_mod_branch.Branch.hooks.install_named_hook(
968
'pre_change_branch_tip', hook_that_rejects, None)
970
smart_req.FailedSmartServerResponse(
971
('TipChangeRejected', rejection_message.encode('utf-8'))),
972
self.set_last_revision('null:', 0))
975
class TestSmartServerBranchRequestSetLastRevision(
976
SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
977
"""Tests for Branch.set_last_revision verb."""
979
request_class = smart_branch.SmartServerBranchRequestSetLastRevision
981
def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
982
return self.request.execute(
983
'', branch_token, repo_token, revision_id)
986
class TestSmartServerBranchRequestSetLastRevisionInfo(
987
SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
988
"""Tests for Branch.set_last_revision_info verb."""
990
request_class = smart_branch.SmartServerBranchRequestSetLastRevisionInfo
992
def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
993
return self.request.execute(
994
'', branch_token, repo_token, revno, revision_id)
996
def test_NoSuchRevision(self):
997
"""Branch.set_last_revision_info does not have to return
998
NoSuchRevision if the revision_id is absent.
1000
raise tests.TestNotApplicable()
1003
class TestSmartServerBranchRequestSetLastRevisionEx(
1004
SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
1005
"""Tests for Branch.set_last_revision_ex verb."""
1007
request_class = smart_branch.SmartServerBranchRequestSetLastRevisionEx
1009
def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
1010
return self.request.execute(
1011
'', branch_token, repo_token, revision_id, 0, 0)
1013
def assertRequestSucceeds(self, revision_id, revno):
1014
response = self.set_last_revision(revision_id, revno)
1016
smart_req.SuccessfulSmartServerResponse(('ok', revno, revision_id)),
1019
def test_branch_last_revision_info_rewind(self):
1020
"""A branch's tip can be set to a revision that is an ancestor of the
1021
current tip, but only if allow_overwrite_descendant is passed.
1023
self.make_tree_with_two_commits()
1024
rev_id_utf8 = u'\xc8'.encode('utf-8')
1026
(2, 'rev-2'), self.tree.branch.last_revision_info())
1027
# If allow_overwrite_descendant flag is 0, then trying to set the tip
1028
# to an older revision ID has no effect.
1029
branch_token, repo_token = self.lock_branch()
1030
response = self.request.execute(
1031
'', branch_token, repo_token, rev_id_utf8, 0, 0)
1033
smart_req.SuccessfulSmartServerResponse(('ok', 2, 'rev-2')),
1036
(2, 'rev-2'), self.tree.branch.last_revision_info())
1038
# If allow_overwrite_descendant flag is 1, then setting the tip to an
1040
response = self.request.execute(
1041
'', branch_token, repo_token, rev_id_utf8, 0, 1)
1043
smart_req.SuccessfulSmartServerResponse(('ok', 1, rev_id_utf8)),
1045
self.unlock_branch()
1047
(1, rev_id_utf8), self.tree.branch.last_revision_info())
1049
def make_branch_with_divergent_history(self):
1050
"""Make a branch with divergent history in its repo.
1052
The branch's tip will be 'child-2', and the repo will also contain
1053
'child-1', which diverges from a common base revision.
1055
self.tree.lock_write()
1057
r1 = self.tree.commit('1st commit')
1058
revno_1, revid_1 = self.tree.branch.last_revision_info()
1059
r2 = self.tree.commit('2nd commit', rev_id='child-1')
1060
# Undo the second commit
1061
self.tree.branch.set_last_revision_info(revno_1, revid_1)
1062
self.tree.set_parent_ids([revid_1])
1063
# Make a new second commit, child-2. child-2 has diverged from
1065
new_r2 = self.tree.commit('2nd commit', rev_id='child-2')
1068
def test_not_allow_diverged(self):
1069
"""If allow_diverged is not passed, then setting a divergent history
1070
returns a Diverged error.
1072
self.make_branch_with_divergent_history()
1074
smart_req.FailedSmartServerResponse(('Diverged',)),
1075
self.set_last_revision('child-1', 2))
1076
# The branch tip was not changed.
1077
self.assertEqual('child-2', self.tree.branch.last_revision())
1079
def test_allow_diverged(self):
1080
"""If allow_diverged is passed, then setting a divergent history
1083
self.make_branch_with_divergent_history()
1084
branch_token, repo_token = self.lock_branch()
1085
response = self.request.execute(
1086
'', branch_token, repo_token, 'child-1', 1, 0)
1088
smart_req.SuccessfulSmartServerResponse(('ok', 2, 'child-1')),
1090
self.unlock_branch()
1091
# The branch tip was changed.
1092
self.assertEqual('child-1', self.tree.branch.last_revision())
1095
class TestSmartServerBranchRequestGetParent(tests.TestCaseWithMemoryTransport):
1097
def test_get_parent_none(self):
1098
base_branch = self.make_branch('base')
1099
request = smart_branch.SmartServerBranchGetParent(self.get_transport())
1100
response = request.execute('base')
1102
smart_req.SuccessfulSmartServerResponse(('',)), response)
1104
def test_get_parent_something(self):
1105
base_branch = self.make_branch('base')
1106
base_branch.set_parent(self.get_url('foo'))
1107
request = smart_branch.SmartServerBranchGetParent(self.get_transport())
1108
response = request.execute('base')
1110
smart_req.SuccessfulSmartServerResponse(("../foo",)),
1114
class TestSmartServerBranchRequestSetParent(TestLockedBranch):
1116
def test_set_parent_none(self):
1117
branch = self.make_branch('base', format="1.9")
1119
branch._set_parent_location('foo')
1121
request = smart_branch.SmartServerBranchRequestSetParentLocation(
1122
self.get_transport())
1123
branch_token, repo_token = self.get_lock_tokens(branch)
1125
response = request.execute('base', branch_token, repo_token, '')
1128
self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), response)
1129
self.assertEqual(None, branch.get_parent())
1131
def test_set_parent_something(self):
1132
branch = self.make_branch('base', format="1.9")
1133
request = smart_branch.SmartServerBranchRequestSetParentLocation(
1134
self.get_transport())
1135
branch_token, repo_token = self.get_lock_tokens(branch)
1137
response = request.execute('base', branch_token, repo_token,
1141
self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), response)
1142
self.assertEqual('http://bar/', branch.get_parent())
1145
class TestSmartServerBranchRequestGetTagsBytes(
1146
tests.TestCaseWithMemoryTransport):
1147
# Only called when the branch format and tags match [yay factory
1148
# methods] so only need to test straight forward cases.
1150
def test_get_bytes(self):
1151
base_branch = self.make_branch('base')
1152
request = smart_branch.SmartServerBranchGetTagsBytes(
1153
self.get_transport())
1154
response = request.execute('base')
1156
smart_req.SuccessfulSmartServerResponse(('',)), response)
1159
class TestSmartServerBranchRequestGetStackedOnURL(tests.TestCaseWithMemoryTransport):
1161
def test_get_stacked_on_url(self):
1162
base_branch = self.make_branch('base', format='1.6')
1163
stacked_branch = self.make_branch('stacked', format='1.6')
1164
# typically should be relative
1165
stacked_branch.set_stacked_on_url('../base')
1166
request = smart_branch.SmartServerBranchRequestGetStackedOnURL(
1167
self.get_transport())
1168
response = request.execute('stacked')
1170
smart_req.SmartServerResponse(('ok', '../base')),
1174
class TestSmartServerBranchRequestLockWrite(TestLockedBranch):
1177
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()
1179
371
def test_lock_write_on_unlocked_branch(self):
1180
372
backing = self.get_transport()
1181
request = smart_branch.SmartServerBranchRequestLockWrite(backing)
1182
branch = self.make_branch('.', format='knit')
373
request = smart.branch.SmartServerBranchRequestLockWrite(backing)
374
branch = self.make_branch('.')
1183
375
repository = branch.repository
1184
response = request.execute('')
376
response = request.execute(backing.local_abspath(''))
1185
377
branch_nonce = branch.control_files._lock.peek().get('nonce')
1186
378
repository_nonce = repository.control_files._lock.peek().get('nonce')
1187
self.assertEqual(smart_req.SmartServerResponse(
1188
('ok', branch_nonce, repository_nonce)),
380
SmartServerResponse(('ok', branch_nonce, repository_nonce)),
1190
382
# The branch (and associated repository) is now locked. Verify that
1191
383
# with a new branch object.
1192
384
new_branch = repository.bzrdir.open_branch()
1193
385
self.assertRaises(errors.LockContention, new_branch.lock_write)
1195
request = smart_branch.SmartServerBranchRequestUnlock(backing)
1196
response = request.execute('', branch_nonce, repository_nonce)
1198
387
def test_lock_write_on_locked_branch(self):
1199
388
backing = self.get_transport()
1200
request = smart_branch.SmartServerBranchRequestLockWrite(backing)
389
request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1201
390
branch = self.make_branch('.')
1202
branch_token = branch.lock_write().branch_token
1203
392
branch.leave_lock_in_place()
1205
response = request.execute('')
394
response = request.execute(backing.local_abspath(''))
1206
395
self.assertEqual(
1207
smart_req.SmartServerResponse(('LockContention',)), response)
1209
branch.lock_write(branch_token)
1210
branch.dont_leave_lock_in_place()
396
SmartServerResponse(('LockContention',)), response)
1213
398
def test_lock_write_with_tokens_on_locked_branch(self):
1214
399
backing = self.get_transport()
1215
request = smart_branch.SmartServerBranchRequestLockWrite(backing)
1216
branch = self.make_branch('.', format='knit')
1217
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()
1218
405
branch.leave_lock_in_place()
1219
406
branch.repository.leave_lock_in_place()
1221
response = request.execute('',
408
response = request.execute(backing.local_abspath(''),
1222
409
branch_token, repo_token)
1223
410
self.assertEqual(
1224
smart_req.SmartServerResponse(('ok', branch_token, repo_token)),
1227
branch.repository.lock_write(repo_token)
1228
branch.repository.dont_leave_lock_in_place()
1229
branch.repository.unlock()
1230
branch.lock_write(branch_token)
1231
branch.dont_leave_lock_in_place()
411
SmartServerResponse(('ok', branch_token, repo_token)), response)
1234
413
def test_lock_write_with_mismatched_tokens_on_locked_branch(self):
1235
414
backing = self.get_transport()
1236
request = smart_branch.SmartServerBranchRequestLockWrite(backing)
1237
branch = self.make_branch('.', format='knit')
1238
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()
1239
420
branch.leave_lock_in_place()
1240
421
branch.repository.leave_lock_in_place()
1242
response = request.execute('',
423
response = request.execute(backing.local_abspath(''),
1243
424
branch_token+'xxx', repo_token)
1244
425
self.assertEqual(
1245
smart_req.SmartServerResponse(('TokenMismatch',)), response)
1247
branch.repository.lock_write(repo_token)
1248
branch.repository.dont_leave_lock_in_place()
1249
branch.repository.unlock()
1250
branch.lock_write(branch_token)
1251
branch.dont_leave_lock_in_place()
426
SmartServerResponse(('TokenMismatch',)), response)
1254
428
def test_lock_write_on_locked_repo(self):
1255
429
backing = self.get_transport()
1256
request = smart_branch.SmartServerBranchRequestLockWrite(backing)
1257
branch = self.make_branch('.', format='knit')
1258
repo = branch.repository
1259
repo_token = repo.lock_write().repository_token
1260
repo.leave_lock_in_place()
1262
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(''))
1263
436
self.assertEqual(
1264
smart_req.SmartServerResponse(('LockContention',)), response)
1266
repo.lock_write(repo_token)
1267
repo.dont_leave_lock_in_place()
437
SmartServerResponse(('LockContention',)), response)
1270
439
def test_lock_write_on_readonly_transport(self):
1271
440
backing = self.get_readonly_transport()
1272
request = smart_branch.SmartServerBranchRequestLockWrite(backing)
441
request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1273
442
branch = self.make_branch('.')
1274
root = self.get_transport().clone('/')
1275
path = urlutils.relative_url(root.base, self.get_transport().base)
1276
response = request.execute(path)
1277
error_name, lock_str, why_str = response.args
1278
self.assertFalse(response.is_successful())
1279
self.assertEqual('LockFailed', error_name)
1282
class TestSmartServerBranchRequestUnlock(TestLockedBranch):
443
response = request.execute('')
445
SmartServerResponse(('UnlockableTransport',)), response)
448
class TestSmartServerBranchRequestUnlock(tests.TestCaseWithTransport):
1284
450
def setUp(self):
1285
tests.TestCaseWithMemoryTransport.setUp(self)
451
tests.TestCaseWithTransport.setUp(self)
452
self.reduceLockdirTimeout()
1287
454
def test_unlock_on_locked_branch_and_repo(self):
1288
455
backing = self.get_transport()
1289
request = smart_branch.SmartServerBranchRequestUnlock(backing)
1290
branch = self.make_branch('.', format='knit')
456
request = smart.branch.SmartServerBranchRequestUnlock(backing)
457
branch = self.make_branch('.')
1291
458
# Lock the branch
1292
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()
1293
462
# Unlock the branch (and repo) object, leaving the physical locks
1295
464
branch.leave_lock_in_place()
1296
465
branch.repository.leave_lock_in_place()
1298
response = request.execute('',
467
response = request.execute(backing.local_abspath(''),
1299
468
branch_token, repo_token)
1300
469
self.assertEqual(
1301
smart_req.SmartServerResponse(('ok',)), response)
470
SmartServerResponse(('ok',)), response)
1302
471
# The branch is now unlocked. Verify that with a new branch
1304
473
new_branch = branch.bzrdir.open_branch()
1589
644
stats = tree.branch.repository.gather_stats()
1591
647
expected_body = ('committers: 2\n'
1592
648
'firstrev: 123456.200 3600\n'
1593
649
'latestrev: 654321.400 0\n'
1595
self.assertEqual(smart_req.SmartServerResponse(('ok', ), expected_body),
652
self.assertEqual(SmartServerResponse(('ok', ), expected_body),
653
request.execute(backing.local_abspath(''),
1597
654
rev_id_utf8, 'yes'))
1600
class TestSmartServerRepositoryIsShared(tests.TestCaseWithMemoryTransport):
657
class TestSmartServerRepositoryIsShared(tests.TestCaseWithTransport):
1602
659
def test_is_shared(self):
1603
660
"""For a shared repository, ('yes', ) is returned."""
1604
661
backing = self.get_transport()
1605
request = smart_repo.SmartServerRepositoryIsShared(backing)
662
request = smart.repository.SmartServerRepositoryIsShared(backing)
1606
663
self.make_repository('.', shared=True)
1607
self.assertEqual(smart_req.SmartServerResponse(('yes', )),
1608
request.execute('', ))
664
self.assertEqual(SmartServerResponse(('yes', )),
665
request.execute(backing.local_abspath(''), ))
1610
667
def test_is_not_shared(self):
1611
668
"""For a shared repository, ('no', ) is returned."""
1612
669
backing = self.get_transport()
1613
request = smart_repo.SmartServerRepositoryIsShared(backing)
670
request = smart.repository.SmartServerRepositoryIsShared(backing)
1614
671
self.make_repository('.', shared=False)
1615
self.assertEqual(smart_req.SmartServerResponse(('no', )),
1616
request.execute('', ))
1619
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()
1621
682
def test_lock_write_on_unlocked_repo(self):
1622
683
backing = self.get_transport()
1623
request = smart_repo.SmartServerRepositoryLockWrite(backing)
1624
repository = self.make_repository('.', format='knit')
1625
response = request.execute('')
684
request = smart.repository.SmartServerRepositoryLockWrite(backing)
685
repository = self.make_repository('.')
686
response = request.execute(backing.local_abspath(''))
1626
687
nonce = repository.control_files._lock.peek().get('nonce')
1627
self.assertEqual(smart_req.SmartServerResponse(('ok', nonce)), response)
688
self.assertEqual(SmartServerResponse(('ok', nonce)), response)
1628
689
# The repository is now locked. Verify that with a new repository
1630
691
new_repo = repository.bzrdir.open_repository()
1631
692
self.assertRaises(errors.LockContention, new_repo.lock_write)
1633
request = smart_repo.SmartServerRepositoryUnlock(backing)
1634
response = request.execute('', nonce)
1636
694
def test_lock_write_on_locked_repo(self):
1637
695
backing = self.get_transport()
1638
request = smart_repo.SmartServerRepositoryLockWrite(backing)
1639
repository = self.make_repository('.', format='knit')
1640
repo_token = repository.lock_write().repository_token
696
request = smart.repository.SmartServerRepositoryLockWrite(backing)
697
repository = self.make_repository('.')
698
repository.lock_write()
1641
699
repository.leave_lock_in_place()
1642
700
repository.unlock()
1643
response = request.execute('')
701
response = request.execute(backing.local_abspath(''))
1644
702
self.assertEqual(
1645
smart_req.SmartServerResponse(('LockContention',)), response)
1647
repository.lock_write(repo_token)
1648
repository.dont_leave_lock_in_place()
703
SmartServerResponse(('LockContention',)), response)
1651
705
def test_lock_write_on_readonly_transport(self):
1652
706
backing = self.get_readonly_transport()
1653
request = smart_repo.SmartServerRepositoryLockWrite(backing)
1654
repository = self.make_repository('.', format='knit')
707
request = smart.repository.SmartServerRepositoryLockWrite(backing)
708
repository = self.make_repository('.')
1655
709
response = request.execute('')
1656
self.assertFalse(response.is_successful())
1657
self.assertEqual('LockFailed', response.args[0])
1660
class TestInsertStreamBase(tests.TestCaseWithMemoryTransport):
1662
def make_empty_byte_stream(self, repo):
1663
byte_stream = smart_repo._stream_to_byte_stream([], repo._format)
1664
return ''.join(byte_stream)
1667
class TestSmartServerRepositoryInsertStream(TestInsertStreamBase):
1669
def test_insert_stream_empty(self):
1670
backing = self.get_transport()
1671
request = smart_repo.SmartServerRepositoryInsertStream(backing)
1672
repository = self.make_repository('.')
1673
response = request.execute('', '')
1674
self.assertEqual(None, response)
1675
response = request.do_chunk(self.make_empty_byte_stream(repository))
1676
self.assertEqual(None, response)
1677
response = request.do_end()
1678
self.assertEqual(smart_req.SmartServerResponse(('ok', )), response)
1681
class TestSmartServerRepositoryInsertStreamLocked(TestInsertStreamBase):
1683
def test_insert_stream_empty(self):
1684
backing = self.get_transport()
1685
request = smart_repo.SmartServerRepositoryInsertStreamLocked(
1687
repository = self.make_repository('.', format='knit')
1688
lock_token = repository.lock_write().repository_token
1689
response = request.execute('', '', lock_token)
1690
self.assertEqual(None, response)
1691
response = request.do_chunk(self.make_empty_byte_stream(repository))
1692
self.assertEqual(None, response)
1693
response = request.do_end()
1694
self.assertEqual(smart_req.SmartServerResponse(('ok', )), response)
1697
def test_insert_stream_with_wrong_lock_token(self):
1698
backing = self.get_transport()
1699
request = smart_repo.SmartServerRepositoryInsertStreamLocked(
1701
repository = self.make_repository('.', format='knit')
1702
lock_token = repository.lock_write().repository_token
1704
errors.TokenMismatch, request.execute, '', '', 'wrong-token')
1708
class TestSmartServerRepositoryUnlock(tests.TestCaseWithMemoryTransport):
711
SmartServerResponse(('UnlockableTransport',)), response)
714
class TestSmartServerRepositoryUnlock(tests.TestCaseWithTransport):
1710
716
def setUp(self):
1711
tests.TestCaseWithMemoryTransport.setUp(self)
717
tests.TestCaseWithTransport.setUp(self)
718
self.reduceLockdirTimeout()
1713
720
def test_unlock_on_locked_repo(self):
1714
721
backing = self.get_transport()
1715
request = smart_repo.SmartServerRepositoryUnlock(backing)
1716
repository = self.make_repository('.', format='knit')
1717
token = repository.lock_write().repository_token
722
request = smart.repository.SmartServerRepositoryUnlock(backing)
723
repository = self.make_repository('.')
724
token = repository.lock_write()
1718
725
repository.leave_lock_in_place()
1719
726
repository.unlock()
1720
response = request.execute('', token)
727
response = request.execute(backing.local_abspath(''), token)
1721
728
self.assertEqual(
1722
smart_req.SmartServerResponse(('ok',)), response)
729
SmartServerResponse(('ok',)), response)
1723
730
# The repository is now unlocked. Verify that with a new repository
1725
732
new_repo = repository.bzrdir.open_repository()
1729
736
def test_unlock_on_unlocked_repo(self):
1730
737
backing = self.get_transport()
1731
request = smart_repo.SmartServerRepositoryUnlock(backing)
1732
repository = self.make_repository('.', format='knit')
1733
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')
1734
741
self.assertEqual(
1735
smart_req.SmartServerResponse(('TokenMismatch',)), response)
1738
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):
1740
771
def test_is_readonly_no(self):
1741
772
backing = self.get_transport()
1742
request = smart_req.SmartServerIsReadonly(backing)
773
request = smart.request.SmartServerIsReadonly(backing)
1743
774
response = request.execute()
1744
775
self.assertEqual(
1745
smart_req.SmartServerResponse(('no',)), response)
776
SmartServerResponse(('no',)), response)
1747
778
def test_is_readonly_yes(self):
1748
779
backing = self.get_readonly_transport()
1749
request = smart_req.SmartServerIsReadonly(backing)
780
request = smart.request.SmartServerIsReadonly(backing)
1750
781
response = request.execute()
1751
782
self.assertEqual(
1752
smart_req.SmartServerResponse(('yes',)), response)
1755
class TestSmartServerRepositorySetMakeWorkingTrees(
1756
tests.TestCaseWithMemoryTransport):
1758
def test_set_false(self):
1759
backing = self.get_transport()
1760
repo = self.make_repository('.', shared=True)
1761
repo.set_make_working_trees(True)
1762
request_class = smart_repo.SmartServerRepositorySetMakeWorkingTrees
1763
request = request_class(backing)
1764
self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
1765
request.execute('', 'False'))
1766
repo = repo.bzrdir.open_repository()
1767
self.assertFalse(repo.make_working_trees())
1769
def test_set_true(self):
1770
backing = self.get_transport()
1771
repo = self.make_repository('.', shared=True)
1772
repo.set_make_working_trees(False)
1773
request_class = smart_repo.SmartServerRepositorySetMakeWorkingTrees
1774
request = request_class(backing)
1775
self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
1776
request.execute('', 'True'))
1777
repo = repo.bzrdir.open_repository()
1778
self.assertTrue(repo.make_working_trees())
1781
class TestSmartServerPackRepositoryAutopack(tests.TestCaseWithTransport):
1783
def make_repo_needing_autopacking(self, path='.'):
1784
# Make a repo in need of autopacking.
1785
tree = self.make_branch_and_tree('.', format='pack-0.92')
1786
repo = tree.branch.repository
1787
# monkey-patch the pack collection to disable autopacking
1788
repo._pack_collection._max_pack_count = lambda count: count
1790
tree.commit('commit %s' % x)
1791
self.assertEqual(10, len(repo._pack_collection.names()))
1792
del repo._pack_collection._max_pack_count
1795
def test_autopack_needed(self):
1796
repo = self.make_repo_needing_autopacking()
1798
self.addCleanup(repo.unlock)
1799
backing = self.get_transport()
1800
request = smart_packrepo.SmartServerPackRepositoryAutopack(
1802
response = request.execute('')
1803
self.assertEqual(smart_req.SmartServerResponse(('ok',)), response)
1804
repo._pack_collection.reload_pack_names()
1805
self.assertEqual(1, len(repo._pack_collection.names()))
1807
def test_autopack_not_needed(self):
1808
tree = self.make_branch_and_tree('.', format='pack-0.92')
1809
repo = tree.branch.repository
1811
self.addCleanup(repo.unlock)
1813
tree.commit('commit %s' % x)
1814
backing = self.get_transport()
1815
request = smart_packrepo.SmartServerPackRepositoryAutopack(
1817
response = request.execute('')
1818
self.assertEqual(smart_req.SmartServerResponse(('ok',)), response)
1819
repo._pack_collection.reload_pack_names()
1820
self.assertEqual(9, len(repo._pack_collection.names()))
1822
def test_autopack_on_nonpack_format(self):
1823
"""A request to autopack a non-pack repo is a no-op."""
1824
repo = self.make_repository('.', format='knit')
1825
backing = self.get_transport()
1826
request = smart_packrepo.SmartServerPackRepositoryAutopack(
1828
response = request.execute('')
1829
self.assertEqual(smart_req.SmartServerResponse(('ok',)), response)
1832
class TestSmartServerVfsGet(tests.TestCaseWithMemoryTransport):
1834
def test_unicode_path(self):
1835
"""VFS requests expect unicode paths to be escaped."""
1836
filename = u'foo\N{INTERROBANG}'
1837
filename_escaped = urlutils.escape(filename)
1838
backing = self.get_transport()
1839
request = vfs.GetRequest(backing)
1840
backing.put_bytes_non_atomic(filename_escaped, 'contents')
1841
self.assertEqual(smart_req.SmartServerResponse(('ok', ), 'contents'),
1842
request.execute(filename_escaped))
783
SmartServerResponse(('yes',)), response)
1845
786
class TestHandlers(tests.TestCase):
1846
787
"""Tests for the request.request_handlers object."""
1848
def test_all_registrations_exist(self):
1849
"""All registered request_handlers can be found."""
1850
# If there's a typo in a register_lazy call, this loop will fail with
1851
# an AttributeError.
1852
for key, item in smart_req.request_handlers.iteritems():
1855
def assertHandlerEqual(self, verb, handler):
1856
self.assertEqual(smart_req.request_handlers.get(verb), handler)
1858
789
def test_registered_methods(self):
1859
790
"""Test that known methods are registered to the correct object."""
1860
self.assertHandlerEqual('Branch.get_config_file',
1861
smart_branch.SmartServerBranchGetConfigFile)
1862
self.assertHandlerEqual('Branch.get_parent',
1863
smart_branch.SmartServerBranchGetParent)
1864
self.assertHandlerEqual('Branch.get_tags_bytes',
1865
smart_branch.SmartServerBranchGetTagsBytes)
1866
self.assertHandlerEqual('Branch.lock_write',
1867
smart_branch.SmartServerBranchRequestLockWrite)
1868
self.assertHandlerEqual('Branch.last_revision_info',
1869
smart_branch.SmartServerBranchRequestLastRevisionInfo)
1870
self.assertHandlerEqual('Branch.revision_history',
1871
smart_branch.SmartServerRequestRevisionHistory)
1872
self.assertHandlerEqual('Branch.set_config_option',
1873
smart_branch.SmartServerBranchRequestSetConfigOption)
1874
self.assertHandlerEqual('Branch.set_last_revision',
1875
smart_branch.SmartServerBranchRequestSetLastRevision)
1876
self.assertHandlerEqual('Branch.set_last_revision_info',
1877
smart_branch.SmartServerBranchRequestSetLastRevisionInfo)
1878
self.assertHandlerEqual('Branch.set_last_revision_ex',
1879
smart_branch.SmartServerBranchRequestSetLastRevisionEx)
1880
self.assertHandlerEqual('Branch.set_parent_location',
1881
smart_branch.SmartServerBranchRequestSetParentLocation)
1882
self.assertHandlerEqual('Branch.unlock',
1883
smart_branch.SmartServerBranchRequestUnlock)
1884
self.assertHandlerEqual('BzrDir.find_repository',
1885
smart_dir.SmartServerRequestFindRepositoryV1)
1886
self.assertHandlerEqual('BzrDir.find_repositoryV2',
1887
smart_dir.SmartServerRequestFindRepositoryV2)
1888
self.assertHandlerEqual('BzrDirFormat.initialize',
1889
smart_dir.SmartServerRequestInitializeBzrDir)
1890
self.assertHandlerEqual('BzrDirFormat.initialize_ex_1.16',
1891
smart_dir.SmartServerRequestBzrDirInitializeEx)
1892
self.assertHandlerEqual('BzrDir.cloning_metadir',
1893
smart_dir.SmartServerBzrDirRequestCloningMetaDir)
1894
self.assertHandlerEqual('BzrDir.get_config_file',
1895
smart_dir.SmartServerBzrDirRequestConfigFile)
1896
self.assertHandlerEqual('BzrDir.open_branch',
1897
smart_dir.SmartServerRequestOpenBranch)
1898
self.assertHandlerEqual('BzrDir.open_branchV2',
1899
smart_dir.SmartServerRequestOpenBranchV2)
1900
self.assertHandlerEqual('BzrDir.open_branchV3',
1901
smart_dir.SmartServerRequestOpenBranchV3)
1902
self.assertHandlerEqual('PackRepository.autopack',
1903
smart_packrepo.SmartServerPackRepositoryAutopack)
1904
self.assertHandlerEqual('Repository.gather_stats',
1905
smart_repo.SmartServerRepositoryGatherStats)
1906
self.assertHandlerEqual('Repository.get_parent_map',
1907
smart_repo.SmartServerRepositoryGetParentMap)
1908
self.assertHandlerEqual('Repository.get_rev_id_for_revno',
1909
smart_repo.SmartServerRepositoryGetRevIdForRevno)
1910
self.assertHandlerEqual('Repository.get_revision_graph',
1911
smart_repo.SmartServerRepositoryGetRevisionGraph)
1912
self.assertHandlerEqual('Repository.get_stream',
1913
smart_repo.SmartServerRepositoryGetStream)
1914
self.assertHandlerEqual('Repository.has_revision',
1915
smart_repo.SmartServerRequestHasRevision)
1916
self.assertHandlerEqual('Repository.insert_stream',
1917
smart_repo.SmartServerRepositoryInsertStream)
1918
self.assertHandlerEqual('Repository.insert_stream_locked',
1919
smart_repo.SmartServerRepositoryInsertStreamLocked)
1920
self.assertHandlerEqual('Repository.is_shared',
1921
smart_repo.SmartServerRepositoryIsShared)
1922
self.assertHandlerEqual('Repository.lock_write',
1923
smart_repo.SmartServerRepositoryLockWrite)
1924
self.assertHandlerEqual('Repository.tarball',
1925
smart_repo.SmartServerRepositoryTarball)
1926
self.assertHandlerEqual('Repository.unlock',
1927
smart_repo.SmartServerRepositoryUnlock)
1928
self.assertHandlerEqual('Transport.is_readonly',
1929
smart_req.SmartServerIsReadonly)
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
