← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_remote.py

  • Committer: Robert Collins
  • Date: 2009-04-20 04:19:45 UTC
  • mto: This revision was merged to the branch mainline in revision 4304.
  • Revision ID: robertc@robertcollins.net-20090420041945-qvim67wg99c3euki
Move directory checking for bzr push options into Branch.create_clone_on_transport.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_remote.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
25
25
 
26
26
import bz2
27
27
from cStringIO import StringIO
 
28
import getpass
28
29
 
29
30
from bzrlib import (
30
 
    branch,
31
31
    bzrdir,
32
32
    config,
33
33
    errors,
34
34
    graph,
35
 
    inventory,
36
 
    inventory_delta,
37
35
    pack,
38
36
    remote,
39
37
    repository,
 
38
    smart,
40
39
    tests,
41
40
    treebuilder,
42
41
    urlutils,
43
 
    versionedfile,
44
42
    )
45
43
from bzrlib.branch import Branch
46
44
from bzrlib.bzrdir import BzrDir, BzrDirFormat
54
52
    )
55
53
from bzrlib.repofmt import groupcompress_repo, pack_repo
56
54
from bzrlib.revision import NULL_REVISION
57
 
from bzrlib.smart import medium
 
55
from bzrlib.smart import server, medium
58
56
from bzrlib.smart.client import _SmartClient
59
57
from bzrlib.smart.repository import SmartServerRepositoryGetParentMap
60
58
from bzrlib.tests import (
61
59
    condition_isinstance,
62
60
    split_suite_by_condition,
63
61
    multiply_tests,
64
 
    test_server,
65
62
    )
66
 
from bzrlib.transport import get_transport
 
63
from bzrlib.transport import get_transport, http
67
64
from bzrlib.transport.memory import MemoryTransport
68
65
from bzrlib.transport.remote import (
69
66
    RemoteTransport,
76
73
        standard_tests, condition_isinstance(BasicRemoteObjectTests))
77
74
    smart_server_version_scenarios = [
78
75
        ('HPSS-v2',
79
 
         {'transport_server': test_server.SmartTCPServer_for_testing_v2_only}),
 
76
            {'transport_server': server.SmartTCPServer_for_testing_v2_only}),
80
77
        ('HPSS-v3',
81
 
         {'transport_server': test_server.SmartTCPServer_for_testing})]
 
78
            {'transport_server': server.SmartTCPServer_for_testing})]
82
79
    return multiply_tests(to_adapt, smart_server_version_scenarios, result)
83
80
 
84
81
 
135
132
        b = BzrDir.open_from_transport(self.transport).open_branch()
136
133
        self.assertStartsWith(str(b), 'RemoteBranch(')
137
134
 
138
 
    def test_remote_bzrdir_repr(self):
139
 
        b = BzrDir.open_from_transport(self.transport)
140
 
        self.assertStartsWith(str(b), 'RemoteBzrDir(')
141
 
 
142
135
    def test_remote_branch_format_supports_stacking(self):
143
136
        t = self.transport
144
137
        self.make_branch('unstackable', format='pack-0.92')
161
154
        r = BzrDir.open_from_transport(t.clone('stackable')).open_repository()
162
155
        self.assertTrue(r._format.supports_external_lookups)
163
156
 
164
 
    def test_remote_branch_set_append_revisions_only(self):
165
 
        # Make a format 1.9 branch, which supports append_revisions_only
166
 
        branch = self.make_branch('branch', format='1.9')
167
 
        config = branch.get_config()
168
 
        branch.set_append_revisions_only(True)
169
 
        self.assertEqual(
170
 
            'True', config.get_user_option('append_revisions_only'))
171
 
        branch.set_append_revisions_only(False)
172
 
        self.assertEqual(
173
 
            'False', config.get_user_option('append_revisions_only'))
174
 
 
175
 
    def test_remote_branch_set_append_revisions_only_upgrade_reqd(self):
176
 
        branch = self.make_branch('branch', format='knit')
177
 
        config = branch.get_config()
178
 
        self.assertRaises(
179
 
            errors.UpgradeRequired, branch.set_append_revisions_only, True)
180
 
 
181
157
 
182
158
class FakeProtocol(object):
183
159
    """Lookalike SmartClientRequestProtocolOne allowing body reading tests."""
284
260
        self.expecting_body = True
285
261
        return result[1], FakeProtocol(result[2], self)
286
262
 
287
 
    def call_with_body_bytes(self, method, args, body):
288
 
        self._check_call(method, args)
289
 
        self._calls.append(('call_with_body_bytes', method, args, body))
290
 
        result = self._get_next_response()
291
 
        return result[1], FakeProtocol(result[2], self)
292
 
 
293
263
    def call_with_body_bytes_expecting_body(self, method, args, body):
294
264
        self._check_call(method, args)
295
265
        self._calls.append(('call_with_body_bytes_expecting_body', method,
345
315
        reference_bzrdir_format = bzrdir.format_registry.get('default')()
346
316
        return reference_bzrdir_format.repository_format
347
317
 
348
 
    def assertFinished(self, fake_client):
349
 
        """Assert that all of a FakeClient's expected calls have occurred."""
350
 
        fake_client.finished_test()
 
318
    def disable_verb(self, verb):
 
319
        """Disable a verb for one test."""
 
320
        request_handlers = smart.request.request_handlers
 
321
        orig_method = request_handlers.get(verb)
 
322
        request_handlers.remove(verb)
 
323
        def restoreVerb():
 
324
            request_handlers.register(verb, orig_method)
 
325
        self.addCleanup(restoreVerb)
351
326
 
352
327
 
353
328
class Test_ClientMedium_remote_path_from_transport(tests.TestCase):
418
393
        # Calling _remember_remote_is_before again with a lower value works.
419
394
        client_medium._remember_remote_is_before((1, 5))
420
395
        self.assertTrue(client_medium._is_remote_before((1, 5)))
421
 
        # If you call _remember_remote_is_before with a higher value it logs a
422
 
        # warning, and continues to remember the lower value.
423
 
        self.assertNotContainsRe(self.get_log(), '_remember_remote_is_before')
424
 
        client_medium._remember_remote_is_before((1, 9))
425
 
        self.assertContainsRe(self.get_log(), '_remember_remote_is_before')
426
 
        self.assertTrue(client_medium._is_remote_before((1, 5)))
 
396
        # You cannot call _remember_remote_is_before with a larger value.
 
397
        self.assertRaises(
 
398
            AssertionError, client_medium._remember_remote_is_before, (1, 9))
427
399
 
428
400
 
429
401
class TestBzrDirCloningMetaDir(TestRemote):
448
420
            'BzrDir.cloning_metadir', ('quack/', 'False'),
449
421
            'error', ('BranchReference',)),
450
422
        client.add_expected_call(
451
 
            'BzrDir.open_branchV3', ('quack/',),
 
423
            'BzrDir.open_branchV2', ('quack/',),
452
424
            'success', ('ref', self.get_url('referenced'))),
453
425
        a_bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
454
426
            _client=client)
457
429
        self.assertEqual(bzrdir.BzrDirMetaFormat1, type(result))
458
430
        self.assertEqual(expected._repository_format, result._repository_format)
459
431
        self.assertEqual(expected._branch_format, result._branch_format)
460
 
        self.assertFinished(client)
 
432
        client.finished_test()
461
433
 
462
434
    def test_current_server(self):
463
435
        transport = self.get_transport('.')
478
450
        self.assertEqual(bzrdir.BzrDirMetaFormat1, type(result))
479
451
        self.assertEqual(None, result._repository_format)
480
452
        self.assertEqual(None, result._branch_format)
481
 
        self.assertFinished(client)
482
 
 
483
 
 
484
 
class TestBzrDirOpen(TestRemote):
485
 
 
486
 
    def make_fake_client_and_transport(self, path='quack'):
487
 
        transport = MemoryTransport()
488
 
        transport.mkdir(path)
489
 
        transport = transport.clone(path)
490
 
        client = FakeClient(transport.base)
491
 
        return client, transport
492
 
 
493
 
    def test_absent(self):
494
 
        client, transport = self.make_fake_client_and_transport()
