~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart.py

NEWS section template into a separate file

Show diffs side-by-side

added added

removed removed

Lines of Context:
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Tests for the smart wire/domain protocol.
18
18
 
29
29
import tarfile
30
30
 
31
31
from bzrlib import (
 
32
    bencode,
32
33
    bzrdir,
33
34
    errors,
34
35
    pack,
35
36
    smart,
36
37
    tests,
37
38
    urlutils,
 
39
    versionedfile,
38
40
    )
39
 
from bzrlib.branch import BranchReferenceFormat
 
41
from bzrlib.branch import Branch, BranchReferenceFormat
40
42
import bzrlib.smart.branch
41
 
import bzrlib.smart.bzrdir
 
43
import bzrlib.smart.bzrdir, bzrlib.smart.bzrdir as smart_dir
 
44
import bzrlib.smart.packrepository
42
45
import bzrlib.smart.repository
43
46
from bzrlib.smart.request import (
44
47
    FailedSmartServerResponse,
47
50
    SuccessfulSmartServerResponse,
48
51
    )
49
52
from bzrlib.tests import (
50
 
    iter_suite_tests,
51
53
    split_suite_by_re,
52
 
    TestScenarioApplier,
53
54
    )
54
55
from bzrlib.transport import chroot, get_transport
55
 
from bzrlib.util import bencode
56
56
 
57
57
 
58
58
def load_tests(standard_tests, module, loader):
59
59
    """Multiply tests version and protocol consistency."""
60
60
    # FindRepository tests.
61
61
    bzrdir_mod = bzrlib.smart.bzrdir
62
 
    applier = TestScenarioApplier()
63
 
    applier.scenarios = [
 
62
    scenarios = [
64
63
        ("find_repository", {
65
64
            "_request_class":bzrdir_mod.SmartServerRequestFindRepositoryV1}),
66
65
        ("find_repositoryV2", {
67
66
            "_request_class":bzrdir_mod.SmartServerRequestFindRepositoryV2}),
 
67
        ("find_repositoryV3", {
 
68
            "_request_class":bzrdir_mod.SmartServerRequestFindRepositoryV3}),
68
69
        ]
69
70
    to_adapt, result = split_suite_by_re(standard_tests,
70
71
        "TestSmartServerRequestFindRepository")
71
72
    v2_only, v1_and_2 = split_suite_by_re(to_adapt,
72
73
        "_v2")
73
 
    for test in iter_suite_tests(v1_and_2):
74
 
        result.addTests(applier.adapt(test))
75
 
    del applier.scenarios[0]
76
 
    for test in iter_suite_tests(v2_only):
77
 
        result.addTests(applier.adapt(test))
 
74
    tests.multiply_tests(v1_and_2, scenarios, result)
 
75
    # The first scenario is only applicable to v1 protocols, it is deleted
 
76
    # since.
 
77
    tests.multiply_tests(v2_only, scenarios[1:], result)
78
78
    return result
79
79
 
80
80
 
114
114
        return self.get_transport().get_smart_medium()
115
115
 
116
116
 
 
117
class TestByteStreamToStream(tests.TestCase):
 
118
 
 
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.repository._stream_to_byte_stream(stream, fmt)
 
126
        streams = []
 
127
        # Iterate the resulting iterable; checking that we get only one stream
 
128
        # out.
 
129
        fmt, stream = smart.repository._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])
 
134
 
 
135
 
117
136
class TestSmartServerResponse(tests.TestCase):
118
137
 
119
138
    def test__eq__(self):
131
150
    def test__str__(self):
132
151
        """SmartServerResponses can be stringified."""
133
152
        self.assertEqual(
134
 
            "<SmartServerResponse status=OK args=('args',) body='body'>",
 
153
            "<SuccessfulSmartServerResponse args=('args',) body='body'>",
135
154
            str(SuccessfulSmartServerResponse(('args',), 'body')))
136
155
        self.assertEqual(
137
 
            "<SmartServerResponse status=ERR args=('args',) body='body'>",
 
156
            "<FailedSmartServerResponse args=('args',) body='body'>",
138
157
            str(FailedSmartServerResponse(('args',), 'body')))
139
158
 
140
159
 
160
179
            request.transport_from_client_path('foo/').base)
161
180
 
162
181
 
 
182
class TestSmartServerBzrDirRequestCloningMetaDir(
 
183
    tests.TestCaseWithMemoryTransport):
 
184
    """Tests for BzrDir.cloning_metadir."""
 
185
 
 
186
    def test_cloning_metadir(self):
 
187
        """When there is a bzrdir present, the call succeeds."""
 
188
        backing = self.get_transport()
 
189
        dir = self.make_bzrdir('.')
 
190
        local_result = dir.cloning_metadir()
 
191
        request_class = smart_dir.SmartServerBzrDirRequestCloningMetaDir
 
192
        request = request_class(backing)
 
193
        expected = SuccessfulSmartServerResponse(
 
194
            (local_result.network_name(),
 
195
            local_result.repository_format.network_name(),
 
196
            ('branch', local_result.get_branch_format().network_name())))
 
197
        self.assertEqual(expected, request.execute('', 'False'))
 
198
 
 
199
    def test_cloning_metadir_reference(self):
 
200
        """The request fails when bzrdir contains a branch reference."""
 
201
        backing = self.get_transport()
 
202
        referenced_branch = self.make_branch('referenced')
 
203
        dir = self.make_bzrdir('.')
 
204
        local_result = dir.cloning_metadir()
 
205
        reference = BranchReferenceFormat().initialize(dir, referenced_branch)
 
206
        reference_url = BranchReferenceFormat().get_reference(dir)
 
207
        # The server shouldn't try to follow the branch reference, so it's fine
 
208
        # if the referenced branch isn't reachable.
 
209
        backing.rename('referenced', 'moved')
 
210
        request_class = smart_dir.SmartServerBzrDirRequestCloningMetaDir
 
211
        request = request_class(backing)
 
212
        expected = FailedSmartServerResponse(('BranchReference',))
 
213
        self.assertEqual(expected, request.execute('', 'False'))
 
214
 
 
215
 
 
216
class TestSmartServerRequestCreateRepository(tests.TestCaseWithMemoryTransport):
 
217
    """Tests for BzrDir.create_repository."""
 
218
 
 
219
    def test_makes_repository(self):
 
220
        """When there is a bzrdir present, the call succeeds."""
 
221
        backing = self.get_transport()
 
222
        self.make_bzrdir('.')
 
223
        request_class = bzrlib.smart.bzrdir.SmartServerRequestCreateRepository
 
224
        request = request_class(backing)
 
225
        reference_bzrdir_format = bzrdir.format_registry.get('pack-0.92')()
 
226
        reference_format = reference_bzrdir_format.repository_format
 
