103
31
# the default or a parameterized class, but rather use the
104
32
# 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())
34
self.transport_server = smart.server.SmartTCPServer_for_testing
111
36
def get_smart_medium(self):
112
37
"""Get a smart medium to use in tests."""
113
38
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
41
class TestSmartServerResponse(tests.TestCase):
137
43
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', )))
44
self.assertEqual(SmartServerResponse(('ok', )),
45
SmartServerResponse(('ok', )))
46
self.assertEqual(SmartServerResponse(('ok', ), 'body'),
47
SmartServerResponse(('ok', ), 'body'))
48
self.assertNotEqual(SmartServerResponse(('ok', )),
49
SmartServerResponse(('notok', )))
50
self.assertNotEqual(SmartServerResponse(('ok', ), 'body'),
51
SmartServerResponse(('ok', )))
146
52
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):
246
"""Tests for BzrDir.find_repository."""
53
SmartServerResponse(('ok', )))
56
class TestSmartServerRequestFindRepository(tests.TestCaseWithTransport):
248
58
def test_no_repository(self):
249
59
"""When there is no repository to be found, ('norepository', ) is returned."""
250
60
backing = self.get_transport()
251
request = self._request_class(backing)
61
request = smart.bzrdir.SmartServerRequestFindRepository(backing)
252
62
self.make_bzrdir('.')
253
self.assertEqual(smart_req.SmartServerResponse(('norepository', )),
63
self.assertEqual(SmartServerResponse(('norepository', )),
64
request.execute(backing.local_abspath('')))
256
66
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
67
# nonshared repositorys only allow 'find' to return a handle when the
68
# path the repository is being searched on is the same as that that
259
69
# the repository is at.
260
70
backing = self.get_transport()
261
request = self._request_class(backing)
262
result = self._make_repository_and_result()
263
self.assertEqual(result, request.execute(''))
71
request = smart.bzrdir.SmartServerRequestFindRepository(backing)
72
self.make_repository('.')
73
self.assertEqual(SmartServerResponse(('ok', '')),
74
request.execute(backing.local_abspath('')))
264
75
self.make_bzrdir('subdir')
265
self.assertEqual(smart_req.SmartServerResponse(('norepository', )),
266
request.execute('subdir'))
268
def _make_repository_and_result(self, shared=False, format=None):
269
"""Convenience function to setup a repository.
271
:result: The SmartServerResponse to expect when opening it.
273
repo = self.make_repository('.', shared=shared, format=format)
274
if repo.supports_rich_root():
278
if repo._format.supports_tree_reference:
282
if repo._format.supports_external_lookups:
286
if (smart_dir.SmartServerRequestFindRepositoryV3 ==
287
self._request_class):
288
return smart_req.SuccessfulSmartServerResponse(
289
('ok', '', rich_root, subtrees, external,
290
repo._format.network_name()))
291
elif (smart_dir.SmartServerRequestFindRepositoryV2 ==
292
self._request_class):
293
# All tests so far are on formats, and for non-external
295
return smart_req.SuccessfulSmartServerResponse(
296
('ok', '', rich_root, subtrees, external))
298
return smart_req.SuccessfulSmartServerResponse(
299
('ok', '', rich_root, subtrees))
76
self.assertEqual(SmartServerResponse(('norepository', )),
77
request.execute(backing.local_abspath('subdir')))
301
79
def test_shared_repository(self):
302
80
"""When there is a shared repository, we get 'ok', 'relpath-to-repo'."""
303
81
backing = self.get_transport()
304
request = self._request_class(backing)
305
result = self._make_repository_and_result(shared=True)
306
self.assertEqual(result, request.execute(''))
82
request = smart.bzrdir.SmartServerRequestFindRepository(backing)
83
self.make_repository('.', shared=True)
84
self.assertEqual(SmartServerResponse(('ok', '')),
85
request.execute(backing.local_abspath('')))
307
86
self.make_bzrdir('subdir')
308
result2 = smart_req.SmartServerResponse(
309
result.args[0:1] + ('..', ) + result.args[2:])
310
self.assertEqual(result2,
311
request.execute('subdir'))
87
self.assertEqual(SmartServerResponse(('ok', '..')),
88
request.execute(backing.local_abspath('subdir')))
312
89
self.make_bzrdir('subdir/deeper')
313
result3 = smart_req.SmartServerResponse(
314
result.args[0:1] + ('../..', ) + result.args[2:])
315
self.assertEqual(result3,
316
request.execute('subdir/deeper'))
318
def test_rich_root_and_subtree_encoding(self):
319
"""Test for the format attributes for rich root and subtree support."""
320
backing = self.get_transport()
321
request = self._request_class(backing)
322
result = self._make_repository_and_result(
323
format='dirstate-with-subtree')
324
# check the test will be valid
325
self.assertEqual('yes', result.args[2])
326
self.assertEqual('yes', result.args[3])
327
self.assertEqual(result, request.execute(''))
329
def test_supports_external_lookups_no_v2(self):
330
"""Test for the supports_external_lookups attribute."""
331
backing = self.get_transport()
332
request = self._request_class(backing)
333
result = self._make_repository_and_result(
334
format='dirstate-with-subtree')
335
# check the test will be valid
336
self.assertEqual('no', result.args[4])
337
self.assertEqual(result, request.execute(''))
340
class TestSmartServerBzrDirRequestGetConfigFile(
341
tests.TestCaseWithMemoryTransport):
342
"""Tests for BzrDir.get_config_file."""
344
def test_present(self):
345
backing = self.get_transport()
346
dir = self.make_bzrdir('.')
347
dir.get_config().set_default_stack_on("/")
348
local_result = dir._get_config()._get_config_file().read()
349
request_class = smart_dir.SmartServerBzrDirRequestConfigFile
350
request = request_class(backing)
351
expected = smart_req.SuccessfulSmartServerResponse((), local_result)
352
self.assertEqual(expected, request.execute(''))
354
def test_missing(self):
355
backing = self.get_transport()
356
dir = self.make_bzrdir('.')
357
request_class = smart_dir.SmartServerBzrDirRequestConfigFile
358
request = request_class(backing)
359
expected = smart_req.SuccessfulSmartServerResponse((), '')
360
self.assertEqual(expected, request.execute(''))
363
class TestSmartServerRequestInitializeBzrDir(tests.TestCaseWithMemoryTransport):
90
self.assertEqual(SmartServerResponse(('ok', '../..')),
91
request.execute(backing.local_abspath('subdir/deeper')))
94
class TestSmartServerRequestInitializeBzrDir(tests.TestCaseWithTransport):
365
96
def test_empty_dir(self):
366
97
"""Initializing an empty dir should succeed and do it."""
367
98
backing = self.get_transport()
368
request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
369
self.assertEqual(smart_req.SmartServerResponse(('ok', )),
99
request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
100
self.assertEqual(SmartServerResponse(('ok', )),
101
request.execute(backing.local_abspath('.')))
371
102
made_dir = bzrdir.BzrDir.open_from_transport(backing)
372
# no branch, tree or repository is expected with the current
103
# no branch, tree or repository is expected with the current
373
104
# default formart.
374
105
self.assertRaises(errors.NoWorkingTree, made_dir.open_workingtree)
375
106
self.assertRaises(errors.NotBranchError, made_dir.open_branch)
378
109
def test_missing_dir(self):
379
110
"""Initializing a missing directory should fail like the bzrdir api."""
380
111
backing = self.get_transport()
381
request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
112
request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
382
113
self.assertRaises(errors.NoSuchFile,
383
request.execute, 'subdir')
114
request.execute, backing.local_abspath('subdir'))
385
116
def test_initialized_dir(self):
386
117
"""Initializing an extant bzrdir should fail like the bzrdir api."""
387
118
backing = self.get_transport()
388
request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
119
request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
389
120
self.make_bzrdir('subdir')
390
121
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):
122
request.execute, backing.local_abspath('subdir'))
125
class TestSmartServerRequestOpenBranch(tests.TestCaseWithTransport):
505
127
def test_no_branch(self):
506
128
"""When there is no branch, ('nobranch', ) is returned."""
507
129
backing = self.get_transport()
508
request = smart_dir.SmartServerRequestOpenBranch(backing)
130
request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
509
131
self.make_bzrdir('.')
510
self.assertEqual(smart_req.SmartServerResponse(('nobranch', )),
132
self.assertEqual(SmartServerResponse(('nobranch', )),
133
request.execute(backing.local_abspath('')))
513
135
def test_branch(self):
514
136
"""When there is a branch, 'ok' is returned."""
515
137
backing = self.get_transport()
516
request = smart_dir.SmartServerRequestOpenBranch(backing)
138
request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
517
139
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):
140
self.assertEqual(SmartServerResponse(('ok', '')),
141
request.execute(backing.local_abspath('')))
143
def test_branch_reference(self):
144
"""When there is a branch reference, the reference URL is returned."""
145
backing = self.get_transport()
146
request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
147
branch = self.make_branch('branch')
148
checkout = branch.create_checkout('reference',lightweight=True)
149
# TODO: once we have an API to probe for references of any sort, we
151
reference_url = backing.abspath('branch') + '/'
152
self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
153
self.assertEqual(SmartServerResponse(('ok', reference_url)),
154
request.execute(backing.local_abspath('reference')))
157
class TestSmartServerRequestRevisionHistory(tests.TestCaseWithTransport):
672
159
def test_empty(self):
673
160
"""For an empty branch, the body is empty."""
674
161
backing = self.get_transport()
675
request = smart_branch.SmartServerRequestRevisionHistory(backing)
162
request = smart.branch.SmartServerRequestRevisionHistory(backing)
676
163
self.make_branch('.')
677
self.assertEqual(smart_req.SmartServerResponse(('ok', ), ''),
164
self.assertEqual(SmartServerResponse(('ok', ), ''),
165
request.execute(backing.local_abspath('')))
680
167
def test_not_empty(self):
681
168
"""For a non-empty branch, the body is empty."""
682
169
backing = self.get_transport()
683
request = smart_branch.SmartServerRequestRevisionHistory(backing)
170
request = smart.branch.SmartServerRequestRevisionHistory(backing)
684
171
tree = self.make_branch_and_memory_tree('.')
685
172
tree.lock_write()
687
174
r1 = tree.commit('1st commit')
688
r2 = tree.commit('2nd commit', rev_id=u'\xc8'.encode('utf-8'))
175
r2 = tree.commit('2nd commit', rev_id=u'\xc8')
690
177
self.assertEqual(
691
smart_req.SmartServerResponse(('ok', ), ('\x00'.join([r1, r2]))),
695
class TestSmartServerBranchRequest(tests.TestCaseWithMemoryTransport):
178
SmartServerResponse(('ok', ), ('\x00'.join([r1, r2]))),
179
request.execute(backing.local_abspath('')))
182
class TestSmartServerBranchRequest(tests.TestCaseWithTransport):
697
184
def test_no_branch(self):
698
185
"""When there is a bzrdir and no branch, NotBranchError is raised."""
699
186
backing = self.get_transport()
700
request = smart_branch.SmartServerBranchRequest(backing)
187
request = smart.branch.SmartServerBranchRequest(backing)
701
188
self.make_bzrdir('.')
702
189
self.assertRaises(errors.NotBranchError,
190
request.execute, backing.local_abspath(''))
705
192
def test_branch_reference(self):
706
193
"""When there is a branch reference, NotBranchError is raised."""
707
194
backing = self.get_transport()
708
request = smart_branch.SmartServerBranchRequest(backing)
195
request = smart.branch.SmartServerBranchRequest(backing)
709
196
branch = self.make_branch('branch')
710
197
checkout = branch.create_checkout('reference',lightweight=True)
711
198
self.assertRaises(errors.NotBranchError,
712
request.execute, 'checkout')
715
class TestSmartServerBranchRequestLastRevisionInfo(
716
tests.TestCaseWithMemoryTransport):
199
request.execute, backing.local_abspath('checkout'))
202
class TestSmartServerBranchRequestLastRevisionInfo(tests.TestCaseWithTransport):
718
204
def test_empty(self):
719
"""For an empty branch, the result is ('ok', '0', 'null:')."""
205
"""For an empty branch, the result is ('ok', '0', '')."""
720
206
backing = self.get_transport()
721
request = smart_branch.SmartServerBranchRequestLastRevisionInfo(backing)
207
request = smart.branch.SmartServerBranchRequestLastRevisionInfo(backing)
722
208
self.make_branch('.')
723
self.assertEqual(smart_req.SmartServerResponse(('ok', '0', 'null:')),
209
self.assertEqual(SmartServerResponse(('ok', '0', '')),
210
request.execute(backing.local_abspath('')))
726
212
def test_not_empty(self):
727
213
"""For a non-empty branch, the result is ('ok', 'revno', 'revid')."""
728
214
backing = self.get_transport()
729
request = smart_branch.SmartServerBranchRequestLastRevisionInfo(backing)
215
request = smart.branch.SmartServerBranchRequestLastRevisionInfo(backing)
730
216
tree = self.make_branch_and_memory_tree('.')
731
217
tree.lock_write()
733
rev_id_utf8 = u'\xc8'.encode('utf-8')
220
rev_id_utf8 = rev_id.encode('utf-8')
734
221
r1 = tree.commit('1st commit')
735
r2 = tree.commit('2nd commit', rev_id=rev_id_utf8)
222
r2 = tree.commit('2nd commit', rev_id=rev_id)
737
224
self.assertEqual(
738
smart_req.SmartServerResponse(('ok', '2', rev_id_utf8)),
742
class TestSmartServerBranchRequestGetConfigFile(
743
tests.TestCaseWithMemoryTransport):
225
SmartServerResponse(('ok', '2', rev_id_utf8)),
226
request.execute(backing.local_abspath('')))
229
class TestSmartServerBranchRequestGetConfigFile(tests.TestCaseWithTransport):
745
231
def test_default(self):
746
232
"""With no file, we get empty content."""
747
233
backing = self.get_transport()
748
request = smart_branch.SmartServerBranchGetConfigFile(backing)
234
request = smart.branch.SmartServerBranchGetConfigFile(backing)
749
235
branch = self.make_branch('.')
750
236
# there should be no file by default
752
self.assertEqual(smart_req.SmartServerResponse(('ok', ), content),
238
self.assertEqual(SmartServerResponse(('ok', ), content),
239
request.execute(backing.local_abspath('')))
755
241
def test_with_content(self):
756
242
# SmartServerBranchGetConfigFile should return the content from
757
243
# 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()
771
repo_token = branch.repository.lock_write()
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 TestSmartServerBranchRequestSetTagsBytes(TestLockedBranch):
806
# Only called when the branch format and tags match [yay factory
807
# methods] so only need to test straight forward cases.
809
def test_set_bytes(self):
810
base_branch = self.make_branch('base')
811
tag_bytes = base_branch._get_tags_bytes()
812
# get_lock_tokens takes out a lock.
813
branch_token, repo_token = self.get_lock_tokens(base_branch)
814
request = smart_branch.SmartServerBranchSetTagsBytes(
815
self.get_transport())
816
response = request.execute('base', branch_token, repo_token)
817
self.assertEqual(None, response)
818
response = request.do_chunk(tag_bytes)
819
self.assertEqual(None, response)
820
response = request.do_end()
822
smart_req.SuccessfulSmartServerResponse(()), response)
825
def test_lock_failed(self):
826
base_branch = self.make_branch('base')
827
base_branch.lock_write()
828
tag_bytes = base_branch._get_tags_bytes()
829
request = smart_branch.SmartServerBranchSetTagsBytes(
830
self.get_transport())
831
self.assertRaises(errors.TokenMismatch, request.execute,
832
'base', 'wrong token', 'wrong token')
833
# The request handler will keep processing the message parts, so even
834
# if the request fails immediately do_chunk and do_end are still
836
request.do_chunk(tag_bytes)
842
class SetLastRevisionTestBase(TestLockedBranch):
843
"""Base test case for verbs that implement set_last_revision."""
846
tests.TestCaseWithMemoryTransport.setUp(self)
847
backing_transport = self.get_transport()
848
self.request = self.request_class(backing_transport)
849
self.tree = self.make_branch_and_memory_tree('.')
851
def lock_branch(self):
852
return self.get_lock_tokens(self.tree.branch)
854
def unlock_branch(self):
855
self.tree.branch.unlock()
857
def set_last_revision(self, revision_id, revno):
858
branch_token, repo_token = self.lock_branch()
859
response = self._set_last_revision(
860
revision_id, revno, branch_token, repo_token)
864
def assertRequestSucceeds(self, revision_id, revno):
865
response = self.set_last_revision(revision_id, revno)
866
self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
870
class TestSetLastRevisionVerbMixin(object):
871
"""Mixin test case for verbs that implement set_last_revision."""
873
def test_set_null_to_null(self):
874
"""An empty branch can have its last revision set to 'null:'."""
875
self.assertRequestSucceeds('null:', 0)
877
def test_NoSuchRevision(self):
878
"""If the revision_id is not present, the verb returns NoSuchRevision.
880
revision_id = 'non-existent revision'
881
self.assertEqual(smart_req.FailedSmartServerResponse(('NoSuchRevision',
883
self.set_last_revision(revision_id, 1))
885
def make_tree_with_two_commits(self):
886
self.tree.lock_write()
888
rev_id_utf8 = u'\xc8'.encode('utf-8')
889
r1 = self.tree.commit('1st commit', rev_id=rev_id_utf8)
890
r2 = self.tree.commit('2nd commit', rev_id='rev-2')
893
def test_branch_last_revision_info_is_updated(self):
894
"""A branch's tip can be set to a revision that is present in its
897
# Make a branch with an empty revision history, but two revisions in
899
self.make_tree_with_two_commits()
900
rev_id_utf8 = u'\xc8'.encode('utf-8')
901
self.tree.branch.set_revision_history([])
903
(0, 'null:'), self.tree.branch.last_revision_info())
904
# We can update the branch to a revision that is present in the
906
self.assertRequestSucceeds(rev_id_utf8, 1)
908
(1, rev_id_utf8), self.tree.branch.last_revision_info())
910
def test_branch_last_revision_info_rewind(self):
911
"""A branch's tip can be set to a revision that is an ancestor of the
914
self.make_tree_with_two_commits()
915
rev_id_utf8 = u'\xc8'.encode('utf-8')
917
(2, 'rev-2'), self.tree.branch.last_revision_info())
918
self.assertRequestSucceeds(rev_id_utf8, 1)
920
(1, rev_id_utf8), self.tree.branch.last_revision_info())
922
def test_TipChangeRejected(self):
923
"""If a pre_change_branch_tip hook raises TipChangeRejected, the verb
924
returns TipChangeRejected.
926
rejection_message = u'rejection message\N{INTERROBANG}'
927
def hook_that_rejects(params):
928
raise errors.TipChangeRejected(rejection_message)
929
_mod_branch.Branch.hooks.install_named_hook(
930
'pre_change_branch_tip', hook_that_rejects, None)
932
smart_req.FailedSmartServerResponse(
933
('TipChangeRejected', rejection_message.encode('utf-8'))),
934
self.set_last_revision('null:', 0))
937
class TestSmartServerBranchRequestSetLastRevision(
938
SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
939
"""Tests for Branch.set_last_revision verb."""
941
request_class = smart_branch.SmartServerBranchRequestSetLastRevision
943
def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
944
return self.request.execute(
945
'', branch_token, repo_token, revision_id)
948
class TestSmartServerBranchRequestSetLastRevisionInfo(
949
SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
950
"""Tests for Branch.set_last_revision_info verb."""
952
request_class = smart_branch.SmartServerBranchRequestSetLastRevisionInfo
954
def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
955
return self.request.execute(
956
'', branch_token, repo_token, revno, revision_id)
958
def test_NoSuchRevision(self):
959
"""Branch.set_last_revision_info does not have to return
960
NoSuchRevision if the revision_id is absent.
962
raise tests.TestNotApplicable()
965
class TestSmartServerBranchRequestSetLastRevisionEx(
966
SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
967
"""Tests for Branch.set_last_revision_ex verb."""
969
request_class = smart_branch.SmartServerBranchRequestSetLastRevisionEx
971
def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
972
return self.request.execute(
973
'', branch_token, repo_token, revision_id, 0, 0)
975
def assertRequestSucceeds(self, revision_id, revno):
976
response = self.set_last_revision(revision_id, revno)
978
smart_req.SuccessfulSmartServerResponse(('ok', revno, revision_id)),
981
def test_branch_last_revision_info_rewind(self):
982
"""A branch's tip can be set to a revision that is an ancestor of the
983
current tip, but only if allow_overwrite_descendant is passed.
985
self.make_tree_with_two_commits()
986
rev_id_utf8 = u'\xc8'.encode('utf-8')
988
(2, 'rev-2'), self.tree.branch.last_revision_info())
989
# If allow_overwrite_descendant flag is 0, then trying to set the tip
990
# to an older revision ID has no effect.
991
branch_token, repo_token = self.lock_branch()
992
response = self.request.execute(
993
'', branch_token, repo_token, rev_id_utf8, 0, 0)
995
smart_req.SuccessfulSmartServerResponse(('ok', 2, 'rev-2')),
998
(2, 'rev-2'), self.tree.branch.last_revision_info())
1000
# If allow_overwrite_descendant flag is 1, then setting the tip to an
1002
response = self.request.execute(
1003
'', branch_token, repo_token, rev_id_utf8, 0, 1)
1005
smart_req.SuccessfulSmartServerResponse(('ok', 1, rev_id_utf8)),
1007
self.unlock_branch()
1009
(1, rev_id_utf8), self.tree.branch.last_revision_info())
1011
def make_branch_with_divergent_history(self):
1012
"""Make a branch with divergent history in its repo.
1014
The branch's tip will be 'child-2', and the repo will also contain
1015
'child-1', which diverges from a common base revision.
1017
self.tree.lock_write()
1019
r1 = self.tree.commit('1st commit')
1020
revno_1, revid_1 = self.tree.branch.last_revision_info()
1021
r2 = self.tree.commit('2nd commit', rev_id='child-1')
1022
# Undo the second commit
1023
self.tree.branch.set_last_revision_info(revno_1, revid_1)
1024
self.tree.set_parent_ids([revid_1])
1025
# Make a new second commit, child-2. child-2 has diverged from
1027
new_r2 = self.tree.commit('2nd commit', rev_id='child-2')
1030
def test_not_allow_diverged(self):
1031
"""If allow_diverged is not passed, then setting a divergent history
1032
returns a Diverged error.
1034
self.make_branch_with_divergent_history()
1036
smart_req.FailedSmartServerResponse(('Diverged',)),
1037
self.set_last_revision('child-1', 2))
1038
# The branch tip was not changed.
1039
self.assertEqual('child-2', self.tree.branch.last_revision())
1041
def test_allow_diverged(self):
1042
"""If allow_diverged is passed, then setting a divergent history
1045
self.make_branch_with_divergent_history()
1046
branch_token, repo_token = self.lock_branch()
1047
response = self.request.execute(
1048
'', branch_token, repo_token, 'child-1', 1, 0)
1050
smart_req.SuccessfulSmartServerResponse(('ok', 2, 'child-1')),
1052
self.unlock_branch()
1053
# The branch tip was changed.
1054
self.assertEqual('child-1', self.tree.branch.last_revision())
1057
class TestSmartServerBranchRequestGetParent(tests.TestCaseWithMemoryTransport):
1059
def test_get_parent_none(self):
1060
base_branch = self.make_branch('base')
1061
request = smart_branch.SmartServerBranchGetParent(self.get_transport())
1062
response = request.execute('base')
1064
smart_req.SuccessfulSmartServerResponse(('',)), response)
1066
def test_get_parent_something(self):
1067
base_branch = self.make_branch('base')
1068
base_branch.set_parent(self.get_url('foo'))
1069
request = smart_branch.SmartServerBranchGetParent(self.get_transport())
1070
response = request.execute('base')
1072
smart_req.SuccessfulSmartServerResponse(("../foo",)),
1076
class TestSmartServerBranchRequestSetParent(tests.TestCaseWithMemoryTransport):
1078
def test_set_parent_none(self):
1079
branch = self.make_branch('base', format="1.9")
1081
branch._set_parent_location('foo')
1083
request = smart_branch.SmartServerBranchRequestSetParentLocation(
1084
self.get_transport())
1085
branch_token = branch.lock_write()
1086
repo_token = branch.repository.lock_write()
1088
response = request.execute('base', branch_token, repo_token, '')
1090
branch.repository.unlock()
1092
self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), response)
1093
self.assertEqual(None, branch.get_parent())
1095
def test_set_parent_something(self):
1096
branch = self.make_branch('base', format="1.9")
1097
request = smart_branch.SmartServerBranchRequestSetParentLocation(
1098
self.get_transport())
1099
branch_token = branch.lock_write()
1100
repo_token = branch.repository.lock_write()
1102
response = request.execute('base', branch_token, repo_token,
1105
branch.repository.unlock()
1107
self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), response)
1108
self.assertEqual('http://bar/', branch.get_parent())
1111
class TestSmartServerBranchRequestGetTagsBytes(
1112
tests.TestCaseWithMemoryTransport):
1113
# Only called when the branch format and tags match [yay factory
1114
# methods] so only need to test straight forward cases.
1116
def test_get_bytes(self):
1117
base_branch = self.make_branch('base')
1118
request = smart_branch.SmartServerBranchGetTagsBytes(
1119
self.get_transport())
1120
response = request.execute('base')
1122
smart_req.SuccessfulSmartServerResponse(('',)), response)
1125
class TestSmartServerBranchRequestGetStackedOnURL(tests.TestCaseWithMemoryTransport):
1127
def test_get_stacked_on_url(self):
1128
base_branch = self.make_branch('base', format='1.6')
1129
stacked_branch = self.make_branch('stacked', format='1.6')
1130
# typically should be relative
1131
stacked_branch.set_stacked_on_url('../base')
1132
request = smart_branch.SmartServerBranchRequestGetStackedOnURL(
1133
self.get_transport())
1134
response = request.execute('stacked')
1136
smart_req.SmartServerResponse(('ok', '../base')),
1140
class TestSmartServerBranchRequestLockWrite(tests.TestCaseWithMemoryTransport):
1143
tests.TestCaseWithMemoryTransport.setUp(self)
244
# perform more complex processing.
245
backing = self.get_transport()
246
request = smart.branch.SmartServerBranchGetConfigFile(backing)
247
branch = self.make_branch('.')
248
branch.control_files.put_utf8('branch.conf', 'foo bar baz')
249
self.assertEqual(SmartServerResponse(('ok', ), 'foo bar baz'),
250
request.execute(backing.local_abspath('')))
253
class TestSmartServerBranchRequestSetLastRevision(tests.TestCaseWithTransport):
255
def test_empty(self):
256
backing = self.get_transport()
257
request = smart.branch.SmartServerBranchRequestSetLastRevision(backing)
258
b = self.make_branch('.')
259
branch_token, repo_token = b.lock_write()
261
self.assertEqual(SmartServerResponse(('ok',)),
263
backing.local_abspath(''), branch_token, repo_token, ''))
267
def test_not_present_revision_id(self):
268
backing = self.get_transport()
269
request = smart.branch.SmartServerBranchRequestSetLastRevision(backing)
270
b = self.make_branch('.')
271
branch_token, repo_token = b.lock_write()
273
revision_id = 'non-existent revision'
275
SmartServerResponse(('NoSuchRevision', revision_id)),
277
backing.local_abspath(''), branch_token, repo_token,
282
def test_revision_id_present(self):
283
backing = self.get_transport()
284
request = smart.branch.SmartServerBranchRequestSetLastRevision(backing)
285
tree = self.make_branch_and_memory_tree('.')
289
rev_id_utf8 = rev_id.encode('utf-8')
290
r1 = tree.commit('1st commit', rev_id=rev_id)
291
r2 = tree.commit('2nd commit')
293
branch_token, repo_token = tree.branch.lock_write()
296
SmartServerResponse(('ok',)),
298
backing.local_abspath(''), branch_token, repo_token,
300
self.assertEqual([rev_id_utf8], tree.branch.revision_history())
304
def test_revision_id_present2(self):
305
backing = self.get_transport()
306
request = smart.branch.SmartServerBranchRequestSetLastRevision(backing)
307
tree = self.make_branch_and_memory_tree('.')
311
rev_id_utf8 = rev_id.encode('utf-8')
312
r1 = tree.commit('1st commit', rev_id=rev_id)
313
r2 = tree.commit('2nd commit')
315
tree.branch.set_revision_history([])
316
branch_token, repo_token = tree.branch.lock_write()
319
SmartServerResponse(('ok',)),
321
backing.local_abspath(''), branch_token, repo_token,
323
self.assertEqual([rev_id_utf8], tree.branch.revision_history())
328
class TestSmartServerBranchRequestLockWrite(tests.TestCaseWithTransport):
331
tests.TestCaseWithTransport.setUp(self)
332
self.reduceLockdirTimeout()
1145
334
def test_lock_write_on_unlocked_branch(self):
1146
335
backing = self.get_transport()
1147
request = smart_branch.SmartServerBranchRequestLockWrite(backing)
1148
branch = self.make_branch('.', format='knit')
336
request = smart.branch.SmartServerBranchRequestLockWrite(backing)
337
branch = self.make_branch('.')
1149
338
repository = branch.repository
1150
response = request.execute('')
339
response = request.execute(backing.local_abspath(''))
1151
340
branch_nonce = branch.control_files._lock.peek().get('nonce')
1152
341
repository_nonce = repository.control_files._lock.peek().get('nonce')
1153
self.assertEqual(smart_req.SmartServerResponse(
1154
('ok', branch_nonce, repository_nonce)),
343
SmartServerResponse(('ok', branch_nonce, repository_nonce)),
1156
345
# The branch (and associated repository) is now locked. Verify that
1157
346
# with a new branch object.
1158
347
new_branch = repository.bzrdir.open_branch()
1159
348
self.assertRaises(errors.LockContention, new_branch.lock_write)
1161
request = smart_branch.SmartServerBranchRequestUnlock(backing)
1162
response = request.execute('', branch_nonce, repository_nonce)
1164
350
def test_lock_write_on_locked_branch(self):
1165
351
backing = self.get_transport()
1166
request = smart_branch.SmartServerBranchRequestLockWrite(backing)
352
request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1167
353
branch = self.make_branch('.')
1168
branch_token = branch.lock_write()
1169
355
branch.leave_lock_in_place()
1171
response = request.execute('')
357
response = request.execute(backing.local_abspath(''))
1172
358
self.assertEqual(
1173
smart_req.SmartServerResponse(('LockContention',)), response)
1175
branch.lock_write(branch_token)
1176
branch.dont_leave_lock_in_place()
359
SmartServerResponse(('LockContention',)), response)
1179
361
def test_lock_write_with_tokens_on_locked_branch(self):
1180
362
backing = self.get_transport()
1181
request = smart_branch.SmartServerBranchRequestLockWrite(backing)
1182
branch = self.make_branch('.', format='knit')
1183
branch_token = branch.lock_write()
1184
repo_token = branch.repository.lock_write()
1185
branch.repository.unlock()
363
request = smart.branch.SmartServerBranchRequestLockWrite(backing)
364
branch = self.make_branch('.')
365
branch_token, repo_token = branch.lock_write()
1186
366
branch.leave_lock_in_place()
1187
367
branch.repository.leave_lock_in_place()
1189
response = request.execute('',
369
response = request.execute(backing.local_abspath(''),
1190
370
branch_token, repo_token)
1191
371
self.assertEqual(
1192
smart_req.SmartServerResponse(('ok', branch_token, repo_token)),
1195
branch.repository.lock_write(repo_token)
1196
branch.repository.dont_leave_lock_in_place()
1197
branch.repository.unlock()
1198
branch.lock_write(branch_token)
1199
branch.dont_leave_lock_in_place()
372
SmartServerResponse(('ok', branch_token, repo_token)), response)
1202
374
def test_lock_write_with_mismatched_tokens_on_locked_branch(self):
1203
375
backing = self.get_transport()
1204
request = smart_branch.SmartServerBranchRequestLockWrite(backing)
1205
branch = self.make_branch('.', format='knit')
1206
branch_token = branch.lock_write()
1207
repo_token = branch.repository.lock_write()
1208
branch.repository.unlock()
376
request = smart.branch.SmartServerBranchRequestLockWrite(backing)
377
branch = self.make_branch('.')
378
branch_token, repo_token = branch.lock_write()
1209
379
branch.leave_lock_in_place()
1210
380
branch.repository.leave_lock_in_place()
1212
response = request.execute('',
382
response = request.execute(backing.local_abspath(''),
1213
383
branch_token+'xxx', repo_token)
1214
384
self.assertEqual(
1215
smart_req.SmartServerResponse(('TokenMismatch',)), response)
1217
branch.repository.lock_write(repo_token)
1218
branch.repository.dont_leave_lock_in_place()
1219
branch.repository.unlock()
1220
branch.lock_write(branch_token)
1221
branch.dont_leave_lock_in_place()
385
SmartServerResponse(('TokenMismatch',)), response)
1224
387
def test_lock_write_on_locked_repo(self):
1225
388
backing = self.get_transport()
1226
request = smart_branch.SmartServerBranchRequestLockWrite(backing)
1227
branch = self.make_branch('.', format='knit')
1228
repo = branch.repository
1229
repo_token = repo.lock_write()
1230
repo.leave_lock_in_place()
1232
response = request.execute('')
389
request = smart.branch.SmartServerBranchRequestLockWrite(backing)
390
branch = self.make_branch('.')
391
branch.repository.lock_write()
392
branch.repository.leave_lock_in_place()
393
branch.repository.unlock()
394
response = request.execute(backing.local_abspath(''))
1233
395
self.assertEqual(
1234
smart_req.SmartServerResponse(('LockContention',)), response)
1236
repo.lock_write(repo_token)
1237
repo.dont_leave_lock_in_place()
396
SmartServerResponse(('LockContention',)), response)
1240
398
def test_lock_write_on_readonly_transport(self):
1241
399
backing = self.get_readonly_transport()
1242
request = smart_branch.SmartServerBranchRequestLockWrite(backing)
400
request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1243
401
branch = self.make_branch('.')
1244
root = self.get_transport().clone('/')
1245
path = urlutils.relative_url(root.base, self.get_transport().base)
1246
response = request.execute(path)
1247
error_name, lock_str, why_str = response.args
1248
self.assertFalse(response.is_successful())
1249
self.assertEqual('LockFailed', error_name)
1252
class TestSmartServerBranchRequestUnlock(tests.TestCaseWithMemoryTransport):
402
response = request.execute('')
404
SmartServerResponse(('UnlockableTransport',)), response)
407
class TestSmartServerBranchRequestUnlock(tests.TestCaseWithTransport):
1254
409
def setUp(self):
1255
tests.TestCaseWithMemoryTransport.setUp(self)
410
tests.TestCaseWithTransport.setUp(self)
411
self.reduceLockdirTimeout()
1257
413
def test_unlock_on_locked_branch_and_repo(self):
1258
414
backing = self.get_transport()
1259
request = smart_branch.SmartServerBranchRequestUnlock(backing)
1260
branch = self.make_branch('.', format='knit')
415
request = smart.branch.SmartServerBranchRequestUnlock(backing)
416
branch = self.make_branch('.')
1261
417
# Lock the branch
1262
branch_token = branch.lock_write()
1263
repo_token = branch.repository.lock_write()
1264
branch.repository.unlock()
418
branch_token, repo_token = branch.lock_write()
1265
419
# Unlock the branch (and repo) object, leaving the physical locks
1267
421
branch.leave_lock_in_place()
1268
422
branch.repository.leave_lock_in_place()
1270
response = request.execute('',
424
response = request.execute(backing.local_abspath(''),
1271
425
branch_token, repo_token)
1272
426
self.assertEqual(
1273
smart_req.SmartServerResponse(('ok',)), response)
427
SmartServerResponse(('ok',)), response)
1274
428
# The branch is now unlocked. Verify that with a new branch
1276
430
new_branch = branch.bzrdir.open_branch()
1702
692
def test_unlock_on_unlocked_repo(self):
1703
693
backing = self.get_transport()
1704
request = smart_repo.SmartServerRepositoryUnlock(backing)
1705
repository = self.make_repository('.', format='knit')
1706
response = request.execute('', 'some token')
694
request = smart.repository.SmartServerRepositoryUnlock(backing)
695
repository = self.make_repository('.')
696
response = request.execute(backing.local_abspath(''), 'some token')
1707
697
self.assertEqual(
1708
smart_req.SmartServerResponse(('TokenMismatch',)), response)
1711
class TestSmartServerIsReadonly(tests.TestCaseWithMemoryTransport):
698
SmartServerResponse(('TokenMismatch',)), response)
701
class TestSmartServerIsReadonly(tests.TestCaseWithTransport):
1713
703
def test_is_readonly_no(self):
1714
704
backing = self.get_transport()
1715
request = smart_req.SmartServerIsReadonly(backing)
705
request = smart.request.SmartServerIsReadonly(backing)
1716
706
response = request.execute()
1717
707
self.assertEqual(
1718
smart_req.SmartServerResponse(('no',)), response)
708
SmartServerResponse(('no',)), response)
1720
710
def test_is_readonly_yes(self):
1721
711
backing = self.get_readonly_transport()
1722
request = smart_req.SmartServerIsReadonly(backing)
712
request = smart.request.SmartServerIsReadonly(backing)
1723
713
response = request.execute()
1724
714
self.assertEqual(
1725
smart_req.SmartServerResponse(('yes',)), response)
1728
class TestSmartServerRepositorySetMakeWorkingTrees(
1729
tests.TestCaseWithMemoryTransport):
1731
def test_set_false(self):
1732
backing = self.get_transport()
1733
repo = self.make_repository('.', shared=True)
1734
repo.set_make_working_trees(True)
1735
request_class = smart_repo.SmartServerRepositorySetMakeWorkingTrees
1736
request = request_class(backing)
1737
self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
1738
request.execute('', 'False'))
1739
repo = repo.bzrdir.open_repository()
1740
self.assertFalse(repo.make_working_trees())
1742
def test_set_true(self):
1743
backing = self.get_transport()
1744
repo = self.make_repository('.', shared=True)
1745
repo.set_make_working_trees(False)
1746
request_class = smart_repo.SmartServerRepositorySetMakeWorkingTrees
1747
request = request_class(backing)
1748
self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
1749
request.execute('', 'True'))
1750
repo = repo.bzrdir.open_repository()
1751
self.assertTrue(repo.make_working_trees())
1754
class TestSmartServerPackRepositoryAutopack(tests.TestCaseWithTransport):
1756
def make_repo_needing_autopacking(self, path='.'):
1757
# Make a repo in need of autopacking.
1758
tree = self.make_branch_and_tree('.', format='pack-0.92')
1759
repo = tree.branch.repository
1760
# monkey-patch the pack collection to disable autopacking
1761
repo._pack_collection._max_pack_count = lambda count: count
1763
tree.commit('commit %s' % x)
1764
self.assertEqual(10, len(repo._pack_collection.names()))
1765
del repo._pack_collection._max_pack_count
1768
def test_autopack_needed(self):
1769
repo = self.make_repo_needing_autopacking()
1771
self.addCleanup(repo.unlock)
1772
backing = self.get_transport()
1773
request = smart_packrepo.SmartServerPackRepositoryAutopack(
1775
response = request.execute('')
1776
self.assertEqual(smart_req.SmartServerResponse(('ok',)), response)
1777
repo._pack_collection.reload_pack_names()
1778
self.assertEqual(1, len(repo._pack_collection.names()))
1780
def test_autopack_not_needed(self):
1781
tree = self.make_branch_and_tree('.', format='pack-0.92')
1782
repo = tree.branch.repository
1784
self.addCleanup(repo.unlock)
1786
tree.commit('commit %s' % x)
1787
backing = self.get_transport()
1788
request = smart_packrepo.SmartServerPackRepositoryAutopack(
1790
response = request.execute('')
1791
self.assertEqual(smart_req.SmartServerResponse(('ok',)), response)
1792
repo._pack_collection.reload_pack_names()
1793
self.assertEqual(9, len(repo._pack_collection.names()))
1795
def test_autopack_on_nonpack_format(self):
1796
"""A request to autopack a non-pack repo is a no-op."""
1797
repo = self.make_repository('.', format='knit')
1798
backing = self.get_transport()
1799
request = smart_packrepo.SmartServerPackRepositoryAutopack(
1801
response = request.execute('')
1802
self.assertEqual(smart_req.SmartServerResponse(('ok',)), response)
1805
class TestSmartServerVfsGet(tests.TestCaseWithMemoryTransport):
1807
def test_unicode_path(self):
1808
"""VFS requests expect unicode paths to be escaped."""
1809
filename = u'foo\N{INTERROBANG}'
1810
filename_escaped = urlutils.escape(filename)
1811
backing = self.get_transport()
1812
request = vfs.GetRequest(backing)
1813
backing.put_bytes_non_atomic(filename_escaped, 'contents')
1814
self.assertEqual(smart_req.SmartServerResponse(('ok', ), 'contents'),
1815
request.execute(filename_escaped))
715
SmartServerResponse(('yes',)), response)
1818
718
class TestHandlers(tests.TestCase):
1819
719
"""Tests for the request.request_handlers object."""
1821
def test_all_registrations_exist(self):
1822
"""All registered request_handlers can be found."""
1823
# If there's a typo in a register_lazy call, this loop will fail with
1824
# an AttributeError.
1825
for key, item in smart_req.request_handlers.iteritems():
1828
def assertHandlerEqual(self, verb, handler):
1829
self.assertEqual(smart_req.request_handlers.get(verb), handler)
1831
721
def test_registered_methods(self):
1832
722
"""Test that known methods are registered to the correct object."""
1833
self.assertHandlerEqual('Branch.get_config_file',
1834
smart_branch.SmartServerBranchGetConfigFile)
1835
self.assertHandlerEqual('Branch.get_parent',
1836
smart_branch.SmartServerBranchGetParent)
1837
self.assertHandlerEqual('Branch.get_tags_bytes',
1838
smart_branch.SmartServerBranchGetTagsBytes)
1839
self.assertHandlerEqual('Branch.lock_write',
1840
smart_branch.SmartServerBranchRequestLockWrite)
1841
self.assertHandlerEqual('Branch.last_revision_info',
1842
smart_branch.SmartServerBranchRequestLastRevisionInfo)
1843
self.assertHandlerEqual('Branch.revision_history',
1844
smart_branch.SmartServerRequestRevisionHistory)
1845
self.assertHandlerEqual('Branch.set_config_option',
1846
smart_branch.SmartServerBranchRequestSetConfigOption)
1847
self.assertHandlerEqual('Branch.set_last_revision',
1848
smart_branch.SmartServerBranchRequestSetLastRevision)
1849
self.assertHandlerEqual('Branch.set_last_revision_info',
1850
smart_branch.SmartServerBranchRequestSetLastRevisionInfo)
1851
self.assertHandlerEqual('Branch.set_last_revision_ex',
1852
smart_branch.SmartServerBranchRequestSetLastRevisionEx)
1853
self.assertHandlerEqual('Branch.set_parent_location',
1854
smart_branch.SmartServerBranchRequestSetParentLocation)
1855
self.assertHandlerEqual('Branch.unlock',
1856
smart_branch.SmartServerBranchRequestUnlock)
1857
self.assertHandlerEqual('BzrDir.find_repository',
1858
smart_dir.SmartServerRequestFindRepositoryV1)
1859
self.assertHandlerEqual('BzrDir.find_repositoryV2',
1860
smart_dir.SmartServerRequestFindRepositoryV2)
1861
self.assertHandlerEqual('BzrDirFormat.initialize',
1862
smart_dir.SmartServerRequestInitializeBzrDir)
1863
self.assertHandlerEqual('BzrDirFormat.initialize_ex_1.16',
1864
smart_dir.SmartServerRequestBzrDirInitializeEx)
1865
self.assertHandlerEqual('BzrDir.cloning_metadir',
1866
smart_dir.SmartServerBzrDirRequestCloningMetaDir)
1867
self.assertHandlerEqual('BzrDir.get_config_file',
1868
smart_dir.SmartServerBzrDirRequestConfigFile)
1869
self.assertHandlerEqual('BzrDir.open_branch',
1870
smart_dir.SmartServerRequestOpenBranch)
1871
self.assertHandlerEqual('BzrDir.open_branchV2',
1872
smart_dir.SmartServerRequestOpenBranchV2)
1873
self.assertHandlerEqual('BzrDir.open_branchV3',
1874
smart_dir.SmartServerRequestOpenBranchV3)
1875
self.assertHandlerEqual('PackRepository.autopack',
1876
smart_packrepo.SmartServerPackRepositoryAutopack)
1877
self.assertHandlerEqual('Repository.gather_stats',
1878
smart_repo.SmartServerRepositoryGatherStats)
1879
self.assertHandlerEqual('Repository.get_parent_map',
1880
smart_repo.SmartServerRepositoryGetParentMap)
1881
self.assertHandlerEqual('Repository.get_rev_id_for_revno',
1882
smart_repo.SmartServerRepositoryGetRevIdForRevno)
1883
self.assertHandlerEqual('Repository.get_revision_graph',
1884
smart_repo.SmartServerRepositoryGetRevisionGraph)
1885
self.assertHandlerEqual('Repository.get_stream',
1886
smart_repo.SmartServerRepositoryGetStream)
1887
self.assertHandlerEqual('Repository.has_revision',
1888
smart_repo.SmartServerRequestHasRevision)
1889
self.assertHandlerEqual('Repository.insert_stream',
1890
smart_repo.SmartServerRepositoryInsertStream)
1891
self.assertHandlerEqual('Repository.insert_stream_locked',
1892
smart_repo.SmartServerRepositoryInsertStreamLocked)
1893
self.assertHandlerEqual('Repository.is_shared',
1894
smart_repo.SmartServerRepositoryIsShared)
1895
self.assertHandlerEqual('Repository.lock_write',
1896
smart_repo.SmartServerRepositoryLockWrite)
1897
self.assertHandlerEqual('Repository.tarball',
1898
smart_repo.SmartServerRepositoryTarball)
1899
self.assertHandlerEqual('Repository.unlock',
1900
smart_repo.SmartServerRepositoryUnlock)
1901
self.assertHandlerEqual('Transport.is_readonly',
1902
smart_req.SmartServerIsReadonly)
724
smart.request.request_handlers.get('Branch.get_config_file'),
725
smart.branch.SmartServerBranchGetConfigFile)
727
smart.request.request_handlers.get('Branch.lock_write'),
728
smart.branch.SmartServerBranchRequestLockWrite)
730
smart.request.request_handlers.get('Branch.last_revision_info'),
731
smart.branch.SmartServerBranchRequestLastRevisionInfo)
733
smart.request.request_handlers.get('Branch.revision_history'),
734
smart.branch.SmartServerRequestRevisionHistory)
736
smart.request.request_handlers.get('Branch.set_last_revision'),
737
smart.branch.SmartServerBranchRequestSetLastRevision)
739
smart.request.request_handlers.get('Branch.unlock'),
740
smart.branch.SmartServerBranchRequestUnlock)
742
smart.request.request_handlers.get('BzrDir.find_repository'),
743
smart.bzrdir.SmartServerRequestFindRepository)
745
smart.request.request_handlers.get('BzrDirFormat.initialize'),
746
smart.bzrdir.SmartServerRequestInitializeBzrDir)
748
smart.request.request_handlers.get('BzrDir.open_branch'),
749
smart.bzrdir.SmartServerRequestOpenBranch)
751
smart.request.request_handlers.get('Repository.gather_stats'),
752
smart.repository.SmartServerRepositoryGatherStats)
754
smart.request.request_handlers.get('Repository.get_revision_graph'),
755
smart.repository.SmartServerRepositoryGetRevisionGraph)
757
smart.request.request_handlers.get('Repository.has_revision'),
758
smart.repository.SmartServerRequestHasRevision)
760
smart.request.request_handlers.get('Repository.is_shared'),
761
smart.repository.SmartServerRepositoryIsShared)
763
smart.request.request_handlers.get('Repository.lock_write'),
764
smart.repository.SmartServerRepositoryLockWrite)
766
smart.request.request_handlers.get('Repository.unlock'),
767
smart.repository.SmartServerRepositoryUnlock)
769
smart.request.request_handlers.get('Transport.is_readonly'),
770
smart.request.SmartServerIsReadonly)
added
removed
bzrlib/tests/test_smart.py