495
 
        client.add_expected_call(
496
 
            'BzrDir.open_2.1', ('quack/',), 'success', ('no',))
497
 
        self.assertRaises(errors.NotBranchError, RemoteBzrDir, transport,
498
 
                remote.RemoteBzrDirFormat(), _client=client, _force_probe=True)
499
 
        self.assertFinished(client)
500
 
 
501
 
    def test_present_without_workingtree(self):
502
 
        client, transport = self.make_fake_client_and_transport()
503
 
        client.add_expected_call(
504
 
            'BzrDir.open_2.1', ('quack/',), 'success', ('yes', 'no'))
505
 
        bd = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
506
 
            _client=client, _force_probe=True)
507
 
        self.assertIsInstance(bd, RemoteBzrDir)
508
 
        self.assertFalse(bd.has_workingtree())
509
 
        self.assertRaises(errors.NoWorkingTree, bd.open_workingtree)
510
 
        self.assertFinished(client)
511
 
 
512
 
    def test_present_with_workingtree(self):
513
 
        client, transport = self.make_fake_client_and_transport()
514
 
        client.add_expected_call(
515
 
            'BzrDir.open_2.1', ('quack/',), 'success', ('yes', 'yes'))
516
 
        bd = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
517
 
            _client=client, _force_probe=True)
518
 
        self.assertIsInstance(bd, RemoteBzrDir)
519
 
        self.assertTrue(bd.has_workingtree())
520
 
        self.assertRaises(errors.NotLocalUrl, bd.open_workingtree)
521
 
        self.assertFinished(client)
522
 
 
523
 
    def test_backwards_compat(self):
524
 
        client, transport = self.make_fake_client_and_transport()
525
 
        client.add_expected_call(
526
 
            'BzrDir.open_2.1', ('quack/',), 'unknown', ('BzrDir.open_2.1',))
527
 
        client.add_expected_call(
528
 
            'BzrDir.open', ('quack/',), 'success', ('yes',))
529
 
        bd = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
530
 
            _client=client, _force_probe=True)
531
 
        self.assertIsInstance(bd, RemoteBzrDir)
532
 
        self.assertFinished(client)
533
 
 
534
 
    def test_backwards_compat_hpss_v2(self):
535
 
        client, transport = self.make_fake_client_and_transport()
536
 
        # Monkey-patch fake client to simulate real-world behaviour with v2
537
 
        # server: upon first RPC call detect the protocol version, and because
538
 
        # the version is 2 also do _remember_remote_is_before((1, 6)) before
539
 
        # continuing with the RPC.
540
 
        orig_check_call = client._check_call
541
 
        def check_call(method, args):
542
 
            client._medium._protocol_version = 2
543
 
            client._medium._remember_remote_is_before((1, 6))
544
 
            client._check_call = orig_check_call
545
 
            client._check_call(method, args)
546
 
        client._check_call = check_call
547
 
        client.add_expected_call(
548
 
            'BzrDir.open_2.1', ('quack/',), 'unknown', ('BzrDir.open_2.1',))
549
 
        client.add_expected_call(
550
 
            'BzrDir.open', ('quack/',), 'success', ('yes',))
551
 
        bd = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
552
 
            _client=client, _force_probe=True)
553
 
        self.assertIsInstance(bd, RemoteBzrDir)
554
 
        self.assertFinished(client)
 
453
        client.finished_test()
555
454
 
556
455
 
557
456
class TestBzrDirOpenBranch(TestRemote):
561
460
        self.make_branch('.')
562
461
        a_dir = BzrDir.open(self.get_url('.'))
563
462
        self.reset_smart_call_log()
564
 
        verb = 'BzrDir.open_branchV3'
 
463
        verb = 'BzrDir.open_branchV2'
565
464
        self.disable_verb(verb)
566
465
        format = a_dir.open_branch()
567
466
        call_count = len([call for call in self.hpss_calls if
577
476
        transport = transport.clone('quack')
578
477
        client = FakeClient(transport.base)
579
478
        client.add_expected_call(
580
 
            'BzrDir.open_branchV3', ('quack/',),
 
479
            'BzrDir.open_branchV2', ('quack/',),
581
480
            'success', ('branch', branch_network_name))
582
481
        client.add_expected_call(
583
482
            'BzrDir.find_repositoryV3', ('quack/',),
590
489
        result = bzrdir.open_branch()
591
490
        self.assertIsInstance(result, RemoteBranch)
592
491
        self.assertEqual(bzrdir, result.bzrdir)
593
 
        self.assertFinished(client)
 
492
        client.finished_test()
594
493
 
595
494
    def test_branch_missing(self):
596
495
        transport = MemoryTransport()
602
501
            _client=client)
603
502
        self.assertRaises(errors.NotBranchError, bzrdir.open_branch)
604
503
        self.assertEqual(
605
 
            [('call', 'BzrDir.open_branchV3', ('quack/',))],
 
504
            [('call', 'BzrDir.open_branchV2', ('quack/',))],
606
505
            client._calls)
607
506
 
608
507
    def test__get_tree_branch(self):
632
531
        network_name = reference_format.network_name()
633
532
        branch_network_name = self.get_branch_format().network_name()
634
533
        client.add_expected_call(
635
 
            'BzrDir.open_branchV3', ('~hello/',),
 
534
            'BzrDir.open_branchV2', ('~hello/',),
636
535
            'success', ('branch', branch_network_name))
637
536
        client.add_expected_call(
638
537
            'BzrDir.find_repositoryV3', ('~hello/',),
643
542
        bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
644
543
            _client=client)
645
544
        result = bzrdir.open_branch()
646
 
        self.assertFinished(client)
 
545
        client.finished_test()
647
546
 
648
547
    def check_open_repository(self, rich_root, subtrees, external_lookup='no'):
649
548
        reference_format = self.get_repo_format()
747
646
        network_name = reference_format.network_name()
748
647
        client.add_expected_call(
749
648
            'BzrDir.create_repository', ('quack/',
750
 
                'Bazaar repository format 2a (needs bzr 1.16 or later)\n',
751
 
                'False'),
752
 
            'success', ('ok', 'yes', 'yes', 'yes', network_name))
 
649
                'Bazaar pack repository format 1 (needs bzr 0.92)\n', 'False'),
 
650
            'success', ('ok', 'no', 'no', 'no', network_name))
753
651
        a_bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
754
652
            _client=client)
755
653
        repo = a_bzrdir.create_repository()
757
655
        self.assertIsInstance(repo, remote.RemoteRepository)
758
656
        # its format should have the settings from the response
759
657
        format = repo._format
760
 
        self.assertTrue(format.rich_root_data)
761
 
        self.assertTrue(format.supports_tree_reference)
762
 
        self.assertTrue(format.supports_external_lookups)
 
658
        self.assertFalse(format.rich_root_data)
 
659
        self.assertFalse(format.supports_tree_reference)
 
660
        self.assertFalse(format.supports_external_lookups)
763
661
        self.assertEqual(network_name, format.network_name())
764
662
 
765
663
 
769
667
        # fallback all the way to the first version.
770
668
        reference_format = self.get_repo_format()
771
669
        network_name = reference_format.network_name()
772
 
        server_url = 'bzr://example.com/'
773
 
        self.permit_url(server_url)
774
 
        client = FakeClient(server_url)
 
670
        client = FakeClient('bzr://example.com/')
775
671
        client.add_unknown_method_response('BzrDir.find_repositoryV3')
776
672
        client.add_unknown_method_response('BzrDir.find_repositoryV2')
777
673
        client.add_success_response('ok', '', 'no', 'no')
783
679
            reference_format.get_format_string(), 'ok')
784
680
        # PackRepository wants to do a stat
785
681
        client.add_success_response('stat', '0', '65535')
786
 
        remote_transport = RemoteTransport(server_url + 'quack/', medium=False,
 
682
        remote_transport = RemoteTransport('bzr://example.com/quack/', medium=False,
787
683
            _client=client)
788
684
        bzrdir = RemoteBzrDir(remote_transport, remote.RemoteBzrDirFormat(),
789
685
            _client=client)
803
699
        # fallback to find_repositoryV2
804
700
        reference_format = self.get_repo_format()
805
701
        network_name = reference_format.network_name()
806
 
        server_url = 'bzr://example.com/'
807
 
        self.permit_url(server_url)
808
 
        client = FakeClient(server_url)
 
702
        client = FakeClient('bzr://example.com/')
809
703
        client.add_unknown_method_response('BzrDir.find_repositoryV3')
810
704
        client.add_success_response('ok', '', 'no', 'no', 'no')
811
705
        # A real repository instance will be created to determine the network
816
710
            reference_format.get_format_string(), 'ok')