227
        network_name = reference_format.network_name()
 
228
        expected = SuccessfulSmartServerResponse(
 
229
            ('ok', 'no', 'no', 'no', network_name))
 
230
        self.assertEqual(expected, request.execute('', network_name, 'True'))
 
231
 
 
232
 
163
233
class TestSmartServerRequestFindRepository(tests.TestCaseWithMemoryTransport):
164
234
    """Tests for BzrDir.find_repository."""
165
235
 
172
242
            request.execute(''))
173
243
 
174
244
    def test_nonshared_repository(self):
175
 
        # nonshared repositorys only allow 'find' to return a handle when the 
176
 
        # path the repository is being searched on is the same as that that 
 
245
        # nonshared repositorys only allow 'find' to return a handle when the
 
246
        # path the repository is being searched on is the same as that that
177
247
        # the repository is at.
178
248
        backing = self.get_transport()
179
249
        request = self._request_class(backing)
197
267
            subtrees = 'yes'
198
268
        else:
199
269
            subtrees = 'no'
200
 
        if (smart.bzrdir.SmartServerRequestFindRepositoryV2 ==
 
270
        if repo._format.supports_external_lookups:
 
271
            external = 'yes'
 
272
        else:
 
273
            external = 'no'
 
274
        if (smart.bzrdir.SmartServerRequestFindRepositoryV3 ==
 
275
            self._request_class):
 
276
            return SuccessfulSmartServerResponse(
 
277
                ('ok', '', rich_root, subtrees, external,
 
278
                 repo._format.network_name()))
 
279
        elif (smart.bzrdir.SmartServerRequestFindRepositoryV2 ==
201
280
            self._request_class):
202
281
            # All tests so far are on formats, and for non-external
203
282
            # repositories.
204
283
            return SuccessfulSmartServerResponse(
205
 
                ('ok', '', rich_root, subtrees, 'no'))
 
284
                ('ok', '', rich_root, subtrees, external))
206
285
        else:
207
286
            return SuccessfulSmartServerResponse(('ok', '', rich_root, subtrees))
208
287
 
241
320
        self.assertEqual(result, request.execute(''))
242
321
 
243
322
 
 
323
class TestSmartServerBzrDirRequestGetConfigFile(
 
324
    tests.TestCaseWithMemoryTransport):
 
325
    """Tests for BzrDir.get_config_file."""
 
326
 
 
327
    def test_present(self):
 
328
        backing = self.get_transport()
 
329
        dir = self.make_bzrdir('.')
 
330
        dir.get_config().set_default_stack_on("/")
 
331
        local_result = dir._get_config()._get_config_file().read()
 
332
        request_class = smart_dir.SmartServerBzrDirRequestConfigFile
 
333
        request = request_class(backing)
 
334
        expected = SuccessfulSmartServerResponse((), local_result)
 
335
        self.assertEqual(expected, request.execute(''))
 
336
 
 
337
    def test_missing(self):
 
338
        backing = self.get_transport()
 
339
        dir = self.make_bzrdir('.')
 
340
        request_class = smart_dir.SmartServerBzrDirRequestConfigFile
 
341
        request = request_class(backing)
 
342
        expected = SuccessfulSmartServerResponse((), '')
 
343
        self.assertEqual(expected, request.execute(''))
 
344
 
 
345
 
244
346
class TestSmartServerRequestInitializeBzrDir(tests.TestCaseWithMemoryTransport):
245
347
 
246
348
    def test_empty_dir(self):
250
352
        self.assertEqual(SmartServerResponse(('ok', )),
251
353
            request.execute(''))
252
354
        made_dir = bzrdir.BzrDir.open_from_transport(backing)
253
 
        # no branch, tree or repository is expected with the current 
 
355
        # no branch, tree or repository is expected with the current
254
356
        # default formart.
255
357
        self.assertRaises(errors.NoWorkingTree, made_dir.open_workingtree)
256
358
        self.assertRaises(errors.NotBranchError, made_dir.open_branch)
272
374
            request.execute, 'subdir')
273
375
 
274
376
 
 
377
class TestSmartServerRequestBzrDirInitializeEx(tests.TestCaseWithMemoryTransport):
 
378
    """Basic tests for BzrDir.initialize_ex_1.16 in the smart server.
 
379
 
 
380
    The main unit tests in test_bzrdir exercise the API comprehensively.
 
381
    """
 
382
 
 
383
    def test_empty_dir(self):
 
384
        """Initializing an empty dir should succeed and do it."""
 
385
        backing = self.get_transport()
 
386
        name = self.make_bzrdir('reference')._format.network_name()
 
387
        request = smart.bzrdir.SmartServerRequestBzrDirInitializeEx(backing)
 
388
        self.assertEqual(SmartServerResponse(('', '', '', '', '', '', name,
 
389
            'False', '', '', '')),
 
390
            request.execute(name, '', 'True', 'False', 'False', '', '', '', '',
 
391
            'False'))
 
392
        made_dir = bzrdir.BzrDir.open_from_transport(backing)
 
393
        # no branch, tree or repository is expected with the current
 
394
        # default format.
 
395
        self.assertRaises(errors.NoWorkingTree, made_dir.open_workingtree)
 
396
        self.assertRaises(errors.NotBranchError, made_dir.open_branch)
 
397
        self.assertRaises(errors.NoRepositoryPresent, made_dir.open_repository)
 
398
 
 
399
    def test_missing_dir(self):
 
400
        """Initializing a missing directory should fail like the bzrdir api."""
 
401
        backing = self.get_transport()
 
402
        name = self.make_bzrdir('reference')._format.network_name()
 
403
        request = smart.bzrdir.SmartServerRequestBzrDirInitializeEx(backing)
 
404
        self.assertRaises(errors.NoSuchFile, request.execute, name,
 
405
            'subdir/dir', 'False', 'False', 'False', '', '', '', '', 'False')
 
406
 
 
407
    def test_initialized_dir(self):
 
408
        """Initializing an extant directory should fail like the bzrdir api."""
 
409
        backing = self.get_transport()
 
410
        name = self.make_bzrdir('reference')._format.network_name()
 
411
        request = smart.bzrdir.SmartServerRequestBzrDirInitializeEx(backing)
 
412
        self.make_bzrdir('subdir')
 
413
        self.assertRaises(errors.FileExists, request.execute, name, 'subdir',
 
414
            'False', 'False', 'False', '', '', '', '', 'False')
 
415
 
 
416
 
275
417
class TestSmartServerRequestOpenBranch(TestCaseWithChrootedTransport):
276
418
 
277
419
    def test_no_branch(self):
302
444
            request.execute('reference'))
303
445
 
304
446
 
 
447
class TestSmartServerRequestOpenBranchV2(TestCaseWithChrootedTransport):
 
448
 
 
449
    def test_no_branch(self):
 
