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