817
711
        # PackRepository wants to do a stat
818
712
        client.add_success_response('stat', '0', '65535')
819
 
        remote_transport = RemoteTransport(server_url + 'quack/', medium=False,
 
713
        remote_transport = RemoteTransport('bzr://example.com/quack/', medium=False,
820
714
            _client=client)
821
715
        bzrdir = RemoteBzrDir(remote_transport, remote.RemoteBzrDirFormat(),
822
716
            _client=client)
848
742
        self.assertEqual(network_name, repo._format.network_name())
849
743
 
850
744
 
851
 
class TestBzrDirFormatInitializeEx(TestRemote):
852
 
 
853
 
    def test_success(self):
854
 
        """Simple test for typical successful call."""
855
 
        fmt = bzrdir.RemoteBzrDirFormat()
856
 
        default_format_name = BzrDirFormat.get_default_format().network_name()
857
 
        transport = self.get_transport()
858
 
        client = FakeClient(transport.base)
859
 
        client.add_expected_call(
860
 
            'BzrDirFormat.initialize_ex_1.16',
861
 
                (default_format_name, 'path', 'False', 'False', 'False', '',
862
 
                 '', '', '', 'False'),
863
 
            'success',
864
 
                ('.', 'no', 'no', 'yes', 'repo fmt', 'repo bzrdir fmt',
865
 
                 'bzrdir fmt', 'False', '', '', 'repo lock token'))
866
 
        # XXX: It would be better to call fmt.initialize_on_transport_ex, but
867
 
        # it's currently hard to test that without supplying a real remote
868
 
        # transport connected to a real server.
869
 
        result = fmt._initialize_on_transport_ex_rpc(client, 'path',
870
 
            transport, False, False, False, None, None, None, None, False)
871
 
        self.assertFinished(client)
872
 
 
873
 
    def test_error(self):
874
 
        """Error responses are translated, e.g. 'PermissionDenied' raises the
875
 
        corresponding error from the client.
876
 
        """
877
 
        fmt = bzrdir.RemoteBzrDirFormat()
878
 
        default_format_name = BzrDirFormat.get_default_format().network_name()
879
 
        transport = self.get_transport()
880
 
        client = FakeClient(transport.base)
881
 
        client.add_expected_call(
882
 
            'BzrDirFormat.initialize_ex_1.16',
883
 
                (default_format_name, 'path', 'False', 'False', 'False', '',
884
 
                 '', '', '', 'False'),
885
 
            'error',
886
 
                ('PermissionDenied', 'path', 'extra info'))
887
 
        # XXX: It would be better to call fmt.initialize_on_transport_ex, but
888
 
        # it's currently hard to test that without supplying a real remote
889
 
        # transport connected to a real server.
890
 
        err = self.assertRaises(errors.PermissionDenied,
891
 
            fmt._initialize_on_transport_ex_rpc, client, 'path', transport,
892
 
            False, False, False, None, None, None, None, False)
893
 
        self.assertEqual('path', err.path)
894
 
        self.assertEqual(': extra info', err.extra)
895
 
        self.assertFinished(client)
896
 
 
897
 
    def test_error_from_real_server(self):
898
 
        """Integration test for error translation."""
899
 
        transport = self.make_smart_server('foo')
900
 
        transport = transport.clone('no-such-path')
901
 
        fmt = bzrdir.RemoteBzrDirFormat()
902
 
        err = self.assertRaises(errors.NoSuchFile,
903
 
            fmt.initialize_on_transport_ex, transport, create_prefix=False)
904
 
 
905
 
 
906
745
class OldSmartClient(object):
907
746
    """A fake smart client for test_old_version that just returns a version one
908
747
    response to the 'hello' (query version) command.
941
780
 
942
781
class RemoteBranchTestCase(RemoteBzrDirTestCase):
943
782
 
944
 
    def lock_remote_branch(self, branch):
945
 
        """Trick a RemoteBranch into thinking it is locked."""
946
 
        branch._lock_mode = 'w'
947
 
        branch._lock_count = 2
948
 
        branch._lock_token = 'branch token'
949
 
        branch._repo_lock_token = 'repo token'
950
 
        branch.repository._lock_mode = 'w'
951
 
        branch.repository._lock_count = 2
952
 
        branch.repository._lock_token = 'repo token'
953
 
 
954
783
    def make_remote_branch(self, transport, client):
955
784
        """Make a RemoteBranch using 'client' as its _SmartClient.
956
785
 
983
812
        transport = transport.clone('quack')
984
813
        branch = self.make_remote_branch(transport, client)
985
814
        result = branch.get_parent()
986
 
        self.assertFinished(client)
 
815
        client.finished_test()
987
816
        self.assertEqual(None, result)
988
817
 
989
818
    def test_parent_relative(self):
1015
844
        branch = self.make_remote_branch(transport, client)
1016
845
        result = branch.get_parent()
1017
846
        self.assertEqual('http://foo/', result)
1018
 
        self.assertFinished(client)
 
847
        client.finished_test()
1019
848
 
1020
849
 
1021
850
class TestBranchSetParentLocation(RemoteBranchTestCase):
1036
865
        branch._lock_token = 'b'
1037
866
        branch._repo_lock_token = 'r'
1038
867
        branch._set_parent_location(None)
1039
 
        self.assertFinished(client)
 
868
        client.finished_test()
1040
869
 
1041
870
    def test_parent(self):
1042
871
        transport = MemoryTransport()
1053
882
        branch._lock_token = 'b'
1054
883
        branch._repo_lock_token = 'r'
1055
884
        branch._set_parent_location('foo')
1056
 
        self.assertFinished(client)
 
885
        client.finished_test()
1057
886
 
1058
887
    def test_backwards_compat(self):
1059
888
        self.setup_smart_server_with_call_log()
1091
920
        transport = transport.clone('quack')
1092
921
        branch = self.make_remote_branch(transport, client)
1093
922
        result = branch.tags.get_tag_dict()
1094
 
        self.assertFinished(client)
 
923
        client.finished_test()
1095
924
        self.assertEqual({}, result)
1096
925
 
1097
926
 
1098
 
class TestBranchSetTagsBytes(RemoteBranchTestCase):
1099
 
 
1100
 
    def test_trivial(self):
1101
 
        transport = MemoryTransport()
1102
 
        client = FakeClient(transport.base)
1103
 
        client.add_expected_call(
1104
 
            'Branch.get_stacked_on_url', ('quack/',),
1105
 
            'error', ('NotStacked',))
1106
 
        client.add_expected_call(
1107
 
            'Branch.set_tags_bytes', ('quack/', 'branch token', 'repo token'),
1108
 
            'success', ('',))
1109
 
        transport.mkdir('quack')
1110
 
        transport = transport.clone('quack')
1111
 
        branch = self.make_remote_branch(transport, client)
1112
 
        self.lock_remote_branch(branch)
1113
 
        branch._set_tags_bytes('tags bytes')
1114
 
        self.assertFinished(client)
1115
 
        self.assertEqual('tags bytes', client._calls[-1][-1])
1116
 
 
1117
 
    def test_backwards_compatible(self):
1118
 
        transport = MemoryTransport()
1119
 
        client = FakeClient(transport.base)
1120
 
        client.add_expected_call(
1121
 
            'Branch.get_stacked_on_url', ('quack/',),
1122
 
            'error', ('NotStacked',))
1123
 
        client.add_expected_call(
1124
 
            'Branch.set_tags_bytes', ('quack/', 'branch token', 'repo token'),
1125
 
            'unknown', ('Branch.set_tags_bytes',))
1126
 
        transport.mkdir('quack')
1127
 
        transport = transport.clone('quack')
1128
 
        branch = self.make_remote_branch(transport, client)
1129
 
        self.lock_remote_branch(branch)
1130
 
        class StubRealBranch(object):
1131
 
            def __init__(self):
1132
 
                self.calls = []
1133
 
            def _set_tags_bytes(self, bytes):
1134
 
                self.calls.append(('set_tags_bytes', bytes))
1135
 
        real_branch = StubRealBranch()
1136
 
        branch._real_branch = real_branch
1137
 
        branch._set_tags_bytes('tags bytes')
1138
 
        # Call a second time, to exercise the 'remote version already inferred'
1139
 
        # code path.
1140
 
        branch._set_tags_bytes('tags bytes')
1141
 
        self.assertFinished(client)
1142
 
        self.assertEqual(
1143
 
            [('set_tags_bytes', 'tags bytes')] * 2, real_branch.calls)
1144
 
 
1145
 
 
1146
927
class TestBranchLastRevisionInfo(RemoteBranchTestCase):
1147
928
 
1148
929
    def test_empty_branch(self):
1159
940
        transport = transport.clone('quack')
1160
941
        branch = self.make_remote_branch(transport, client)
1161
942
        result = branch.last_revision_info()
1162
 
        self.assertFinished(client)
 
943
        client.finished_test()
1163
944
        self.assertEqual((0, NULL_REVISION), result)
1164
945
 
1165
946
    def test_non_empty_branch(self):
1220
1001
        client = FakeClient(self.get_url())
1221
1002
        branch_network_name = self.get_branch_format().network_name()
1222
1003
        client.add_expected_call(
1223
 
            'BzrDir.open_branchV3', ('stacked/',),
 
1004
            'BzrDir.open_branchV2', ('stacked/',),
1224
1005
            'success', ('branch', branch_network_name))
1225
1006
        client.add_expected_call(
1226
1007
            'BzrDir.find_repositoryV3', ('stacked/',),
1240
1021
        branch = bzrdir.open_branch()
1241
1022
        result = branch.get_stacked_on_url()
1242
1023
        self.assertEqual('../base', result)
1243
 
        self.assertFinished(client)
 
1024
        client.finished_test()
1244
1025
        # it's in the fallback list both for the RemoteRepository and its vfs
1245
1026
        # repository
1246
1027
        self.assertEqual(1, len(branch.repository._fallback_repositories))
1248
1029
            len(branch.repository._real_repository._fallback_repositories))
1249
1030
 
1250
1031
    def test_get_stacked_on_real_branch(self):
1251
 
        base_branch = self.make_branch('base')
1252
 
        stacked_branch = self.make_branch('stacked')
 
1032
        base_branch = self.make_branch('base', format='1.6')
 
1033
        stacked_branch = self.make_branch('stacked', format='1.6')
1253
1034
        stacked_branch.set_stacked_on_url('../base')
1254
1035
        reference_format = self.get_repo_format()
1255
1036
        network_name = reference_format.network_name()
1256
1037
        client = FakeClient(self.get_url())
1257
1038
        branch_network_name = self.get_branch_format().network_name()
1258
1039
        client.add_expected_call(
1259
 
            'BzrDir.open_branchV3', ('stacked/',),
 
1040
            'BzrDir.open_branchV2', ('stacked/',),
1260
1041
            'success', ('branch', branch_network_name))
1261
1042
        client.add_expected_call(
1262
1043
            'BzrDir.find_repositoryV3', ('stacked/',),
1263
 
            'success', ('ok', '', 'yes', 'no', 'yes', network_name))
 
1044
            'success', ('ok', '', 'no', 'no', 'yes', network_name))