450
        """When there is no branch, ('nobranch', ) is returned."""
 
451
        backing = self.get_transport()
 
452
        self.make_bzrdir('.')
 
453
        request = smart.bzrdir.SmartServerRequestOpenBranchV2(backing)
 
454
        self.assertEqual(SmartServerResponse(('nobranch', )),
 
455
            request.execute(''))
 
456
 
 
457
    def test_branch(self):
 
458
        """When there is a branch, 'ok' is returned."""
 
459
        backing = self.get_transport()
 
460
        expected = self.make_branch('.')._format.network_name()
 
461
        request = smart.bzrdir.SmartServerRequestOpenBranchV2(backing)
 
462
        self.assertEqual(SuccessfulSmartServerResponse(('branch', expected)),
 
463
            request.execute(''))
 
464
 
 
465
    def test_branch_reference(self):
 
466
        """When there is a branch reference, the reference URL is returned."""
 
467
        backing = self.get_transport()
 
468
        request = smart.bzrdir.SmartServerRequestOpenBranchV2(backing)
 
469
        branch = self.make_branch('branch')
 
470
        checkout = branch.create_checkout('reference',lightweight=True)
 
471
        reference_url = BranchReferenceFormat().get_reference(checkout.bzrdir)
 
472
        self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
 
473
        self.assertEqual(SuccessfulSmartServerResponse(('ref', reference_url)),
 
474
            request.execute('reference'))
 
475
 
 
476
    def test_stacked_branch(self):
 
477
        """Opening a stacked branch does not open the stacked-on branch."""
 
478
        trunk = self.make_branch('trunk')
 
479
        feature = self.make_branch('feature')
 
480
        feature.set_stacked_on_url(trunk.base)
 
481
        opened_branches = []
 
482
        Branch.hooks.install_named_hook('open', opened_branches.append, None)
 
483
        backing = self.get_transport()
 
484
        request = smart.bzrdir.SmartServerRequestOpenBranchV2(backing)
 
485
        request.setup_jail()
 
486
        try:
 
487
            response = request.execute('feature')
 
488
        finally:
 
489
            request.teardown_jail()
 
490
        expected_format = feature._format.network_name()
 
491
        self.assertEqual(
 
492
            SuccessfulSmartServerResponse(('branch', expected_format)),
 
493
            response)
 
494
        self.assertLength(1, opened_branches)
 
495
 
 
496
 
305
497
class TestSmartServerRequestRevisionHistory(tests.TestCaseWithMemoryTransport):
306
498
 
307
499
    def test_empty(self):
388
580
    def test_with_content(self):
389
581
        # SmartServerBranchGetConfigFile should return the content from
390
582
        # branch.control_files.get('branch.conf') for now - in the future it may
391
 
        # perform more complex processing. 
 
583
        # perform more complex processing.
392
584
        backing = self.get_transport()
393
585
        request = smart.branch.SmartServerBranchGetConfigFile(backing)
394
586
        branch = self.make_branch('.')
397
589
            request.execute(''))
398
590
 
399
591
 
400
 
class SetLastRevisionTestBase(tests.TestCaseWithMemoryTransport):
 
592
class TestLockedBranch(tests.TestCaseWithMemoryTransport):
 
593
 
 
594
    def get_lock_tokens(self, branch):
 
595
        branch_token = branch.lock_write()
 
596
        repo_token = branch.repository.lock_write()
 
597
        branch.repository.unlock()
 
598
        return branch_token, repo_token
 
599
 
 
600
 
 
601
class TestSmartServerBranchRequestSetConfigOption(TestLockedBranch):
 
602
 
 
603
    def test_value_name(self):
 
604
        branch = self.make_branch('.')
 
605
        request = smart.branch.SmartServerBranchRequestSetConfigOption(
 
606
            branch.bzrdir.root_transport)
 
607
        branch_token, repo_token = self.get_lock_tokens(branch)
 
608
        config = branch._get_config()
 
609
        result = request.execute('', branch_token, repo_token, 'bar', 'foo',
 
610
            '')
 
611
        self.assertEqual(SuccessfulSmartServerResponse(()), result)
 
612
        self.assertEqual('bar', config.get_option('foo'))
 
613
        # Cleanup
 
614
        branch.unlock()
 
615
 
 
616
    def test_value_name_section(self):
 
617
        branch = self.make_branch('.')
 
618
        request = smart.branch.SmartServerBranchRequestSetConfigOption(
 
619
            branch.bzrdir.root_transport)
 
620
        branch_token, repo_token = self.get_lock_tokens(branch)
 
621
        config = branch._get_config()
 
622
        result = request.execute('', branch_token, repo_token, 'bar', 'foo',
 
623
            'gam')
 
624
        self.assertEqual(SuccessfulSmartServerResponse(()), result)
 
625
        self.assertEqual('bar', config.get_option('foo', 'gam'))
 
626
        # Cleanup
 
627
        branch.unlock()
 
628
 
 
629
 
 
630
class TestSmartServerBranchRequestSetTagsBytes(TestLockedBranch):
 
631
    # Only called when the branch format and tags match [yay factory
 
632
    # methods] so only need to test straight forward cases.
 
633
 
 
634
    def test_set_bytes(self):
 
635
        base_branch = self.make_branch('base')
 
636
        tag_bytes = base_branch._get_tags_bytes()
 
637
        # get_lock_tokens takes out a lock.
 
638
        branch_token, repo_token = self.get_lock_tokens(base_branch)
 
639
        request = smart.branch.SmartServerBranchSetTagsBytes(
 
640
            self.get_transport())
 
641
        response = request.execute('base', branch_token, repo_token)
 
642
        self.assertEqual(None, response)
 
643
        response = request.do_chunk(tag_bytes)
 
644
        self.assertEqual(None, response)
 
645
        response = request.do_end()
 
646
        self.assertEquals(
 
647
            SuccessfulSmartServerResponse(()), response)
 
648
        base_branch.unlock()
 
649
 
 
650
    def test_lock_failed(self):
 
651
        base_branch = self.make_branch('base')
 
652
        base_branch.lock_write()
 
653
        tag_bytes = base_branch._get_tags_bytes()
 
654
        request = smart.branch.SmartServerBranchSetTagsBytes(
 
655
            self.get_transport())
 
656
        self.assertRaises(errors.TokenMismatch, request.execute,
 
657
            'base', 'wrong token', 'wrong token')
 
658
        # The request handler will keep processing the message parts, so even
 
659
        # if the request fails immediately do_chunk and do_end are still
 
660
        # called.
 
661
        request.do_chunk(tag_bytes)
 
662
        request.do_end()
 
663
        base_branch.unlock()
 
664
 
 
665
 
 
666
 
 
667
class SetLastRevisionTestBase(TestLockedBranch):
401
668
    """Base test case for verbs that implement set_last_revision."""
402
669
 
403
670
    def setUp(self):
407
674
        self.tree = self.make_branch_and_memory_tree('.')
408
675
 
409
676
    def lock_branch(self):
410
 
        b = self.tree.branch
411
 
        branch_token = b.lock_write()
412
 
        repo_token = b.repository.lock_write()
413
 
        b.repository.unlock()
414
 
        return branch_token, repo_token
 
677
        return self.get_lock_tokens(self.tree.branch)
415
678
 
416
679
    def unlock_branch(self):
417
680
        self.tree.branch.unlock()
418
 
        
 
681
 
419
682
    def set_last_revision(self, revision_id, revno):
420
683
        branch_token, repo_token = self.lock_branch()
421
684
        response = self._set_last_revision(
427
690
        response = self.set_last_revision(revision_id, revno)
428
691
        self.assertEqual(SuccessfulSmartServerResponse(('ok',)), response)
429
692
 
430
 
        
 
693
 
431
694
class TestSetLastRevisionVerbMixin(object):
432
695
    """Mixin test case for verbs that implement set_last_revision."""
433
696
 
480
743
        self.assertEqual(
481
744
            (1, rev_id_utf8), self.tree.branch.last_revision_info())
482
745
 
 
746
    def test_TipChangeRejected(self):
 
747
        """If a pre_change_branch_tip hook raises TipChangeRejected, the verb
 
748
        returns TipChangeRejected.
 
749
        """
 
750
        rejection_message = u'rejection message\N{INTERROBANG}'
 
751
        def hook_that_rejects(params):
 
752
            raise errors.TipChangeRejected(rejection_message)
 
753
        Branch.hooks.install_named_hook(
 
754
            'pre_change_branch_tip', hook_that_rejects, None)
 
755
        self.assertEqual(
 
756
            FailedSmartServerResponse(
 
757
                ('TipChangeRejected', rejection_message.encode('utf-8'))),
 
758
            self.set_last_revision('null:', 0))
 
759
 
483
760
 
484
761
class TestSmartServerBranchRequestSetLastRevision(
485
762
        SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
524
801
        self.assertEqual(
525
802
            SuccessfulSmartServerResponse(('ok', revno, revision_id)),
526
803
            response)
527
 
        
 
804
 
528
805
    def test_branch_last_revision_info_rewind(self):
529
806
        """A branch's tip can be set to a revision that is an ancestor of the
530
807
        current tip, but only if allow_overwrite_descendant is passed.
573
850
        # child-1.
574
851
        new_r2 = self.tree.commit('2nd commit', rev_id='child-2')
575
852
        self.tree.unlock()
576
 
        
 
853
 
577
854
    def test_not_allow_diverged(self):
578
855
        """If allow_diverged is not passed, then setting a divergent history
579
856
        returns a Diverged error.
601
878
        self.assertEqual('child-1', self.tree.branch.last_revision())
602
879
 
603
880
 
 
881
class TestSmartServerBranchRequestGetParent(tests.TestCaseWithMemoryTransport):
 
882
 
 
883
    def test_get_parent_none(self):
 
884
        base_branch = self.make_branch('base')
 
885
        request = smart.branch.SmartServerBranchGetParent(self.get_transport())
 
886
        response = request.execute('base')
 
887
        self.assertEquals(
 
888
            SuccessfulSmartServerResponse(('',)), response)
 
889
 
 
890
    def test_get_parent_something(self):
 
891
        base_branch = self.make_branch('base')
 
892
        base_branch.set_parent(self.get_url('foo'))
 
893
        request = smart.branch.SmartServerBranchGetParent(self.get_transport())
 
894
        response = request.execute('base')
 
895
        self.assertEquals(
 
896
            SuccessfulSmartServerResponse(("../foo",)),
 
897
            response)
 
898
 
 
899
 
 
900
class TestSmartServerBranchRequestSetParent(tests.TestCaseWithMemoryTransport):
 
901
 
 
902
    def test_set_parent_none(self):
 
903
        branch = self.make_branch('base', format="1.9")
 
904
        branch.lock_write()
 
905
        branch._set_parent_location('foo')
 
906
        branch.unlock()
 
907
        request = smart.branch.SmartServerBranchRequestSetParentLocation(
 
908
            self.get_transport())
 
909
        branch_token = branch.lock_write()
 
910
        repo_token = branch.repository.lock_write()
 
911
        try:
 
912
            response = request.execute('base', branch_token, repo_token, '')
 
913
        finally:
 
914
            branch.repository.unlock()
 
915
            branch.unlock()
 
916
        self.assertEqual(SuccessfulSmartServerResponse(()), response)
 
917
        self.assertEqual(None, branch.get_parent())
 
918
 
 
919
    def test_set_parent_something(self):
 
920
        branch = self.make_branch('base', format="1.9")
 
921
        request = smart.branch.SmartServerBranchRequestSetParentLocation(
 
922
            self.get_transport())
 
923
        branch_token = branch.lock_write()
 
924
        repo_token = branch.repository.lock_write()
 
925
        try:
 
926
            response = request.execute('base', branch_token, repo_token,
 
927
            'http://bar/')
 
928
        finally:
 
929
            branch.repository.unlock()
 
930
            branch.unlock()
 
931
        self.assertEqual(SuccessfulSmartServerResponse(()), response)
 
932
        self.assertEqual('http://bar/', branch.get_parent())
 
933
 
 
934
 
 
935
class TestSmartServerBranchRequestGetTagsBytes(tests.TestCaseWithMemoryTransport):
 
936
    # Only called when the branch format and tags match [yay factory
 
937
    # methods] so only need to test straight forward cases.
 
938
 
 
939
    def test_get_bytes(self):
 
940
        base_branch = self.make_branch('base')
 
941
        request = smart.branch.SmartServerBranchGetTagsBytes(
 
942
            self.get_transport())
 
943
        response = request.execute('base')
 
944
        self.assertEquals(
 
945
            SuccessfulSmartServerResponse(('',)), response)
 
946
 
 
947
 
 
948
class TestSmartServerBranchRequestGetStackedOnURL(tests.TestCaseWithMemoryTransport):
 
949
 
 
950
    def test_get_stacked_on_url(self):
 
951
        base_branch = self.make_branch('base', format='1.6')
 
952
        stacked_branch = self.make_branch('stacked', format='1.6')
 
953
        # typically should be relative
 
954
        stacked_branch.set_stacked_on_url('../base')
 
955
        request = smart.branch.SmartServerBranchRequestGetStackedOnURL(
 
956
            self.get_transport())
 
957
        response = request.execute('stacked')
 
958
        self.assertEquals(
 
959
            SmartServerResponse(('ok', '../base')),
 
960
            response)
 
961
 
 
962
 
604
963
class TestSmartServerBranchRequestLockWrite(tests.TestCaseWithMemoryTransport):
605
964
 
606
965
    def setUp(self):
621
980
        # with a new branch object.
622
981
        new_branch = repository.bzrdir.open_branch()
623
982
        self.assertRaises(errors.LockContention, new_branch.lock_write)
 
983
        # Cleanup
 
984
        request = smart.branch.SmartServerBranchRequestUnlock(backing)
 
985
        response = request.execute('', branch_nonce, repository_nonce)
624
986
 
625
987
    def test_lock_write_on_locked_branch(self):
626
988
        backing = self.get_transport()
627
989
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
628
990
        branch = self.make_branch('.')
629
 
        branch.lock_write()
 
991
        branch_token = branch.lock_write()
630
992
        branch.leave_lock_in_place()
631
993
        branch.unlock()
632
994
        response = request.execute('')
633
995
        self.assertEqual(
634
996
            SmartServerResponse(('LockContention',)), response)
 
997
        # Cleanup
 
998
        branch.lock_write(branch_token)
 
999
        branch.dont_leave_lock_in_place()
 
1000
        branch.unlock()
635
1001
 
636
1002
    def test_lock_write_with_tokens_on_locked_branch(self):
637
1003
        backing = self.get_transport()
647
1013
                                   branch_token, repo_token)
648
1014
        self.assertEqual(
649
1015
            SmartServerResponse(('ok', branch_token, repo_token)), response)
 
1016
        # Cleanup
 
1017
        branch.repository.lock_write(repo_token)
 
1018
        branch.repository.dont_leave_lock_in_place()
 
1019
        branch.repository.unlock()
 
1020
        branch.lock_write(branch_token)
 
1021
        branch.dont_leave_lock_in_place()
 
1022
        branch.unlock()
650
1023
 
651
1024
    def test_lock_write_with_mismatched_tokens_on_locked_branch(self):
652
1025
        backing = self.get_transport()
662
1035
                                   branch_token+'xxx', repo_token)