1264
1045
        # called twice, once from constructor and then again by us
1265
1046
        client.add_expected_call(
1266
1047
            'Branch.get_stacked_on_url', ('stacked/',),
1273
1054
        branch = bzrdir.open_branch()
1274
1055
        result = branch.get_stacked_on_url()
1275
1056
        self.assertEqual('../base', result)
1276
 
        self.assertFinished(client)
 
1057
        client.finished_test()
1277
1058
        # it's in the fallback list both for the RemoteRepository.
1278
1059
        self.assertEqual(1, len(branch.repository._fallback_repositories))
1279
1060
        # And we haven't had to construct a real repository.
1314
1095
        result = branch.set_revision_history([])
1315
1096
        branch.unlock()
1316
1097
        self.assertEqual(None, result)
1317
 
        self.assertFinished(client)
 
1098
        client.finished_test()
1318
1099
 
1319
1100
    def test_set_nonempty(self):
1320
1101
        # set_revision_history([rev-id1, ..., rev-idN]) is translated to calling
1352
1133
        result = branch.set_revision_history(['rev-id1', 'rev-id2'])
1353
1134
        branch.unlock()
1354
1135
        self.assertEqual(None, result)
1355
 
        self.assertFinished(client)
 
1136
        client.finished_test()
1356
1137
 
1357
1138
    def test_no_such_revision(self):
1358
1139
        transport = MemoryTransport()
1387
1168
        self.assertRaises(
1388
1169
            errors.NoSuchRevision, branch.set_revision_history, ['rev-id'])
1389
1170
        branch.unlock()
1390
 
        self.assertFinished(client)
 
1171
        client.finished_test()
1391
1172
 
1392
1173
    def test_tip_change_rejected(self):
1393
1174
        """TipChangeRejected responses cause a TipChangeRejected exception to
1430
1211
        self.assertIsInstance(err.msg, unicode)
1431
1212
        self.assertEqual(rejection_msg_unicode, err.msg)
1432
1213
        branch.unlock()
1433
 
        self.assertFinished(client)
 
1214
        client.finished_test()
1434
1215
 
1435
1216
 
1436
1217
class TestBranchSetLastRevisionInfo(RemoteBranchTestCase):
1490
1271
            errors.NoSuchRevision, branch.set_last_revision_info, 123, 'revid')
1491
1272
        branch.unlock()
1492
1273
 
 
1274
    def lock_remote_branch(self, branch):
 
1275
        """Trick a RemoteBranch into thinking it is locked."""
 
1276
        branch._lock_mode = 'w'
 
1277
        branch._lock_count = 2
 
1278
        branch._lock_token = 'branch token'
 
1279
        branch._repo_lock_token = 'repo token'
 
1280
        branch.repository._lock_mode = 'w'
 
1281
        branch.repository._lock_count = 2
 
1282
        branch.repository._lock_token = 'repo token'
 
1283
 
1493
1284
    def test_backwards_compatibility(self):
1494
1285
        """If the server does not support the Branch.set_last_revision_info
1495
1286
        verb (which is new in 1.4), then the client falls back to VFS methods.
1536
1327
        self.assertEqual(
1537
1328
            [('set_last_revision_info', 1234, 'a-revision-id')],
1538
1329
            real_branch.calls)
1539
 
        self.assertFinished(client)
 
1330
        client.finished_test()
1540
1331
 
1541
1332
    def test_unexpected_error(self):
1542
1333
        # If the server sends an error the client doesn't understand, it gets
1650
1441
        config = branch._get_config()
1651
1442
        config.set_option('foo', 'bar')
1652
1443
        branch.unlock()
1653
 
        self.assertFinished(client)
 
1444
        client.finished_test()
1654
1445
 
1655
1446
    def test_backwards_compat_set_option(self):
1656
1447
        self.setup_smart_server_with_call_log()
1680
1471
        transport = transport.clone('quack')
1681
1472
        branch = self.make_remote_branch(transport, client)
1682
1473
        self.assertRaises(errors.UnlockableTransport, branch.lock_write)
1683
 
        self.assertFinished(client)
 
1474
        client.finished_test()
1684
1475
 
1685
1476
 
1686
1477
class TestBzrDirGetSetConfig(RemoteBzrDirTestCase):
1769
1560
 
1770
1561
class TestRemoteSSHTransportAuthentication(tests.TestCaseInTempDir):
1771
1562
 
1772
 
    def test_defaults_to_none(self):
 
1563
    def test_defaults_to_getuser(self):
1773
1564
        t = RemoteSSHTransport('bzr+ssh://example.com')
1774
 
        self.assertIs(None, t._get_credentials()[0])
 
1565
        self.assertIs(getpass.getuser(), t._get_credentials()[0])
1775
1566
 
1776
1567
    def test_uses_authentication_config(self):
1777
1568
        conf = config.AuthenticationConfig()
1811
1602
        return repo, client
1812
1603
 
1813
1604
 
1814
 
def remoted_description(format):
1815
 
    return 'Remote: ' + format.get_format_description()
1816
 
 
1817
 
 
1818
 
class TestBranchFormat(tests.TestCase):
1819
 
 
1820
 
    def test_get_format_description(self):
1821
 
        remote_format = RemoteBranchFormat()
1822
 
        real_format = branch.BranchFormat.get_default_format()
1823
 
        remote_format._network_name = real_format.network_name()
1824
 
        self.assertEqual(remoted_description(real_format),
1825
 
            remote_format.get_format_description())
1826
 
 
1827
 
 
1828
1605
class TestRepositoryFormat(TestRemoteRepository):
1829
1606
 
1830
1607
    def test_fast_delta(self):
1837
1614
        false_format._network_name = false_name
1838
1615
        self.assertEqual(False, false_format.fast_deltas)
1839
1616
 
1840
 
    def test_get_format_description(self):
1841
 
        remote_repo_format = RemoteRepositoryFormat()
1842
 
        real_format = repository.RepositoryFormat.get_default_format()
1843
 
        remote_repo_format._network_name = real_format.network_name()
1844
 
        self.assertEqual(remoted_description(real_format),
1845
 
            remote_repo_format.get_format_description())
1846
 
 
1847
1617
 
1848
1618
class TestRepositoryGatherStats(TestRemoteRepository):
1849
1619
 
2034
1804
        self.assertLength(1, self.hpss_calls)
2035
1805
 
2036
1806
    def disableExtraResults(self):
2037
 
        self.overrideAttr(SmartServerRepositoryGetParentMap,
2038
 
                          'no_extra_results', True)
 
1807
        old_flag = SmartServerRepositoryGetParentMap.no_extra_results
 
1808
        SmartServerRepositoryGetParentMap.no_extra_results = True
 
1809
        def reset_values():
 
1810
            SmartServerRepositoryGetParentMap.no_extra_results = old_flag
 
1811
        self.addCleanup(reset_values)
2039
1812
 
2040
1813
    def test_null_cached_missing_and_stop_key(self):
2041
1814
        self.setup_smart_server_with_call_log()
2100
1873
 
2101
1874
    def test_allows_new_revisions(self):
2102
1875
        """get_parent_map's results can be updated by commit."""
2103
 
        smart_server = test_server.SmartTCPServer_for_testing()
2104
 
        self.start_server(smart_server)
 
1876
        smart_server = server.SmartTCPServer_for_testing()
 
1877
        smart_server.setUp()
 
1878
        self.addCleanup(smart_server.tearDown)
2105
1879
        self.make_branch('branch')
2106
1880
        branch = Branch.open(smart_server.get_url() + '/branch')
2107
1881
        tree = branch.create_checkout('tree', lightweight=True)
2190
1964
        self.assertEqual(('AnUnexpectedError',), e.error_tuple)
2191
1965
 
2192
1966
 
2193
 
class TestRepositoryGetRevIdForRevno(TestRemoteRepository):
2194
 
 
2195
 
    def test_ok(self):
2196
 
        repo, client = self.setup_fake_client_and_repository('quack')
2197
 
        client.add_expected_call(
2198
 
            'Repository.get_rev_id_for_revno', ('quack/', 5, (42, 'rev-foo')),
2199
 
            'success', ('ok', 'rev-five'))
2200
 
        result = repo.get_rev_id_for_revno(5, (42, 'rev-foo'))
2201
 
        self.assertEqual((True, 'rev-five'), result)
2202
 
        self.assertFinished(client)
2203
 
 
2204
 
    def test_history_incomplete(self):
2205
 
        repo, client = self.setup_fake_client_and_repository('quack')
2206
 
        client.add_expected_call(
2207
 
            'Repository.get_rev_id_for_revno', ('quack/', 5, (42, 'rev-foo')),
2208
 
            'success', ('history-incomplete', 10, 'rev-ten'))
2209
 
        result = repo.get_rev_id_for_revno(5, (42, 'rev-foo'))
2210
 
        self.assertEqual((False, (10, 'rev-ten')), result)
2211
 
        self.assertFinished(client)
2212
 
 
2213
 
    def test_history_incomplete_with_fallback(self):
2214
 
        """A 'history-incomplete' response causes the fallback repository to be
2215
 
        queried too, if one is set.
2216
 
        """
2217
 
        # Make a repo with a fallback repo, both using a FakeClient.
2218
 
        format = remote.response_tuple_to_repo_format(
2219
 
            ('yes', 'no', 'yes', self.get_repo_format().network_name()))
2220
 
        repo, client = self.setup_fake_client_and_repository('quack')
2221
 
        repo._format = format
2222
 
        fallback_repo, ignored = self.setup_fake_client_and_repository(
2223
 
            'fallback')
2224
 
        fallback_repo._client = client
2225
 
        fallback_repo._format = format
2226
 
        repo.add_fallback_repository(fallback_repo)
2227
 
        # First the client should ask the primary repo
2228
 
        client.add_expected_call(
2229
 
            'Repository.get_rev_id_for_revno', ('quack/', 1, (42, 'rev-foo')),
2230
 
            'success', ('history-incomplete', 2, 'rev-two'))
2231
 
        # Then it should ask the fallback, using revno/revid from the
2232
 
        # history-incomplete response as the known revno/revid.
2233
 
        client.add_expected_call(
2234
 
            'Repository.get_rev_id_for_revno',('fallback/', 1, (2, 'rev-two')),
2235
 
            'success', ('ok', 'rev-one'))
2236
 
        result = repo.get_rev_id_for_revno(1, (42, 'rev-foo'))
2237
 
        self.assertEqual((True, 'rev-one'), result)
2238
 
        self.assertFinished(client)
2239
 
 
2240
 
    def test_nosuchrevision(self):
2241
 
        # 'nosuchrevision' is returned when the known-revid is not found in the
2242
 
        # remote repo.  The client translates that response to NoSuchRevision.
2243
 
        repo, client = self.setup_fake_client_and_repository('quack')
2244
 
        client.add_expected_call(
2245
 
            'Repository.get_rev_id_for_revno', ('quack/', 5, (42, 'rev-foo')),
2246
 
            'error', ('nosuchrevision', 'rev-foo'))
2247
 
        self.assertRaises(
2248
 
            errors.NoSuchRevision,
2249
 
            repo.get_rev_id_for_revno, 5, (42, 'rev-foo'))
2250
 
        self.assertFinished(client)
2251
 
 
2252
 
    def test_branch_fallback_locking(self):
2253
 
        """RemoteBranch.get_rev_id takes a read lock, and tries to call the
2254
 
        get_rev_id_for_revno verb.  If the verb is unknown the VFS fallback
2255
 
        will be invoked, which will fail if the repo is unlocked.
2256
 
        """
2257
 
        self.setup_smart_server_with_call_log()
2258
 
        tree = self.make_branch_and_memory_tree('.')
2259
 
        tree.lock_write()
2260
 
        rev1 = tree.commit('First')
2261
 
        rev2 = tree.commit('Second')
2262
 
        tree.unlock()
2263
 
        branch = tree.branch
2264
 
        self.assertFalse(branch.is_locked())
2265
 
        self.reset_smart_call_log()
2266
 
        verb = 'Repository.get_rev_id_for_revno'
2267
 
        self.disable_verb(verb)
2268
 
        self.assertEqual(rev1, branch.get_rev_id(1))
2269
 
        self.assertLength(1, [call for call in self.hpss_calls if
2270
 
                              call.call.method == verb])
2271
 
 
2272
 
 
2273
1967
class TestRepositoryIsShared(TestRemoteRepository):
2274
1968
 
2275
1969
    def test_is_shared(self):
2390
2084
        self.assertEqual([], client._calls)
2391
2085
 
2392
2086
 
2393
 
class TestRepositoryInsertStreamBase(TestRemoteRepository):
2394
 
    """Base class for Repository.insert_stream and .insert_stream_1.19
2395
 
    tests.
2396
 
    """
2397
 
    
2398
 
    def checkInsertEmptyStream(self, repo, client):
2399
 
        """Insert an empty stream, checking the result.
2400
 
 
2401
 
        This checks that there are no resume_tokens or missing_keys, and that
2402
 
        the client is finished.
2403
 
        """
2404
 
        sink = repo._get_sink()
2405
 
        fmt = repository.RepositoryFormat.get_default_format()
2406
 
        resume_tokens, missing_keys = sink.insert_stream([], fmt, [])
2407
 
        self.assertEqual([], resume_tokens)
2408
 
        self.assertEqual(set(), missing_keys)
2409
 
        self.assertFinished(client)
2410
 
 
2411
 
 
2412
 
class TestRepositoryInsertStream(TestRepositoryInsertStreamBase):
2413
 
    """Tests for using Repository.insert_stream verb when the _1.19 variant is
2414
 
    not available.
2415
 
 
2416
 
    This test case is very similar to TestRepositoryInsertStream_1_19.
2417
 
    """
2418
 
 
2419
 
    def setUp(self):
2420
 
        TestRemoteRepository.setUp(self)
2421
 
        self.disable_verb('Repository.insert_stream_1.19')
2422
 
 
2423
 
    def test_unlocked_repo(self):
2424
 
        transport_path = 'quack'
2425
 
        repo, client = self.setup_fake_client_and_repository(transport_path)
2426
 
        client.add_expected_call(
2427
 
            'Repository.insert_stream_1.19', ('quack/', ''),
2428
 
            'unknown', ('Repository.insert_stream_1.19',))
2429
 
        client.add_expected_call(
2430
 
            'Repository.insert_stream', ('quack/', ''),
2431
 
            'success', ('ok',))
2432
 
        client.add_expected_call(
2433
 
            'Repository.insert_stream', ('quack/', ''),
2434
 
            'success', ('ok',))
2435
 
        self.checkInsertEmptyStream(repo, client)
2436
 
 
2437
 
    def test_locked_repo_with_no_lock_token(self):
2438
 
        transport_path = 'quack'
2439
 
        repo, client = self.setup_fake_client_and_repository(transport_path)
2440
 
        client.add_expected_call(
2441
 
            'Repository.lock_write', ('quack/', ''),
2442
 
            'success', ('ok', ''))
2443
 
        client.add_expected_call(
2444
 
            'Repository.insert_stream_1.19', ('quack/', ''),
2445
 
            'unknown', ('Repository.insert_stream_1.19',))
2446
 
        client.add_expected_call(
2447
 
            'Repository.insert_stream', ('quack/', ''),
2448
 
            'success', ('ok',))
2449
 
        client.add_expected_call(
2450
 
            'Repository.insert_stream', ('quack/', ''),
2451
 
            'success', ('ok',))
2452
 
        repo.lock_write()
2453
 
        self.checkInsertEmptyStream(repo, client)
2454
 
 
2455
 
    def test_locked_repo_with_lock_token(self):
2456
 
        transport_path = 'quack'
2457
 
        repo, client = self.setup_fake_client_and_repository(transport_path)
2458
 
        client.add_expected_call(
2459
 
            'Repository.lock_write', ('quack/', ''),
2460
 
            'success', ('ok', 'a token'))
2461
 
        client.add_expected_call(
2462
 
            'Repository.insert_stream_1.19', ('quack/', '', 'a token'),
2463
 
            'unknown', ('Repository.insert_stream_1.19',))
2464
 
        client.add_expected_call(
2465
 
            'Repository.insert_stream_locked', ('quack/', '', 'a token'),
2466
 
            'success', ('ok',))
2467
 
        client.add_expected_call(
2468
 
            'Repository.insert_stream_locked', ('quack/', '', 'a token'),
2469
 
            'success', ('ok',))
2470
 
        repo.lock_write()
2471
 
        self.checkInsertEmptyStream(repo, client)
2472
 
 
2473
 
    def test_stream_with_inventory_deltas(self):
2474
 
        """'inventory-deltas' substreams cannot be sent to the
2475
 
        Repository.insert_stream verb, because not all servers that implement
2476
 
        that verb will accept them.  So when one is encountered the RemoteSink
2477
 
        immediately stops using that verb and falls back to VFS insert_stream.
2478
 
        """
2479
 
        transport_path = 'quack'
2480
 
        repo, client = self.setup_fake_client_and_repository(transport_path)
2481
 
        client.add_expected_call(
2482
 
            'Repository.insert_stream_1.19', ('quack/', ''),
2483
 
            'unknown', ('Repository.insert_stream_1.19',))
2484
 
        client.add_expected_call(
2485
 
            'Repository.insert_stream', ('quack/', ''),
2486
 
            'success', ('ok',))
2487
 
        client.add_expected_call(
2488
 
            'Repository.insert_stream', ('quack/', ''),
2489
 
            'success', ('ok',))
2490
 
        # Create a fake real repository for insert_stream to fall back on, so
2491
 
        # that we can directly see the records the RemoteSink passes to the
2492
 
        # real sink.
2493
 
        class FakeRealSink:
2494
 
            def __init__(self):
2495
 
                self.records = []
2496
 
            def insert_stream(self, stream, src_format, resume_tokens):
2497
 
                for substream_kind, substream in stream:
2498
 
                    self.records.append(
2499
 
                        (substream_kind, [record.key for record in substream]))
2500
 
                return ['fake tokens'], ['fake missing keys']
2501
 
        fake_real_sink = FakeRealSink()
2502
 
        class FakeRealRepository:
2503
 
            def _get_sink(self):
2504
 
                return fake_real_sink
2505
 
            def is_in_write_group(self):
2506
 
                return False
2507
 
            def refresh_data(self):
2508
 
                return True
2509
 
        repo._real_repository = FakeRealRepository()
2510
 
        sink = repo._get_sink()
2511
 
        fmt = repository.RepositoryFormat.get_default_format()
2512
 
        stream = self.make_stream_with_inv_deltas(fmt)
2513
 
        resume_tokens, missing_keys = sink.insert_stream(stream, fmt, [])
2514
 
        # Every record from the first inventory delta should have been sent to
2515
 
        # the VFS sink.
2516
 
        expected_records = [
2517
 
            ('inventory-deltas', [('rev2',), ('rev3',)]),
2518
 
            ('texts', [('some-rev', 'some-file')])]
2519
 
        self.assertEqual(expected_records, fake_real_sink.records)
2520
 
        # The return values from the real sink's insert_stream are propagated
2521
 
        # back to the original caller.
2522
 
        self.assertEqual(['fake tokens'], resume_tokens)
2523
 
        self.assertEqual(['fake missing keys'], missing_keys)
2524
 
        self.assertFinished(client)
2525
 
 
2526
 
    def make_stream_with_inv_deltas(self, fmt):
2527
 
        """Make a simple stream with an inventory delta followed by more
2528
 
        records and more substreams to test that all records and substreams
2529
 
        from that point on are used.
2530
 
 
2531
 
        This sends, in order:
2532
 
           * inventories substream: rev1, rev2, rev3.  rev2 and rev3 are
2533
 
             inventory-deltas.
2534
 
           * texts substream: (some-rev, some-file)
2535
 
        """
2536
 
        # Define a stream using generators so that it isn't rewindable.
2537
 
        inv = inventory.Inventory(revision_id='rev1')
2538
 
        inv.root.revision = 'rev1'
2539
 
        def stream_with_inv_delta():
2540
 
            yield ('inventories', inventories_substream())
2541
 
            yield ('inventory-deltas', inventory_delta_substream())
2542
 
            yield ('texts', [
2543
 
                versionedfile.FulltextContentFactory(
2544
 
                    ('some-rev', 'some-file'), (), None, 'content')])
2545
 
        def inventories_substream():
2546
 
            # An empty inventory fulltext.  This will be streamed normally.
2547
 
            text = fmt._serializer.write_inventory_to_string(inv)
2548
 
            yield versionedfile.FulltextContentFactory(
2549
 
                ('rev1',), (), None, text)
2550
 
        def inventory_delta_substream():
2551
 
            # An inventory delta.  This can't be streamed via this verb, so it
2552
 
            # will trigger a fallback to VFS insert_stream.
2553
 
            entry = inv.make_entry(
2554
 
                'directory', 'newdir', inv.root.file_id, 'newdir-id')
2555
 
            entry.revision = 'ghost'
2556
 
            delta = [(None, 'newdir', 'newdir-id', entry)]
2557
 
            serializer = inventory_delta.InventoryDeltaSerializer(
2558
 
                versioned_root=True, tree_references=False)
2559
 
            lines = serializer.delta_to_lines('rev1', 'rev2', delta)
2560
 
            yield versionedfile.ChunkedContentFactory(
2561
 
                ('rev2',), (('rev1',)), None, lines)
2562
 
            # Another delta.
2563
 
            lines = serializer.delta_to_lines('rev1', 'rev3', delta)
2564
 
            yield versionedfile.ChunkedContentFactory(
2565
 
                ('rev3',), (('rev1',)), None, lines)
2566
 
        return stream_with_inv_delta()
2567
 
 
2568
 
 
2569
 
class TestRepositoryInsertStream_1_19(TestRepositoryInsertStreamBase):
2570
 
 
2571
 
    def test_unlocked_repo(self):
2572
 
        transport_path = 'quack'
2573
 
        repo, client = self.setup_fake_client_and_repository(transport_path)
2574
 
        client.add_expected_call(
2575
 
            'Repository.insert_stream_1.19', ('quack/', ''),
2576
 
            'success', ('ok',))
2577
 
        client.add_expected_call(
2578
 
            'Repository.insert_stream_1.19', ('quack/', ''),
2579
 
            'success', ('ok',))
2580
 
        self.checkInsertEmptyStream(repo, client)
2581
 
 
2582
 
    def test_locked_repo_with_no_lock_token(self):
2583
 
        transport_path = 'quack'
2584
 
        repo, client = self.setup_fake_client_and_repository(transport_path)
2585
 
        client.add_expected_call(
2586
 
            'Repository.lock_write', ('quack/', ''),
2587
 
            'success', ('ok', ''))
2588
 
        client.add_expected_call(
2589
 
            'Repository.insert_stream_1.19', ('quack/', ''),
2590
 
            'success', ('ok',))
2591
 
        client.add_expected_call(
2592
 
            'Repository.insert_stream_1.19', ('quack/', ''),
2593
 
            'success', ('ok',))
2594
 
        repo.lock_write()
2595
 
        self.checkInsertEmptyStream(repo, client)
2596
 
 
2597
 
    def test_locked_repo_with_lock_token(self):
2598
 
        transport_path = 'quack'
2599
 
        repo, client = self.setup_fake_client_and_repository(transport_path)
2600
 
        client.add_expected_call(
2601
 
            'Repository.lock_write', ('quack/', ''),
2602
 
            'success', ('ok', 'a token'))
2603
 
        client.add_expected_call(
2604
 
            'Repository.insert_stream_1.19', ('quack/', '', 'a token'),
2605
 
            'success', ('ok',))
2606
 
        client.add_expected_call(
2607
 
            'Repository.insert_stream_1.19', ('quack/', '', 'a token'),
2608
 
            'success', ('ok',))
2609
 
        repo.lock_write()
2610
 
        self.checkInsertEmptyStream(repo, client)
 
2087
class TestRepositoryInsertStream(TestRemoteRepository):
 
2088
 
 
2089
    def test_unlocked_repo(self):
 
2090
        transport_path = 'quack'
 
2091
        repo, client = self.setup_fake_client_and_repository(transport_path)
 
2092
        client.add_expected_call(
 
2093
            'Repository.insert_stream', ('quack/', ''),
 
2094
            'success', ('ok',))
 
2095
        client.add_expected_call(
 
2096
            'Repository.insert_stream', ('quack/', ''),
 
2097
            'success', ('ok',))
 
2098
        sink = repo._get_sink()
 
2099
        fmt = repository.RepositoryFormat.get_default_format()
 
2100
        resume_tokens, missing_keys = sink.insert_stream([], fmt, [])
 
2101
        self.assertEqual([], resume_tokens)
 
2102
        self.assertEqual(set(), missing_keys)
 
2103
        client.finished_test()
 
2104
 
 
2105
    def test_locked_repo_with_no_lock_token(self):
 
2106
        transport_path = 'quack'
 
2107
        repo, client = self.setup_fake_client_and_repository(transport_path)
 
2108
        client.add_expected_call(
 
2109
            'Repository.lock_write', ('quack/', ''),
 
2110
            'success', ('ok', ''))
 
2111
        client.add_expected_call(
 
2112
            'Repository.insert_stream', ('quack/', ''),
 
2113
            'success', ('ok',))
 
2114
        client.add_expected_call(
 
2115
            'Repository.insert_stream', ('quack/', ''),
 
2116
            'success', ('ok',))
 
2117
        repo.lock_write()
 
2118
        sink = repo._get_sink()
 
2119
        fmt = repository.RepositoryFormat.get_default_format()
 
2120
        resume_tokens, missing_keys = sink.insert_stream([], fmt, [])
 
2121
        self.assertEqual([], resume_tokens)
 
2122
        self.assertEqual(set(), missing_keys)
 
2123
        client.finished_test()
 
2124
 
 
2125
    def test_locked_repo_with_lock_token(self):
 
2126
        transport_path = 'quack'
 
2127
        repo, client = self.setup_fake_client_and_repository(transport_path)
 
2128
        client.add_expected_call(
 
2129
            'Repository.lock_write', ('quack/', ''),
 
2130
            'success', ('ok', 'a token'))
 
2131
        client.add_expected_call(
 
2132
            'Repository.insert_stream_locked', ('quack/', '', 'a token'),
 
2133
            'success', ('ok',))
 
2134
        client.add_expected_call(
 
2135
            'Repository.insert_stream_locked', ('quack/', '', 'a token'),
 
2136
            'success', ('ok',))
 
2137
        repo.lock_write()
 
2138
        sink = repo._get_sink()
 
2139
        fmt = repository.RepositoryFormat.get_default_format()
 
2140
        resume_tokens, missing_keys = sink.insert_stream([], fmt, [])
 
2141
        self.assertEqual([], resume_tokens)
 
2142
        self.assertEqual(set(), missing_keys)
 
2143
        client.finished_test()
2611
2144
 
2612
2145
 
2613
2146
class TestRepositoryTarball(TestRemoteRepository):
2649
2182
    """RemoteRepository.copy_content_into optimizations"""
2650
2183
 
2651
2184
    def test_copy_content_remote_to_local(self):
2652
 
        self.transport_server = test_server.SmartTCPServer_for_testing
 
2185
        self.transport_server = server.SmartTCPServer_for_testing
2653
2186
        src_repo = self.make_repository('repo1')
2654
2187
        src_repo = repository.Repository.open(self.get_url('repo1'))
2655
2188
        # At the moment the tarball-based copy_content_into can't write back
2698
2231
        client.add_expected_call(
2699
2232
            'PackRepository.autopack', ('quack/',), 'success', ('ok',))
2700
2233
        repo.autopack()
2701
 
        self.assertFinished(client)
 
2234
        client.finished_test()
2702
2235
 
2703
2236
    def test_ok_with_real_repo(self):
2704
2237
        """When the server returns 'ok' and there is a _real_repository, then
2803
2336
        expected_error = errors.NotBranchError(path=bzrdir.root_transport.base)
2804
2337
        self.assertEqual(expected_error, translated_error)
2805
2338
 
2806
 
    def test_nobranch_one_arg(self):
2807
 
        bzrdir = self.make_bzrdir('')
2808
 
        translated_error = self.translateTuple(
2809
 
            ('nobranch', 'extra detail'), bzrdir=bzrdir)
2810
 
        expected_error = errors.NotBranchError(
2811
 
            path=bzrdir.root_transport.base,
2812
 
            detail='extra detail')
2813
 
        self.assertEqual(expected_error, translated_error)
2814
 
 
2815
2339
    def test_LockContention(self):
2816
2340
        translated_error = self.translateTuple(('LockContention',))
2817
2341
        expected_error = errors.LockContention('(remote lock)')
2857
2381
        expected_error = errors.ReadError(path)
2858
2382
        self.assertEqual(expected_error, translated_error)
2859
2383
 
2860
 
    def test_IncompatibleRepositories(self):
2861
 
        translated_error = self.translateTuple(('IncompatibleRepositories',
2862
 
            "repo1", "repo2", "details here"))
2863
 
        expected_error = errors.IncompatibleRepositories("repo1", "repo2",
2864
 
            "details here")
2865
 
        self.assertEqual(expected_error, translated_error)
2866
 
 
2867
2384
    def test_PermissionDenied_no_args(self):
2868
2385
        path = 'a path'
2869
2386
        translated_error = self.translateTuple(('PermissionDenied',), path=path)
2930
2447
        # In addition to re-raising ErrorFromSmartServer, some debug info has
2931
2448
        # been muttered to the log file for developer to look at.
2932
2449
        self.assertContainsRe(
2933
 
            self.get_log(),
 
2450
            self._get_log(keep_log_file=True),
2934
2451
            "Missing key 'branch' in context")
2935
2452
 
2936
2453
    def test_path_missing(self):
2944
2461
        self.assertEqual(server_error, translated_error)
2945
2462
        # In addition to re-raising ErrorFromSmartServer, some debug info has
2946
2463
        # been muttered to the log file for developer to look at.
2947
 
        self.assertContainsRe(self.get_log(), "Missing key 'path' in context")
 
2464
        self.assertContainsRe(
 
2465
            self._get_log(keep_log_file=True), "Missing key 'path' in context")
2948
2466
 
2949
2467
 
2950
2468
class TestStacking(tests.TestCaseWithTransport):
2968
2486
        stacked_branch = self.make_branch('stacked', format='1.9')
2969
2487
        stacked_branch.set_stacked_on_url('../base')
2970
2488
        # start a server looking at this
2971
 
        smart_server = test_server.SmartTCPServer_for_testing()
2972
 
        self.start_server(smart_server)
 
2489
        smart_server = server.SmartTCPServer_for_testing()
 
2490
        smart_server.setUp()
 
2491
        self.addCleanup(smart_server.tearDown)
2973
2492
        remote_bzrdir = BzrDir.open(smart_server.get_url() + '/stacked')
2974
2493
        # can get its branch and repository
2975
2494
        remote_branch = remote_bzrdir.open_branch()
2997
2516
        tree1.commit('rev1', rev_id='rev1')
2998
2517
        tree2 = tree1.branch.bzrdir.sprout('tree2', stacked=True
2999
2518
            ).open_workingtree()
3000
 
        local_tree = tree2.branch.create_checkout('local')
3001
 
        local_tree.commit('local changes make me feel good.')
 
2519
        tree2.commit('local changes make me feel good.')
3002
2520
        branch2 = Branch.open(self.get_url('tree2'))
3003
2521
        branch2.lock_read()
3004
2522
        self.addCleanup(branch2.unlock)
3026
2544
                    result.append(content.key[-1])
3027
2545
        return result
3028
2546
 
3029
 
    def get_ordered_revs(self, format, order, branch_factory=None):
 
2547
    def get_ordered_revs(self, format, order):
3030
2548
        """Get a list of the revisions in a stream to format format.
3031
2549
 
3032
2550
        :param format: The format of the target.
3033
2551
        :param order: the order that target should have requested.
3034
 
        :param branch_factory: A callable to create a trunk and stacked branch
3035
 
            to fetch from. If none, self.prepare_stacked_remote_branch is used.
3036
2552
        :result: The revision ids in the stream, in the order seen,
3037
2553
            the topological order of revisions in the source.
3038
2554
        """
3040
2556
        target_repository_format = unordered_format.repository_format
3041
2557
        # Cross check
3042
2558
        self.assertEqual(order, target_repository_format._fetch_order)
3043
 
        if branch_factory is None:
3044
 
            branch_factory = self.prepare_stacked_remote_branch
3045
 
        _, stacked = branch_factory()
 
2559
        trunk, stacked = self.prepare_stacked_remote_branch()
3046
2560
        source = stacked.repository._get_source(target_repository_format)
3047
2561
        tip = stacked.last_revision()
3048
2562
        revs = stacked.repository.get_ancestry(tip)
3067
2581
        # from the server, then one from the backing branch.
3068
2582
        self.assertLength(2, self.hpss_calls)
3069
2583
 
3070
 
    def test_stacked_on_stacked_get_stream_unordered(self):
3071
 
        # Repository._get_source.get_stream() from a stacked repository which
3072
 
        # is itself stacked yields the full data from all three sources.
3073
 
        def make_stacked_stacked():
3074
 
            _, stacked = self.prepare_stacked_remote_branch()
3075
 
            tree = stacked.bzrdir.sprout('tree3', stacked=True
3076
 
                ).open_workingtree()
3077
 
            local_tree = tree.branch.create_checkout('local-tree3')
3078
 
            local_tree.commit('more local changes are better')
3079
 
            branch = Branch.open(self.get_url('tree3'))
3080
 
            branch.lock_read()
3081
 
            self.addCleanup(branch.unlock)
3082
 
            return None, branch
3083
 
        rev_ord, expected_revs = self.get_ordered_revs('1.9', 'unordered',
3084
 
            branch_factory=make_stacked_stacked)
3085
 
        self.assertEqual(set(expected_revs), set(rev_ord))
3086
 
        # Getting unordered results should have made a streaming data request
3087
 
        # from the server, and one from each backing repo
3088
 
        self.assertLength(3, self.hpss_calls)
3089
 
 
3090
2584
    def test_stacked_get_stream_topological(self):
3091
2585
        # Repository._get_source.get_stream() from a stacked repository with
3092
2586
        # topological sorting yields the full data from both stacked and
3093
2587
        # stacked upon sources in topological order.
3094
2588
        rev_ord, expected_revs = self.get_ordered_revs('knit', 'topological')
3095
2589
        self.assertEqual(expected_revs, rev_ord)
3096
 
        # Getting topological sort requires VFS calls still - one of which is
3097
 
        # pushing up from the bound branch.
3098
 
        self.assertLength(13, self.hpss_calls)
 
2590
        # Getting topological sort requires VFS calls still
 
2591
        self.assertLength(12, self.hpss_calls)
3099
2592
 
3100
2593
    def test_stacked_get_stream_groupcompress(self):
3101
2594
        # Repository._get_source.get_stream() from a stacked repository with
3108
2601
        # from the backing branch, and one from the stacked on branch.
3109
2602
        self.assertLength(2, self.hpss_calls)
3110
2603
 
3111
 
    def test_stacked_pull_more_than_stacking_has_bug_360791(self):
3112
 
        # When pulling some fixed amount of content that is more than the
3113
 
        # source has (because some is coming from a fallback branch, no error
3114
 
        # should be received. This was reported as bug 360791.
3115
 
        # Need three branches: a trunk, a stacked branch, and a preexisting
3116
 
        # branch pulling content from stacked and trunk.
3117
 
        self.setup_smart_server_with_call_log()
3118
 
        trunk = self.make_branch_and_tree('trunk', format="1.9-rich-root")
3119
 
        r1 = trunk.commit('start')
3120
 
        stacked_branch = trunk.branch.create_clone_on_transport(
3121
 
            self.get_transport('stacked'), stacked_on=trunk.branch.base)
3122
 
        local = self.make_branch('local', format='1.9-rich-root')
3123
 
        local.repository.fetch(stacked_branch.repository,
3124
 
            stacked_branch.last_revision())
3125
 
 
3126
2604
 
3127
2605
class TestRemoteBranchEffort(tests.TestCaseWithTransport):
3128
2606
 
3130
2608
        super(TestRemoteBranchEffort, self).setUp()
3131
2609
        # Create a smart server that publishes whatever the backing VFS server
3132
2610
        # does.
3133
 
        self.smart_server = test_server.SmartTCPServer_for_testing()
3134
 
        self.start_server(self.smart_server, self.get_server())
 
2611
        self.smart_server = server.SmartTCPServer_for_testing()
 
2612
        self.smart_server.setUp(self.get_server())
 
2613
        self.addCleanup(self.smart_server.tearDown)
3135
2614
        # Log all HPSS calls into self.hpss_calls.
3136
2615
        _SmartClient.hooks.install_named_hook(
3137
2616
            'call', self.capture_hpss_call, None)