663
1036
        self.assertEqual(
664
1037
            SmartServerResponse(('TokenMismatch',)), response)
 
1038
        # Cleanup
 
1039
        branch.repository.lock_write(repo_token)
 
1040
        branch.repository.dont_leave_lock_in_place()
 
1041
        branch.repository.unlock()
 
1042
        branch.lock_write(branch_token)
 
1043
        branch.dont_leave_lock_in_place()
 
1044
        branch.unlock()
665
1045
 
666
1046
    def test_lock_write_on_locked_repo(self):
667
1047
        backing = self.get_transport()
668
1048
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
669
1049
        branch = self.make_branch('.', format='knit')
670
 
        branch.repository.lock_write()
671
 
        branch.repository.leave_lock_in_place()
672
 
        branch.repository.unlock()
 
1050
        repo = branch.repository
 
1051
        repo_token = repo.lock_write()
 
1052
        repo.leave_lock_in_place()
 
1053
        repo.unlock()
673
1054
        response = request.execute('')
674
1055
        self.assertEqual(
675
1056
            SmartServerResponse(('LockContention',)), response)
 
1057
        # Cleanup
 
1058
        repo.lock_write(repo_token)
 
1059
        repo.dont_leave_lock_in_place()
 
1060
        repo.unlock()
676
1061
 
677
1062
    def test_lock_write_on_readonly_transport(self):
678
1063
        backing = self.get_readonly_transport()
737
1122
            '', 'branch token', repo_token)
738
1123
        self.assertEqual(
739
1124
            SmartServerResponse(('TokenMismatch',)), response)
 
1125
        # Cleanup
 
1126
        branch.repository.lock_write(repo_token)
 
1127
        branch.repository.dont_leave_lock_in_place()
 
1128
        branch.repository.unlock()
740
1129
 
741
1130
 
742
1131
class TestSmartServerRepositoryRequest(tests.TestCaseWithMemoryTransport):
765
1154
 
766
1155
        self.assertEqual(None,
767
1156
            request.execute('', 'missing-id'))
768
 
        # Note that it returns a body (of '' bzipped).
 
1157
        # Note that it returns a body that is bzipped.
769
1158
        self.assertEqual(
770
1159
            SuccessfulSmartServerResponse(('ok', ), bz2.compress('')),
771
1160
            request.do_body('\n\n0\n'))
772
1161
 
 
1162
    def test_trivial_include_missing(self):
 
1163
        backing = self.get_transport()
 
1164
        request = smart.repository.SmartServerRepositoryGetParentMap(backing)
 
1165
        tree = self.make_branch_and_memory_tree('.')
 
1166
 
 
1167
        self.assertEqual(None,
 
1168
            request.execute('', 'missing-id', 'include-missing:'))
 
1169
        self.assertEqual(
 
1170
            SuccessfulSmartServerResponse(('ok', ),
 
1171
                bz2.compress('missing:missing-id')),
 
1172
            request.do_body('\n\n0\n'))
 
1173
 
773
1174
 
774
1175
class TestSmartServerRepositoryGetRevisionGraph(tests.TestCaseWithMemoryTransport):
775
1176
 
805
1206
 
806
1207
        self.assertEqual(SmartServerResponse(('ok', ), rev_id_utf8),
807
1208
            request.execute('', rev_id_utf8))
808
 
    
 
1209
 
809
1210
    def test_no_such_revision(self):
810
1211
        backing = self.get_transport()
811
1212
        request = smart.repository.SmartServerRepositoryGetRevisionGraph(backing)
821
1222
            request.execute('', 'missingrevision'))
822
1223
 
823
1224
 
 
1225
class TestSmartServerRepositoryGetRevIdForRevno(tests.TestCaseWithMemoryTransport):
 
1226
 
 
1227
    def test_revno_found(self):
 
1228
        backing = self.get_transport()
 
1229
        request = smart.repository.SmartServerRepositoryGetRevIdForRevno(backing)
 
1230
        tree = self.make_branch_and_memory_tree('.')
 
1231
        tree.lock_write()
 
1232
        tree.add('')
 
1233
        rev1_id_utf8 = u'\xc8'.encode('utf-8')
 
1234
        rev2_id_utf8 = u'\xc9'.encode('utf-8')
 
1235
        tree.commit('1st commit', rev_id=rev1_id_utf8)
 
1236
        tree.commit('2nd commit', rev_id=rev2_id_utf8)
 
1237
        tree.unlock()
 
1238
 
 
1239
        self.assertEqual(SmartServerResponse(('ok', rev1_id_utf8)),
 
1240
            request.execute('', 1, (2, rev2_id_utf8)))
 
1241
 
 
1242
    def test_known_revid_missing(self):
 
1243
        backing = self.get_transport()
 
1244
        request = smart.repository.SmartServerRepositoryGetRevIdForRevno(backing)
 
1245
        repo = self.make_repository('.')
 
1246
        self.assertEqual(
 
1247
            FailedSmartServerResponse(('nosuchrevision', 'ghost')),
 
1248
            request.execute('', 1, (2, 'ghost')))
 
1249
 
 
1250
    def test_history_incomplete(self):
 
1251
        backing = self.get_transport()
 
1252
        request = smart.repository.SmartServerRepositoryGetRevIdForRevno(backing)
 
1253
        parent = self.make_branch_and_memory_tree('parent', format='1.9')
 
1254
        parent.lock_write()
 
1255
        parent.add([''], ['TREE_ROOT'])
 
1256
        r1 = parent.commit(message='first commit')
 
1257
        r2 = parent.commit(message='second commit')
 
1258
        parent.unlock()
 
1259
        local = self.make_branch_and_memory_tree('local', format='1.9')
 
1260
        local.branch.pull(parent.branch)
 
1261
        local.set_parent_ids([r2])
 
1262
        r3 = local.commit(message='local commit')
 
1263
        local.branch.create_clone_on_transport(
 
1264
            self.get_transport('stacked'), stacked_on=self.get_url('parent'))
 
1265
        self.assertEqual(
 
1266
            SmartServerResponse(('history-incomplete', 2, r2)),
 
1267
            request.execute('stacked', 1, (3, r3)))
 
1268
 
 
1269
 
 
1270
class TestSmartServerRepositoryGetStream(tests.TestCaseWithMemoryTransport):
 
1271
 
 
1272
    def make_two_commit_repo(self):
 
1273
        tree = self.make_branch_and_memory_tree('.')
 
1274
        tree.lock_write()
 
1275
        tree.add('')
 
1276
        r1 = tree.commit('1st commit')
 
1277
        r2 = tree.commit('2nd commit', rev_id=u'\xc8'.encode('utf-8'))
 
1278
        tree.unlock()
 
1279
        repo = tree.branch.repository
 
1280
        return repo, r1, r2
 
1281
 
 
1282
    def test_ancestry_of(self):
 
1283
        """The search argument may be a 'ancestry-of' some heads'."""
 
1284
        backing = self.get_transport()
 
1285
        request = smart.repository.SmartServerRepositoryGetStream(backing)
 
1286
        repo, r1, r2 = self.make_two_commit_repo()
 
1287
        fetch_spec = ['ancestry-of', r2]
 
1288
        lines = '\n'.join(fetch_spec)
 
1289
        request.execute('', repo._format.network_name())
 
1290
        response = request.do_body(lines)
 
1291
        self.assertEqual(('ok',), response.args)
 
1292
        stream_bytes = ''.join(response.body_stream)
 
1293
        self.assertStartsWith(stream_bytes, 'Bazaar pack format 1')
 
1294
 
 
1295
    def test_search(self):
 
1296
        """The search argument may be a 'search' of some explicit keys."""
 
1297
        backing = self.get_transport()
 
1298
        request = smart.repository.SmartServerRepositoryGetStream(backing)
 
1299
        repo, r1, r2 = self.make_two_commit_repo()
 
1300
        fetch_spec = ['search', '%s %s' % (r1, r2), 'null:', '2']
 
1301
        lines = '\n'.join(fetch_spec)
 
1302
        request.execute('', repo._format.network_name())
 
1303
        response = request.do_body(lines)
 
1304
        self.assertEqual(('ok',), response.args)
 
1305
        stream_bytes = ''.join(response.body_stream)
 
1306
        self.assertStartsWith(stream_bytes, 'Bazaar pack format 1')
 
1307
 
 
1308
 
824
1309
class TestSmartServerRequestHasRevision(tests.TestCaseWithMemoryTransport):
825
1310
 
826
1311
    def test_missing_revision(self):
926
1411
 
927
1412
class TestSmartServerRepositoryLockWrite(tests.TestCaseWithMemoryTransport):
928
1413
 
929
 
    def setUp(self):
930
 
        tests.TestCaseWithMemoryTransport.setUp(self)
931
 
 
932
1414
    def test_lock_write_on_unlocked_repo(self):
933
1415
        backing = self.get_transport()
934
1416
        request = smart.repository.SmartServerRepositoryLockWrite(backing)
940
1422
        # object.
941
1423
        new_repo = repository.bzrdir.open_repository()
942
1424
        self.assertRaises(errors.LockContention, new_repo.lock_write)
 
1425
        # Cleanup
 
1426
        request = smart.repository.SmartServerRepositoryUnlock(backing)
 
1427
        response = request.execute('', nonce)
943
1428
 
944
1429
    def test_lock_write_on_locked_repo(self):
945
1430
        backing = self.get_transport()
946
1431
        request = smart.repository.SmartServerRepositoryLockWrite(backing)
947
1432
        repository = self.make_repository('.', format='knit')
948
 
        repository.lock_write()
 
1433
        repo_token = repository.lock_write()
949
1434
        repository.leave_lock_in_place()
950
1435
        repository.unlock()
951
1436
        response = request.execute('')
952
1437
        self.assertEqual(
953
1438
            SmartServerResponse(('LockContention',)), response)
 
1439
        # Cleanup
 
1440
        repository.lock_write(repo_token)
 
1441
        repository.dont_leave_lock_in_place()
 
1442
        repository.unlock()
954
1443
 
955
1444
    def test_lock_write_on_readonly_transport(self):
956
1445
        backing = self.get_readonly_transport()
961
1450
        self.assertEqual('LockFailed', response.args[0])
962
1451
 
963
1452
 
 
1453
class TestInsertStreamBase(tests.TestCaseWithMemoryTransport):
 
1454
 
 
1455
    def make_empty_byte_stream(self, repo):
 
1456
        byte_stream = smart.repository._stream_to_byte_stream([], repo._format)
 
1457
        return ''.join(byte_stream)
 
1458
 
 
1459
 
 
1460
class TestSmartServerRepositoryInsertStream(TestInsertStreamBase):
 
1461
 
 
1462
    def test_insert_stream_empty(self):
 
1463
        backing = self.get_transport()
 
1464
        request = smart.repository.SmartServerRepositoryInsertStream(backing)
 
1465
        repository = self.make_repository('.')
 
1466
        response = request.execute('', '')
 
1467
        self.assertEqual(None, response)
 
1468
        response = request.do_chunk(self.make_empty_byte_stream(repository))
 
1469
        self.assertEqual(None, response)
 
1470
        response = request.do_end()
 
1471
        self.assertEqual(SmartServerResponse(('ok', )), response)
 
1472
        
 
1473
 
 
1474
class TestSmartServerRepositoryInsertStreamLocked(TestInsertStreamBase):
 
1475
 
 
1476
    def test_insert_stream_empty(self):
 
1477
        backing = self.get_transport()
 
1478
        request = smart.repository.SmartServerRepositoryInsertStreamLocked(
 
1479
            backing)
 
1480
        repository = self.make_repository('.', format='knit')
 
1481
        lock_token = repository.lock_write()
 
1482
        response = request.execute('', '', lock_token)
 
1483
        self.assertEqual(None, response)
 
1484
        response = request.do_chunk(self.make_empty_byte_stream(repository))
 
1485
        self.assertEqual(None, response)
 
1486
        response = request.do_end()
 
1487
        self.assertEqual(SmartServerResponse(('ok', )), response)
 
1488
        repository.unlock()
 
1489
 
 
1490
    def test_insert_stream_with_wrong_lock_token(self):
 
1491
        backing = self.get_transport()
 
1492
        request = smart.repository.SmartServerRepositoryInsertStreamLocked(
 
1493
            backing)
 
1494
        repository = self.make_repository('.', format='knit')
 
1495
        lock_token = repository.lock_write()
 
1496
        self.assertRaises(
 
1497
            errors.TokenMismatch, request.execute, '', '', 'wrong-token')
 
1498
        repository.unlock()
 
1499
 
 
1500
 
964
1501
class TestSmartServerRepositoryUnlock(tests.TestCaseWithMemoryTransport):
965
1502
 
966
1503
    def setUp(self):
1008
1545
            SmartServerResponse(('yes',)), response)
1009
1546
 
1010
1547
 
 
1548
class TestSmartServerRepositorySetMakeWorkingTrees(tests.TestCaseWithMemoryTransport):
 
1549
 
 
1550
    def test_set_false(self):
 
1551
        backing = self.get_transport()
 
1552
        repo = self.make_repository('.', shared=True)
 
1553
        repo.set_make_working_trees(True)
 
1554
        request_class = smart.repository.SmartServerRepositorySetMakeWorkingTrees
 
1555
        request = request_class(backing)
 
1556
        self.assertEqual(SuccessfulSmartServerResponse(('ok',)),
 
1557
            request.execute('', 'False'))
 
1558
        repo = repo.bzrdir.open_repository()
 
1559
        self.assertFalse(repo.make_working_trees())
 
1560
 
 
1561
    def test_set_true(self):
 
1562
        backing = self.get_transport()
 
1563
        repo = self.make_repository('.', shared=True)
 
1564
        repo.set_make_working_trees(False)
 
1565
        request_class = smart.repository.SmartServerRepositorySetMakeWorkingTrees
 
1566
        request = request_class(backing)
 
1567
        self.assertEqual(SuccessfulSmartServerResponse(('ok',)),
 
1568
            request.execute('', 'True'))
 
1569
        repo = repo.bzrdir.open_repository()
 
1570
        self.assertTrue(repo.make_working_trees())
 
1571
 
 
1572
 
 
1573
class TestSmartServerPackRepositoryAutopack(tests.TestCaseWithTransport):
 
1574
 
 
1575
    def make_repo_needing_autopacking(self, path='.'):
 
1576
        # Make a repo in need of autopacking.
 
1577
        tree = self.make_branch_and_tree('.', format='pack-0.92')
 
1578
        repo = tree.branch.repository
 
1579
        # monkey-patch the pack collection to disable autopacking
 
1580
        repo._pack_collection._max_pack_count = lambda count: count
 
1581
        for x in range(10):
 
1582
            tree.commit('commit %s' % x)
 
1583
        self.assertEqual(10, len(repo._pack_collection.names()))
 
1584
        del repo._pack_collection._max_pack_count
 
1585
        return repo
 
1586
 
 
1587
    def test_autopack_needed(self):
 
1588
        repo = self.make_repo_needing_autopacking()
 
1589
        repo.lock_write()
 
1590
        self.addCleanup(repo.unlock)
 
1591
        backing = self.get_transport()
 
1592
        request = smart.packrepository.SmartServerPackRepositoryAutopack(
 
1593
            backing)
 
1594
        response = request.execute('')
 
1595
        self.assertEqual(SmartServerResponse(('ok',)), response)
 
1596
        repo._pack_collection.reload_pack_names()
 
1597
        self.assertEqual(1, len(repo._pack_collection.names()))
 
1598
 
 
1599
    def test_autopack_not_needed(self):
 
1600
        tree = self.make_branch_and_tree('.', format='pack-0.92')
 
1601
        repo = tree.branch.repository
 
1602
        repo.lock_write()
 
1603
        self.addCleanup(repo.unlock)
 
1604
        for x in range(9):
 
1605
            tree.commit('commit %s' % x)
 
1606
        backing = self.get_transport()
 
1607
        request = smart.packrepository.SmartServerPackRepositoryAutopack(
 
1608
            backing)
 
1609
        response = request.execute('')
 
1610
        self.assertEqual(SmartServerResponse(('ok',)), response)
 
1611
        repo._pack_collection.reload_pack_names()
 
1612
        self.assertEqual(9, len(repo._pack_collection.names()))
 
1613
 
 
1614
    def test_autopack_on_nonpack_format(self):
 
1615
        """A request to autopack a non-pack repo is a no-op."""
 
1616
        repo = self.make_repository('.', format='knit')
 
1617
        backing = self.get_transport()
 
1618
        request = smart.packrepository.SmartServerPackRepositoryAutopack(
 
1619
            backing)
 
1620
        response = request.execute('')
 
1621
        self.assertEqual(SmartServerResponse(('ok',)), response)
 
1622
 
 
1623
 
1011
1624
class TestHandlers(tests.TestCase):
1012
1625
    """Tests for the request.request_handlers object."""
1013
1626
 
1018
1631
        for key, item in smart.request.request_handlers.iteritems():
1019
1632
            pass
1020
1633
 
 
1634
    def assertHandlerEqual(self, verb, handler):
 
1635
        self.assertEqual(smart.request.request_handlers.get(verb), handler)
 
1636
 
1021
1637
    def test_registered_methods(self):
1022
1638
        """Test that known methods are registered to the correct object."""
1023
 
        self.assertEqual(
1024
 
            smart.request.request_handlers.get('Branch.get_config_file'),
 
1639
        self.assertHandlerEqual('Branch.get_config_file',
1025
1640
            smart.branch.SmartServerBranchGetConfigFile)
1026
 
        self.assertEqual(
1027
 
            smart.request.request_handlers.get('Branch.lock_write'),
 
1641
        self.assertHandlerEqual('Branch.get_parent',
 
1642
            smart.branch.SmartServerBranchGetParent)
 
1643
        self.assertHandlerEqual('Branch.get_tags_bytes',
 
1644
            smart.branch.SmartServerBranchGetTagsBytes)
 
1645
        self.assertHandlerEqual('Branch.lock_write',
1028
1646
            smart.branch.SmartServerBranchRequestLockWrite)
1029
 
        self.assertEqual(
1030
 
            smart.request.request_handlers.get('Branch.last_revision_info'),
 
1647
        self.assertHandlerEqual('Branch.last_revision_info',
1031
1648
            smart.branch.SmartServerBranchRequestLastRevisionInfo)
1032
 
        self.assertEqual(
1033
 
            smart.request.request_handlers.get('Branch.revision_history'),
 
1649
        self.assertHandlerEqual('Branch.revision_history',
1034
1650
            smart.branch.SmartServerRequestRevisionHistory)
1035
 
        self.assertEqual(
1036
 
            smart.request.request_handlers.get('Branch.set_last_revision'),
 
1651
        self.assertHandlerEqual('Branch.set_config_option',
 
1652
            smart.branch.SmartServerBranchRequestSetConfigOption)
 
1653
        self.assertHandlerEqual('Branch.set_last_revision',
1037
1654
            smart.branch.SmartServerBranchRequestSetLastRevision)
1038
 
        self.assertEqual(
1039
 
            smart.request.request_handlers.get('Branch.set_last_revision_info'),
 
1655
        self.assertHandlerEqual('Branch.set_last_revision_info',
1040
1656
            smart.branch.SmartServerBranchRequestSetLastRevisionInfo)
1041
 
        self.assertEqual(
1042
 
            smart.request.request_handlers.get('Branch.unlock'),
 
1657
        self.assertHandlerEqual('Branch.set_last_revision_ex',
 
1658
            smart.branch.SmartServerBranchRequestSetLastRevisionEx)
 
1659
        self.assertHandlerEqual('Branch.set_parent_location',
 
1660
            smart.branch.SmartServerBranchRequestSetParentLocation)
 
1661
        self.assertHandlerEqual('Branch.unlock',
1043
1662
            smart.branch.SmartServerBranchRequestUnlock)
1044
 
        self.assertEqual(
1045
 
            smart.request.request_handlers.get('BzrDir.find_repository'),
 
1663
        self.assertHandlerEqual('BzrDir.find_repository',
1046
1664
            smart.bzrdir.SmartServerRequestFindRepositoryV1)
1047
 
        self.assertEqual(
1048
 
            smart.request.request_handlers.get('BzrDir.find_repositoryV2'),
 
1665
        self.assertHandlerEqual('BzrDir.find_repositoryV2',
1049
1666
            smart.bzrdir.SmartServerRequestFindRepositoryV2)
1050
 
        self.assertEqual(
1051
 
            smart.request.request_handlers.get('BzrDirFormat.initialize'),
 
1667
        self.assertHandlerEqual('BzrDirFormat.initialize',
1052
1668
            smart.bzrdir.SmartServerRequestInitializeBzrDir)
1053
 
        self.assertEqual(
1054
 
            smart.request.request_handlers.get('BzrDir.open_branch'),
 
1669
        self.assertHandlerEqual('BzrDirFormat.initialize_ex_1.16',
 
1670
            smart.bzrdir.SmartServerRequestBzrDirInitializeEx)
 
1671
        self.assertHandlerEqual('BzrDir.cloning_metadir',
 
1672
            smart.bzrdir.SmartServerBzrDirRequestCloningMetaDir)
 
1673
        self.assertHandlerEqual('BzrDir.get_config_file',
 
1674
            smart.bzrdir.SmartServerBzrDirRequestConfigFile)
 
1675
        self.assertHandlerEqual('BzrDir.open_branch',
1055
1676
            smart.bzrdir.SmartServerRequestOpenBranch)
1056
 
        self.assertEqual(
1057
 
            smart.request.request_handlers.get('Repository.gather_stats'),
 
1677
        self.assertHandlerEqual('BzrDir.open_branchV2',
 
1678
            smart.bzrdir.SmartServerRequestOpenBranchV2)
 
1679
        self.assertHandlerEqual('PackRepository.autopack',
 
1680
            smart.packrepository.SmartServerPackRepositoryAutopack)
 
1681
        self.assertHandlerEqual('Repository.gather_stats',
1058
1682
            smart.repository.SmartServerRepositoryGatherStats)
1059
 
        self.assertEqual(
1060
 
            smart.request.request_handlers.get('Repository.get_parent_map'),
 
1683
        self.assertHandlerEqual('Repository.get_parent_map',
1061
1684
            smart.repository.SmartServerRepositoryGetParentMap)
1062
 
        self.assertEqual(
1063
 
            smart.request.request_handlers.get(
1064
 
                'Repository.get_revision_graph'),
 
1685
        self.assertHandlerEqual('Repository.get_rev_id_for_revno',
 
1686
            smart.repository.SmartServerRepositoryGetRevIdForRevno)
 
1687
        self.assertHandlerEqual('Repository.get_revision_graph',
1065
1688
            smart.repository.SmartServerRepositoryGetRevisionGraph)
1066
 
        self.assertEqual(
1067
 
            smart.request.request_handlers.get('Repository.has_revision'),
 
1689
        self.assertHandlerEqual('Repository.get_stream',
 
1690
            smart.repository.SmartServerRepositoryGetStream)
 
1691
        self.assertHandlerEqual('Repository.has_revision',
1068
1692
            smart.repository.SmartServerRequestHasRevision)
1069
 
        self.assertEqual(
1070
 
            smart.request.request_handlers.get('Repository.is_shared'),
 
1693
        self.assertHandlerEqual('Repository.insert_stream',
 
1694
            smart.repository.SmartServerRepositoryInsertStream)
 
1695
        self.assertHandlerEqual('Repository.insert_stream_locked',
 
1696
            smart.repository.SmartServerRepositoryInsertStreamLocked)
 
1697
        self.assertHandlerEqual('Repository.is_shared',
1071
1698
            smart.repository.SmartServerRepositoryIsShared)
1072
 
        self.assertEqual(
1073
 
            smart.request.request_handlers.get('Repository.lock_write'),
 
1699
        self.assertHandlerEqual('Repository.lock_write',
1074
1700
            smart.repository.SmartServerRepositoryLockWrite)
1075
 
        self.assertEqual(
1076
 
            smart.request.request_handlers.get('Repository.tarball'),
 
1701
        self.assertHandlerEqual('Repository.tarball',
1077
1702
            smart.repository.SmartServerRepositoryTarball)
1078
 
        self.assertEqual(
1079
 
            smart.request.request_handlers.get('Repository.unlock'),
 
1703
        self.assertHandlerEqual('Repository.unlock',
1080
1704
            smart.repository.SmartServerRepositoryUnlock)
1081
 
        self.assertEqual(
1082
 
            smart.request.request_handlers.get('Transport.is_readonly'),
 
1705
        self.assertHandlerEqual('Transport.is_readonly',
1083
1706
            smart.request.SmartServerIsReadonly)