← 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: Andrew Bennetts
  • Date: 2009-11-25 07:27:43 UTC
  • mto: This revision was merged to the branch mainline in revision 4825.
  • Revision ID: andrew.bennetts@canonical.com-20091125072743-v6sv4m2mkt9iyslp
https://launchpad.net/bugs/426662
Terminate SSHSubprocesses when no refs to them are left, in case .close is never called.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_remote.py
1
 
# Copyright (C) 2006-2011 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
30
30
    branch,
31
31
    bzrdir,
32
32
    config,
33
 
    controldir,
34
33
    errors,
35
 
    graph as _mod_graph,
 
34
    graph,
36
35
    inventory,
37
36
    inventory_delta,
 
37
    pack,
38
38
    remote,
39
39
    repository,
40
40
    tests,
41
 
    transport,
42
41
    treebuilder,
 
42
    urlutils,
43
43
    versionedfile,
44
44
    )
45
45
from bzrlib.branch import Branch
46
 
from bzrlib.bzrdir import (
47
 
    BzrDir,
48
 
    BzrDirFormat,
49
 
    RemoteBzrProber,
50
 
    )
 
46
from bzrlib.bzrdir import BzrDir, BzrDirFormat
51
47
from bzrlib.remote import (
52
48
    RemoteBranch,
53
49
    RemoteBranchFormat,
56
52
    RemoteRepository,
57
53
    RemoteRepositoryFormat,
58
54
    )
59
 
from bzrlib.repofmt import groupcompress_repo, knitpack_repo
 
55
from bzrlib.repofmt import groupcompress_repo, pack_repo
60
56
from bzrlib.revision import NULL_REVISION
61
 
from bzrlib.smart import medium, request
 
57
from bzrlib.smart import server, medium
62
58
from bzrlib.smart.client import _SmartClient
63
 
from bzrlib.smart.repository import (
64
 
    SmartServerRepositoryGetParentMap,
65
 
    SmartServerRepositoryGetStream_1_19,
66
 
    )
 
59
from bzrlib.smart.repository import SmartServerRepositoryGetParentMap
67
60
from bzrlib.tests import (
68
 
    test_server,
 
61
    condition_isinstance,
 
62
    split_suite_by_condition,
 
63
    multiply_tests,
69
64
    )
70
 
from bzrlib.tests.scenarios import load_tests_apply_scenarios
 
65
from bzrlib.transport import get_transport
71
66
from bzrlib.transport.memory import MemoryTransport
72
67
from bzrlib.transport.remote import (
73
68
    RemoteTransport,
74
69
    RemoteSSHTransport,
75
70
    RemoteTCPTransport,
76
 
    )
77
 
 
78
 
 
79
 
load_tests = load_tests_apply_scenarios
80
 
 
81
 
 
82
 
class BasicRemoteObjectTests(tests.TestCaseWithTransport):
83
 
 
84
 
    scenarios = [
 
71
)
 
72
 
 
73
def load_tests(standard_tests, module, loader):
 
74
    to_adapt, result = split_suite_by_condition(
 
75
        standard_tests, condition_isinstance(BasicRemoteObjectTests))
 
76
    smart_server_version_scenarios = [
85
77
        ('HPSS-v2',
86
 
            {'transport_server': test_server.SmartTCPServer_for_testing_v2_only}),
 
78
            {'transport_server': server.SmartTCPServer_for_testing_v2_only}),
87
79
        ('HPSS-v3',
88
 
            {'transport_server': test_server.SmartTCPServer_for_testing})]
89
 
 
 
80
            {'transport_server': server.SmartTCPServer_for_testing})]
 
81
    return multiply_tests(to_adapt, smart_server_version_scenarios, result)
 
82
 
 
83
 
 
84
class BasicRemoteObjectTests(tests.TestCaseWithTransport):
90
85
 
91
86
    def setUp(self):
92
87
        super(BasicRemoteObjectTests, self).setUp()
93
88
        self.transport = self.get_transport()
94
89
        # make a branch that can be opened over the smart transport
95
90
        self.local_wt = BzrDir.create_standalone_workingtree('.')
96
 
        self.addCleanup(self.transport.disconnect)
 
91
 
 
92
    def tearDown(self):
 
93
        self.transport.disconnect()
 
94
        tests.TestCaseWithTransport.tearDown(self)
97
95
 
98
96
    def test_create_remote_bzrdir(self):
99
 
        b = remote.RemoteBzrDir(self.transport, RemoteBzrDirFormat())
 
97
        b = remote.RemoteBzrDir(self.transport, remote.RemoteBzrDirFormat())
100
98
        self.assertIsInstance(b, BzrDir)
101
99
 
102
100
    def test_open_remote_branch(self):
103
101
        # open a standalone branch in the working directory
104
 
        b = remote.RemoteBzrDir(self.transport, RemoteBzrDirFormat())
 
102
        b = remote.RemoteBzrDir(self.transport, remote.RemoteBzrDirFormat())
105
103
        branch = b.open_branch()
106
104
        self.assertIsInstance(branch, Branch)
107
105
 
123
121
    def test_find_correct_format(self):
124
122
        """Should open a RemoteBzrDir over a RemoteTransport"""
125
123
        fmt = BzrDirFormat.find_format(self.transport)
126
 
        self.assertTrue(bzrdir.RemoteBzrProber
127
 
                        in controldir.ControlDirFormat._server_probers)
128
 
        self.assertIsInstance(fmt, RemoteBzrDirFormat)
 
124
        self.assertTrue(RemoteBzrDirFormat
 
125
                        in BzrDirFormat._control_server_formats)
 
126
        self.assertIsInstance(fmt, remote.RemoteBzrDirFormat)
129
127
 
130
128
    def test_open_detected_smart_format(self):
131
129
        fmt = BzrDirFormat.find_format(self.transport)
136
134
        b = BzrDir.open_from_transport(self.transport).open_branch()
137
135
        self.assertStartsWith(str(b), 'RemoteBranch(')
138
136
 
139
 
    def test_remote_bzrdir_repr(self):
140
 
        b = BzrDir.open_from_transport(self.transport)
141
 
        self.assertStartsWith(str(b), 'RemoteBzrDir(')
142
 
 
143
137
    def test_remote_branch_format_supports_stacking(self):
144
138
        t = self.transport
145
139
        self.make_branch('unstackable', format='pack-0.92')
360
354
        a given client_base and transport_base.
361
355
        """
362
356
        client_medium = medium.SmartClientMedium(client_base)
363
 
        t = transport.get_transport(transport_base)
364
 
        result = client_medium.remote_path_from_transport(t)
 
357
        transport = get_transport(transport_base)
 
358
        result = client_medium.remote_path_from_transport(transport)
365
359
        self.assertEqual(expected, result)
366
360
 
367
361
    def test_remote_path_from_transport(self):
378
372
        a given transport_base and relpath of that transport.  (Note that
379
373
        HttpTransportBase is a subclass of SmartClientMedium)
380
374
        """
381
 
        base_transport = transport.get_transport(transport_base)
 
375
        base_transport = get_transport(transport_base)
382
376
        client_medium = base_transport.get_smart_medium()
383
377
        cloned_transport = base_transport.clone(relpath)
384
378
        result = client_medium.remote_path_from_transport(cloned_transport)
419
413
        # Calling _remember_remote_is_before again with a lower value works.
420
414
        client_medium._remember_remote_is_before((1, 5))
421
415
        self.assertTrue(client_medium._is_remote_before((1, 5)))
422
 
        # If you call _remember_remote_is_before with a higher value it logs a
423
 
        # warning, and continues to remember the lower value.
424
 
        self.assertNotContainsRe(self.get_log(), '_remember_remote_is_before')
425
 
        client_medium._remember_remote_is_before((1, 9))
426
 
        self.assertContainsRe(self.get_log(), '_remember_remote_is_before')
427
 
        self.assertTrue(client_medium._is_remote_before((1, 5)))
 
416
        # You cannot call _remember_remote_is_before with a larger value.
 
417
        self.assertRaises(
 
418
            AssertionError, client_medium._remember_remote_is_before, (1, 9))
428
419
 
429
420
 
430
421
class TestBzrDirCloningMetaDir(TestRemote):
449
440
            'BzrDir.cloning_metadir', ('quack/', 'False'),
450
441
            'error', ('BranchReference',)),
451
442
        client.add_expected_call(
452
 
            'BzrDir.open_branchV3', ('quack/',),
 
443
            'BzrDir.open_branchV2', ('quack/',),
453
444
            'success', ('ref', self.get_url('referenced'))),
454
 
        a_bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
 
445
        a_bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
455
446
            _client=client)
456
447
        result = a_bzrdir.cloning_metadir()
457
448
        # We should have got a control dir matching the referenced branch.
470
461
        client.add_expected_call(
471
462
            'BzrDir.cloning_metadir', ('quack/', 'False'),
472
463
            'success', (control_name, '', ('branch', ''))),
473
 
        a_bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
 
464
        a_bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
474
465
            _client=client)
475
466
        result = a_bzrdir.cloning_metadir()
476
467
        # We should have got a reference control dir with default branch and
496
487
        client.add_expected_call(
497
488
            'BzrDir.open_2.1', ('quack/',), 'success', ('no',))
498
489
        self.assertRaises(errors.NotBranchError, RemoteBzrDir, transport,
499
 
                RemoteBzrDirFormat(), _client=client, _force_probe=True)
 
490
                remote.RemoteBzrDirFormat(), _client=client, _force_probe=True)
500
491
        self.assertFinished(client)
501
492
 
502
493
    def test_present_without_workingtree(self):
503
494
        client, transport = self.make_fake_client_and_transport()
504
495
        client.add_expected_call(
505
496
            'BzrDir.open_2.1', ('quack/',), 'success', ('yes', 'no'))
506
 
        bd = RemoteBzrDir(transport, RemoteBzrDirFormat(),
 
497
        bd = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
507
498
            _client=client, _force_probe=True)
508
499
        self.assertIsInstance(bd, RemoteBzrDir)
509
500
        self.assertFalse(bd.has_workingtree())
514
505
        client, transport = self.make_fake_client_and_transport()
515
506
        client.add_expected_call(
516
507
            'BzrDir.open_2.1', ('quack/',), 'success', ('yes', 'yes'))
517
 
        bd = RemoteBzrDir(transport, RemoteBzrDirFormat(),
 
508
        bd = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
518
509
            _client=client, _force_probe=True)
519
510
        self.assertIsInstance(bd, RemoteBzrDir)
520
511
        self.assertTrue(bd.has_workingtree())
527
518
            'BzrDir.open_2.1', ('quack/',), 'unknown', ('BzrDir.open_2.1',))
528
519
        client.add_expected_call(
529
520
            'BzrDir.open', ('quack/',), 'success', ('yes',))
530
 
        bd = RemoteBzrDir(transport, RemoteBzrDirFormat(),
531
 
            _client=client, _force_probe=True)
532
 
        self.assertIsInstance(bd, RemoteBzrDir)
533
 
        self.assertFinished(client)
534
 
 
535
 
    def test_backwards_compat_hpss_v2(self):
536
 
        client, transport = self.make_fake_client_and_transport()
537
 
        # Monkey-patch fake client to simulate real-world behaviour with v2
538
 
        # server: upon first RPC call detect the protocol version, and because
539
 
        # the version is 2 also do _remember_remote_is_before((1, 6)) before
540
 
        # continuing with the RPC.
541
 
        orig_check_call = client._check_call
542
 
        def check_call(method, args):
543
 
            client._medium._protocol_version = 2
544
 
            client._medium._remember_remote_is_before((1, 6))
545
 
            client._check_call = orig_check_call
546
 
            client._check_call(method, args)
547
 
        client._check_call = check_call
548
 
        client.add_expected_call(
549
 
            'BzrDir.open_2.1', ('quack/',), 'unknown', ('BzrDir.open_2.1',))
550
 
        client.add_expected_call(
551
 
            'BzrDir.open', ('quack/',), 'success', ('yes',))
552
 
        bd = RemoteBzrDir(transport, RemoteBzrDirFormat(),
 
521
        bd = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
553
522
            _client=client, _force_probe=True)
554
523
        self.assertIsInstance(bd, RemoteBzrDir)
555
524
        self.assertFinished(client)
562
531
        self.make_branch('.')
563
532
        a_dir = BzrDir.open(self.get_url('.'))
564
533
        self.reset_smart_call_log()
565
 
        verb = 'BzrDir.open_branchV3'
 
534
        verb = 'BzrDir.open_branchV2'
566
535
        self.disable_verb(verb)
567
536
        format = a_dir.open_branch()
568
537
        call_count = len([call for call in self.hpss_calls if
578
547
        transport = transport.clone('quack')
579
548
        client = FakeClient(transport.base)
580
549
        client.add_expected_call(
581
 
            'BzrDir.open_branchV3', ('quack/',),
 
550
            'BzrDir.open_branchV2', ('quack/',),
582
551
            'success', ('branch', branch_network_name))
583
552
        client.add_expected_call(
584
553
            'BzrDir.find_repositoryV3', ('quack/',),
586
555
        client.add_expected_call(
587
556
            'Branch.get_stacked_on_url', ('quack/',),
588
557
            'error', ('NotStacked',))
589
 
        bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
 
558
        bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
590
559
            _client=client)
591
560
        result = bzrdir.open_branch()
592
561
        self.assertIsInstance(result, RemoteBranch)
599
568
        transport = transport.clone('quack')
600
569
        client = FakeClient(transport.base)
601
570
        client.add_error_response('nobranch')
602
 
        bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
 
571
        bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
603
572
            _client=client)
604
573
        self.assertRaises(errors.NotBranchError, bzrdir.open_branch)
605
574
        self.assertEqual(
606
 
            [('call', 'BzrDir.open_branchV3', ('quack/',))],
 
575
            [('call', 'BzrDir.open_branchV2', ('quack/',))],
607
576
            client._calls)
608
577
 
609
578
    def test__get_tree_branch(self):
610
579
        # _get_tree_branch is a form of open_branch, but it should only ask for
611
580
        # branch opening, not any other network requests.
612
581
        calls = []
613
 
        def open_branch(name=None):
 
582
        def open_branch():
614
583
            calls.append("Called")
615
584
            return "a-branch"
616
585
        transport = MemoryTransport()
617
586
        # no requests on the network - catches other api calls being made.
618
587
        client = FakeClient(transport.base)
619
 
        bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
 
588
        bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
620
589
            _client=client)
621
590
        # patch the open_branch call to record that it was called.
622
591
        bzrdir.open_branch = open_branch
633
602
        network_name = reference_format.network_name()
634
603
        branch_network_name = self.get_branch_format().network_name()
635
604
        client.add_expected_call(
636
 
            'BzrDir.open_branchV3', ('~hello/',),
 
605
            'BzrDir.open_branchV2', ('~hello/',),
637
606
            'success', ('branch', branch_network_name))
638
607
        client.add_expected_call(
639
608
            'BzrDir.find_repositoryV3', ('~hello/',),
641
610
        client.add_expected_call(
642
611
            'Branch.get_stacked_on_url', ('~hello/',),
643
612
            'error', ('NotStacked',))
644
 
        bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
 
613
        bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
645
614
            _client=client)
646
615
        result = bzrdir.open_branch()
647
616
        self.assertFinished(client)
664
633
        client.add_success_response(
665
634
            'ok', '', rich_response, subtree_response, external_lookup,
666
635
            network_name)
667
 
        bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
 
636
        bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
668
637
            _client=client)
669
638
        result = bzrdir.open_repository()
670
639
        self.assertEqual(
687
656
        old.
688
657
        """
689
658
        self.assertRaises(errors.NotBranchError,
690
 
            RemoteBzrProber.probe_transport, OldServerTransport())
 
659
            RemoteBzrDirFormat.probe_transport, OldServerTransport())
691
660
 
692
661
 
693
662
class TestBzrDirCreateBranch(TestRemote):
716
685
            'BzrDir.create_branch', ('quack/', network_name),
717
686
            'success', ('ok', network_name, '', 'no', 'no', 'yes',
718
687
            reference_repo_name))
719
 
        a_bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
 
688
        a_bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
720
689
            _client=client)
721
690
        branch = a_bzrdir.create_branch()
722
691
        # We should have got a remote branch
725
694
        format = branch._format
726
695
        self.assertEqual(network_name, format.network_name())
727
696
 
728
 
    def test_already_open_repo_and_reused_medium(self):
729
 
        """Bug 726584: create_branch(..., repository=repo) should work
730
 
        regardless of what the smart medium's base URL is.
731
 
        """
732
 
        self.transport_server = test_server.SmartTCPServer_for_testing
733
 
        transport = self.get_transport('.')
734
 
        repo = self.make_repository('quack')
735
 
        # Client's medium rooted a transport root (not at the bzrdir)
736
 
        client = FakeClient(transport.base)
737
 
        transport = transport.clone('quack')
738
 
        reference_bzrdir_format = bzrdir.format_registry.get('default')()
739
 
        reference_format = reference_bzrdir_format.get_branch_format()
740
 
        network_name = reference_format.network_name()
741
 
        reference_repo_fmt = reference_bzrdir_format.repository_format
742
 
        reference_repo_name = reference_repo_fmt.network_name()
743
 
        client.add_expected_call(
744
 
            'BzrDir.create_branch', ('extra/quack/', network_name),
745
 
            'success', ('ok', network_name, '', 'no', 'no', 'yes',
746
 
            reference_repo_name))
747
 
        a_bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
748
 
            _client=client)
749
 
        branch = a_bzrdir.create_branch(repository=repo)
750
 
        # We should have got a remote branch
751
 
        self.assertIsInstance(branch, remote.RemoteBranch)
752
 
        # its format should have the settings from the response
753
 
        format = branch._format
754
 
        self.assertEqual(network_name, format.network_name())
755
 
 
756
697
 
757
698
class TestBzrDirCreateRepository(TestRemote):
758
699
 
779
720
                'Bazaar repository format 2a (needs bzr 1.16 or later)\n',
780
721
                'False'),
781
722
            'success', ('ok', 'yes', 'yes', 'yes', network_name))
782
 
        a_bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
 
723
        a_bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
783
724
            _client=client)
784
725
        repo = a_bzrdir.create_repository()
785
726
        # We should have got a remote repository
814
755
        client.add_success_response('stat', '0', '65535')
815
756
        remote_transport = RemoteTransport(server_url + 'quack/', medium=False,
816
757
            _client=client)
817
 
        bzrdir = RemoteBzrDir(remote_transport, RemoteBzrDirFormat(),
 
758
        bzrdir = RemoteBzrDir(remote_transport, remote.RemoteBzrDirFormat(),
818
759
            _client=client)
819
760
        repo = bzrdir.open_repository()
820
761
        self.assertEqual(
847
788
        client.add_success_response('stat', '0', '65535')
848
789
        remote_transport = RemoteTransport(server_url + 'quack/', medium=False,
849
790
            _client=client)
850
 
        bzrdir = RemoteBzrDir(remote_transport, RemoteBzrDirFormat(),
 
791
        bzrdir = RemoteBzrDir(remote_transport, remote.RemoteBzrDirFormat(),
851
792
            _client=client)
852
793
        repo = bzrdir.open_repository()
853
794
        self.assertEqual(
868
809
        transport = transport.clone('quack')
869
810
        client = FakeClient(transport.base)
870
811
        client.add_success_response('ok', '', 'no', 'no', 'no', network_name)
871
 
        bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
 
812
        bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
872
813
            _client=client)
873
814
        repo = bzrdir.open_repository()
874
815
        self.assertEqual(
881
822
 
882
823
    def test_success(self):
883
824
        """Simple test for typical successful call."""
884
 
        fmt = RemoteBzrDirFormat()
 
825
        fmt = bzrdir.RemoteBzrDirFormat()
885
826
        default_format_name = BzrDirFormat.get_default_format().network_name()
886
827
        transport = self.get_transport()
887
828
        client = FakeClient(transport.base)
903
844
        """Error responses are translated, e.g. 'PermissionDenied' raises the
904
845
        corresponding error from the client.
905
846
        """
906
 
        fmt = RemoteBzrDirFormat()
 
847
        fmt = bzrdir.RemoteBzrDirFormat()
907
848
        default_format_name = BzrDirFormat.get_default_format().network_name()
908
849
        transport = self.get_transport()
909
850
        client = FakeClient(transport.base)
927
868
        """Integration test for error translation."""
928
869
        transport = self.make_smart_server('foo')
929
870
        transport = transport.clone('no-such-path')
930
 
        fmt = RemoteBzrDirFormat()
 
871
        fmt = bzrdir.RemoteBzrDirFormat()
931
872
        err = self.assertRaises(errors.NoSuchFile,
932
873
            fmt.initialize_on_transport_ex, transport, create_prefix=False)
933
874
 
964
905
 
965
906
    def make_remote_bzrdir(self, transport, client):
966
907
        """Make a RemotebzrDir using 'client' as the _client."""
967
 
        return RemoteBzrDir(transport, RemoteBzrDirFormat(),
 
908
        return RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
968
909
            _client=client)
969
910
 
970
911
 
1172
1113
            [('set_tags_bytes', 'tags bytes')] * 2, real_branch.calls)
1173
1114
 
1174
1115
 
1175
 
class TestBranchHeadsToFetch(RemoteBranchTestCase):
1176
 
 
1177
 
    def test_uses_last_revision_info_and_tags_by_default(self):
1178
 
        transport = MemoryTransport()
1179
 
        client = FakeClient(transport.base)
1180
 
        client.add_expected_call(
1181
 
            'Branch.get_stacked_on_url', ('quack/',),
1182
 
            'error', ('NotStacked',))
1183
 
        client.add_expected_call(
1184
 
            'Branch.last_revision_info', ('quack/',),
1185
 
            'success', ('ok', '1', 'rev-tip'))
1186
 
        client.add_expected_call(
1187
 
            'Branch.get_config_file', ('quack/',),
1188
 
            'success', ('ok',), '')
1189
 
        transport.mkdir('quack')
1190
 
        transport = transport.clone('quack')
1191
 
        branch = self.make_remote_branch(transport, client)
1192
 
        result = branch.heads_to_fetch()
1193
 
        self.assertFinished(client)
1194
 
        self.assertEqual((set(['rev-tip']), set()), result)
1195
 
 
1196
 
    def test_uses_last_revision_info_and_tags_when_set(self):
1197
 
        transport = MemoryTransport()
1198
 
        client = FakeClient(transport.base)
1199
 
        client.add_expected_call(
1200
 
            'Branch.get_stacked_on_url', ('quack/',),
1201
 
            'error', ('NotStacked',))
1202
 
        client.add_expected_call(
1203
 
            'Branch.last_revision_info', ('quack/',),
1204
 
            'success', ('ok', '1', 'rev-tip'))
1205
 
        client.add_expected_call(
1206
 
            'Branch.get_config_file', ('quack/',),
1207
 
            'success', ('ok',), 'branch.fetch_tags = True')
1208
 
        # XXX: this will break if the default format's serialization of tags
1209
 
        # changes, or if the RPC for fetching tags changes from get_tags_bytes.
1210
 
        client.add_expected_call(
1211
 
            'Branch.get_tags_bytes', ('quack/',),
1212
 
            'success', ('d5:tag-17:rev-foo5:tag-27:rev-bare',))
1213
 
        transport.mkdir('quack')
1214
 
        transport = transport.clone('quack')
1215
 
        branch = self.make_remote_branch(transport, client)
1216
 
        result = branch.heads_to_fetch()
1217
 
        self.assertFinished(client)
1218
 
        self.assertEqual(
1219
 
            (set(['rev-tip']), set(['rev-foo', 'rev-bar'])), result)
1220
 
 
1221
 
    def test_uses_rpc_for_formats_with_non_default_heads_to_fetch(self):
1222
 
        transport = MemoryTransport()
1223
 
        client = FakeClient(transport.base)
1224
 
        client.add_expected_call(
1225
 
            'Branch.get_stacked_on_url', ('quack/',),
1226
 
            'error', ('NotStacked',))
1227
 
        client.add_expected_call(
1228
 
            'Branch.heads_to_fetch', ('quack/',),
1229
 
            'success', (['tip'], ['tagged-1', 'tagged-2']))
1230
 
        transport.mkdir('quack')
1231
 
        transport = transport.clone('quack')
1232
 
        branch = self.make_remote_branch(transport, client)
1233
 
        branch._format._use_default_local_heads_to_fetch = lambda: False
1234
 
        result = branch.heads_to_fetch()
1235
 
        self.assertFinished(client)
1236
 
        self.assertEqual((set(['tip']), set(['tagged-1', 'tagged-2'])), result)
1237
 
 
1238
 
    def make_branch_with_tags(self):
1239
 
        self.setup_smart_server_with_call_log()
1240
 
        # Make a branch with a single revision.
1241
 
        builder = self.make_branch_builder('foo')
1242
 
        builder.start_series()
1243
 
        builder.build_snapshot('tip', None, [
1244
 
            ('add', ('', 'root-id', 'directory', ''))])
1245
 
        builder.finish_series()
1246
 
        branch = builder.get_branch()
1247
 
        # Add two tags to that branch
1248
 
        branch.tags.set_tag('tag-1', 'rev-1')
1249
 
        branch.tags.set_tag('tag-2', 'rev-2')
1250
 
        return branch
1251
 
 
1252
 
    def test_backwards_compatible(self):
1253
 
        branch = self.make_branch_with_tags()
1254
 
        c = branch.get_config()
1255
 
        c.set_user_option('branch.fetch_tags', 'True')
1256
 
        self.addCleanup(branch.lock_read().unlock)
1257
 
        # Disable the heads_to_fetch verb
1258
 
        verb = 'Branch.heads_to_fetch'
1259
 
        self.disable_verb(verb)
1260
 
        self.reset_smart_call_log()
1261
 
        result = branch.heads_to_fetch()
1262
 
        self.assertEqual((set(['tip']), set(['rev-1', 'rev-2'])), result)
1263
 
        self.assertEqual(
1264
 
            ['Branch.last_revision_info', 'Branch.get_config_file',
1265
 
             'Branch.get_tags_bytes'],
1266
 
            [call.call.method for call in self.hpss_calls])
1267
 
 
1268
 
    def test_backwards_compatible_no_tags(self):
1269
 
        branch = self.make_branch_with_tags()
1270
 
        c = branch.get_config()
1271
 
        c.set_user_option('branch.fetch_tags', 'False')
1272
 
        self.addCleanup(branch.lock_read().unlock)
1273
 
        # Disable the heads_to_fetch verb
1274
 
        verb = 'Branch.heads_to_fetch'
1275
 
        self.disable_verb(verb)
1276
 
        self.reset_smart_call_log()
1277
 
        result = branch.heads_to_fetch()
1278
 
        self.assertEqual((set(['tip']), set()), result)
1279
 
        self.assertEqual(
1280
 
            ['Branch.last_revision_info', 'Branch.get_config_file'],
1281
 
            [call.call.method for call in self.hpss_calls])
1282
 
 
1283
 
 
1284
1116
class TestBranchLastRevisionInfo(RemoteBranchTestCase):
1285
1117
 
1286
1118
    def test_empty_branch(self):
1341
1173
        client.add_expected_call(
1342
1174
            'Branch.get_stacked_on_url', ('stacked/',),
1343
1175
            'success', ('ok', vfs_url))
1344
 
        bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
 
1176
        bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
1345
1177
            _client=client)
1346
1178
        repo_fmt = remote.RemoteRepositoryFormat()
1347
1179
        repo_fmt._custom_format = stacked_branch.repository._format
1358
1190
        client = FakeClient(self.get_url())
1359
1191
        branch_network_name = self.get_branch_format().network_name()
1360
1192
        client.add_expected_call(
1361
 
            'BzrDir.open_branchV3', ('stacked/',),
 
1193
            'BzrDir.open_branchV2', ('stacked/',),
1362
1194
            'success', ('branch', branch_network_name))
1363
1195
        client.add_expected_call(
1364
1196
            'BzrDir.find_repositoryV3', ('stacked/',),
1374
1206
        # this will also do vfs access, but that goes direct to the transport
1375
1207
        # and isn't seen by the FakeClient.
1376
1208
        bzrdir = RemoteBzrDir(self.get_transport('stacked'),
1377
 
            RemoteBzrDirFormat(), _client=client)
 
1209
            remote.RemoteBzrDirFormat(), _client=client)
1378
1210
        branch = bzrdir.open_branch()
1379
1211
        result = branch.get_stacked_on_url()
1380
1212
        self.assertEqual('../base', result)
1386
1218
            len(branch.repository._real_repository._fallback_repositories))
1387
1219
 
1388
1220
    def test_get_stacked_on_real_branch(self):
1389
 
        base_branch = self.make_branch('base')
1390
 
        stacked_branch = self.make_branch('stacked')
 
1221
        base_branch = self.make_branch('base', format='1.6')
 
1222
        stacked_branch = self.make_branch('stacked', format='1.6')
1391
1223
        stacked_branch.set_stacked_on_url('../base')
1392
1224
        reference_format = self.get_repo_format()
1393
1225
        network_name = reference_format.network_name()
1394
1226
        client = FakeClient(self.get_url())
1395
1227
        branch_network_name = self.get_branch_format().network_name()
1396
1228
        client.add_expected_call(
1397
 
            'BzrDir.open_branchV3', ('stacked/',),
 
1229
            'BzrDir.open_branchV2', ('stacked/',),
1398
1230
            'success', ('branch', branch_network_name))
1399
1231
        client.add_expected_call(
1400
1232
            'BzrDir.find_repositoryV3', ('stacked/',),
1401
 
            'success', ('ok', '', 'yes', 'no', 'yes', network_name))
 
1233
            'success', ('ok', '', 'no', 'no', 'yes', network_name))
1402
1234
        # called twice, once from constructor and then again by us
1403
1235
        client.add_expected_call(
1404
1236
            'Branch.get_stacked_on_url', ('stacked/',),
1407
1239
            'Branch.get_stacked_on_url', ('stacked/',),
1408
1240
            'success', ('ok', '../base'))
1409
1241
        bzrdir = RemoteBzrDir(self.get_transport('stacked'),
1410
 
            RemoteBzrDirFormat(), _client=client)
 
1242
            remote.RemoteBzrDirFormat(), _client=client)
1411
1243
        branch = bzrdir.open_branch()
1412
1244
        result = branch.get_stacked_on_url()
1413
1245
        self.assertEqual('../base', result)
1421
1253
class TestBranchSetLastRevision(RemoteBranchTestCase):
1422
1254
 
1423
1255
    def test_set_empty(self):
1424
 
        # _set_last_revision_info('null:') is translated to calling
 
1256
        # set_revision_history([]) is translated to calling
1425
1257
        # Branch.set_last_revision(path, '') on the wire.
1426
1258
        transport = MemoryTransport()
1427
1259
        transport.mkdir('branch')
1449
1281
        # unnecessarily invokes _ensure_real upon a call to lock_write.
1450
1282
        branch._ensure_real = lambda: None
1451
1283
        branch.lock_write()
1452
 
        result = branch._set_last_revision(NULL_REVISION)
 
1284
        result = branch.set_revision_history([])
1453
1285
        branch.unlock()
1454
1286
        self.assertEqual(None, result)
1455
1287
        self.assertFinished(client)
1456
1288
 
1457
1289
    def test_set_nonempty(self):
1458
 
        # set_last_revision_info(N, rev-idN) is translated to calling
 
1290
        # set_revision_history([rev-id1, ..., rev-idN]) is translated to calling
1459
1291
        # Branch.set_last_revision(path, rev-idN) on the wire.
1460
1292
        transport = MemoryTransport()
1461
1293
        transport.mkdir('branch')
1487
1319
        branch._ensure_real = lambda: None
1488
1320
        # Lock the branch, reset the record of remote calls.
1489
1321
        branch.lock_write()
1490
 
        result = branch._set_last_revision('rev-id2')
 
1322
        result = branch.set_revision_history(['rev-id1', 'rev-id2'])
1491
1323
        branch.unlock()
1492
1324
        self.assertEqual(None, result)
1493
1325
        self.assertFinished(client)
1523
1355
        branch = self.make_remote_branch(transport, client)
1524
1356
        branch.lock_write()
1525
1357
        self.assertRaises(
1526
 
            errors.NoSuchRevision, branch._set_last_revision, 'rev-id')
 
1358
            errors.NoSuchRevision, branch.set_revision_history, ['rev-id'])
1527
1359
        branch.unlock()
1528
1360
        self.assertFinished(client)
1529
1361
 
1560
1392
        branch._ensure_real = lambda: None
1561
1393
        branch.lock_write()
1562
1394
        # The 'TipChangeRejected' error response triggered by calling
1563
 
        # set_last_revision_info causes a TipChangeRejected exception.
 
1395
        # set_revision_history causes a TipChangeRejected exception.
1564
1396
        err = self.assertRaises(
1565
 
            errors.TipChangeRejected,
1566
 
            branch._set_last_revision, 'rev-id')
 
1397
            errors.TipChangeRejected, branch.set_revision_history, ['rev-id'])
1567
1398
        # The UTF-8 message from the response has been decoded into a unicode
1568
1399
        # object.
1569
1400
        self.assertIsInstance(err.msg, unicode)
1757
1588
    def test_get_multi_line_branch_conf(self):
1758
1589
        # Make sure that multiple-line branch.conf files are supported
1759
1590
        #
1760
 
        # https://bugs.launchpad.net/bzr/+bug/354075
 
1591
        # https://bugs.edge.launchpad.net/bzr/+bug/354075
1761
1592
        client = FakeClient()
1762
1593
        client.add_expected_call(
1763
1594
            'Branch.get_stacked_on_url', ('memory:///',),
1791
1622
        branch.unlock()
1792
1623
        self.assertFinished(client)
1793
1624
 
1794
 
    def test_set_option_with_dict(self):
1795
 
        client = FakeClient()
1796
 
        client.add_expected_call(
1797
 
            'Branch.get_stacked_on_url', ('memory:///',),
1798
 
            'error', ('NotStacked',),)
1799
 
        client.add_expected_call(
1800
 
            'Branch.lock_write', ('memory:///', '', ''),
1801
 
            'success', ('ok', 'branch token', 'repo token'))
1802
 
        encoded_dict_value = 'd5:ascii1:a11:unicode \xe2\x8c\x9a3:\xe2\x80\xbde'
1803
 
        client.add_expected_call(
1804
 
            'Branch.set_config_option_dict', ('memory:///', 'branch token',
1805
 
            'repo token', encoded_dict_value, 'foo', ''),
1806
 
            'success', ())
1807
 
        client.add_expected_call(
1808
 
            'Branch.unlock', ('memory:///', 'branch token', 'repo token'),
1809
 
            'success', ('ok',))
1810
 
        transport = MemoryTransport()
1811
 
        branch = self.make_remote_branch(transport, client)
1812
 
        branch.lock_write()
1813
 
        config = branch._get_config()
1814
 
        config.set_option(
1815
 
            {'ascii': 'a', u'unicode \N{WATCH}': u'\N{INTERROBANG}'},
1816
 
            'foo')
1817
 
        branch.unlock()
1818
 
        self.assertFinished(client)
1819
 
 
1820
1625
    def test_backwards_compat_set_option(self):
1821
1626
        self.setup_smart_server_with_call_log()
1822
1627
        branch = self.make_branch('.')
1829
1634
        self.assertLength(10, self.hpss_calls)
1830
1635
        self.assertEqual('value', branch._get_config().get_option('name'))
1831
1636
 
1832
 
    def test_backwards_compat_set_option_with_dict(self):
1833
 
        self.setup_smart_server_with_call_log()
1834
 
        branch = self.make_branch('.')
1835
 
        verb = 'Branch.set_config_option_dict'
1836
 
        self.disable_verb(verb)
1837
 
        branch.lock_write()
1838
 
        self.addCleanup(branch.unlock)
1839
 
        self.reset_smart_call_log()
1840
 
        config = branch._get_config()
1841
 
        value_dict = {'ascii': 'a', u'unicode \N{WATCH}': u'\N{INTERROBANG}'}
1842
 
        config.set_option(value_dict, 'name')
1843
 
        self.assertLength(10, self.hpss_calls)
1844
 
        self.assertEqual(value_dict, branch._get_config().get_option('name'))
1845
 
 
1846
1637
 
1847
1638
class TestBranchLockWrite(RemoteBranchTestCase):
1848
1639
 
1984
1775
        client = FakeClient(transport.base)
1985
1776
        transport = transport.clone(transport_path)
1986
1777
        # we do not want bzrdir to make any remote calls
1987
 
        bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
 
1778
        bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
1988
1779
            _client=False)
1989
1780
        repo = RemoteRepository(bzrdir, None, _client=client)
1990
1781
        return repo, client
1998
1789
 
1999
1790
    def test_get_format_description(self):
2000
1791
        remote_format = RemoteBranchFormat()
2001
 
        real_format = branch.format_registry.get_default()
 
1792
        real_format = branch.BranchFormat.get_default_format()
2002
1793
        remote_format._network_name = real_format.network_name()
2003
1794
        self.assertEqual(remoted_description(real_format),
2004
1795
            remote_format.get_format_description())
2007
1798
class TestRepositoryFormat(TestRemoteRepository):
2008
1799
 
2009
1800
    def test_fast_delta(self):
2010
 
        true_name = groupcompress_repo.RepositoryFormat2a().network_name()
 
1801
        true_name = groupcompress_repo.RepositoryFormatCHK1().network_name()
2011
1802
        true_format = RemoteRepositoryFormat()
2012
1803
        true_format._network_name = true_name
2013
1804
        self.assertEqual(True, true_format.fast_deltas)
2014
 
        false_name = knitpack_repo.RepositoryFormatKnitPack1().network_name()
 
1805
        false_name = pack_repo.RepositoryFormatKnitPack1().network_name()
2015
1806
        false_format = RemoteRepositoryFormat()
2016
1807
        false_format._network_name = false_name
2017
1808
        self.assertEqual(False, false_format.fast_deltas)
2018
1809
 
2019
1810
    def test_get_format_description(self):
2020
1811
        remote_repo_format = RemoteRepositoryFormat()
2021
 
        real_format = repository.format_registry.get_default()
 
1812
        real_format = repository.RepositoryFormat.get_default_format()
2022
1813
        remote_repo_format._network_name = real_format.network_name()
2023
1814
        self.assertEqual(remoted_description(real_format),
2024
1815
            remote_repo_format.get_format_description())
2213
2004
        self.assertLength(1, self.hpss_calls)
2214
2005
 
2215
2006
    def disableExtraResults(self):
2216
 
        self.overrideAttr(SmartServerRepositoryGetParentMap,
2217
 
                          'no_extra_results', True)
 
2007
        old_flag = SmartServerRepositoryGetParentMap.no_extra_results
 
2008
        SmartServerRepositoryGetParentMap.no_extra_results = True
 
2009
        def reset_values():
 
2010
            SmartServerRepositoryGetParentMap.no_extra_results = old_flag
 
2011
        self.addCleanup(reset_values)
2218
2012
 
2219
2013
    def test_null_cached_missing_and_stop_key(self):
2220
2014
        self.setup_smart_server_with_call_log()
2279
2073
 
2280
2074
    def test_allows_new_revisions(self):
2281
2075
        """get_parent_map's results can be updated by commit."""
2282
 
        smart_server = test_server.SmartTCPServer_for_testing()
 
2076
        smart_server = server.SmartTCPServer_for_testing()
2283
2077
        self.start_server(smart_server)
2284
2078
        self.make_branch('branch')
2285
2079
        branch = Branch.open(smart_server.get_url() + '/branch')
2395
2189
        """
2396
2190
        # Make a repo with a fallback repo, both using a FakeClient.
2397
2191
        format = remote.response_tuple_to_repo_format(
2398
 
            ('yes', 'no', 'yes', self.get_repo_format().network_name()))
 
2192
            ('yes', 'no', 'yes', 'fake-network-name'))
2399
2193
        repo, client = self.setup_fake_client_and_repository('quack')
2400
2194
        repo._format = format
2401
2195
        fallback_repo, ignored = self.setup_fake_client_and_repository(
2402
2196
            'fallback')
2403
2197
        fallback_repo._client = client
2404
 
        fallback_repo._format = format
2405
2198
        repo.add_fallback_repository(fallback_repo)
2406
2199
        # First the client should ask the primary repo
2407
2200
        client.add_expected_call(
2436
2229
        self.setup_smart_server_with_call_log()
2437
2230
        tree = self.make_branch_and_memory_tree('.')
2438
2231
        tree.lock_write()
2439
 
        tree.add('')
2440
2232
        rev1 = tree.commit('First')
2441
2233
        rev2 = tree.commit('Second')
2442
2234
        tree.unlock()
2481
2273
        transport_path = 'quack'
2482
2274
        repo, client = self.setup_fake_client_and_repository(transport_path)
2483
2275
        client.add_success_response('ok', 'a token')
2484
 
        token = repo.lock_write().repository_token
 
2276
        result = repo.lock_write()
2485
2277
        self.assertEqual(
2486
2278
            [('call', 'Repository.lock_write', ('quack/', ''))],
2487
2279
            client._calls)
2488
 
        self.assertEqual('a token', token)
 
2280
        self.assertEqual('a token', result)
2489
2281
 
2490
2282
    def test_lock_write_already_locked(self):
2491
2283
        transport_path = 'quack'
2582
2374
        the client is finished.
2583
2375
        """
2584
2376
        sink = repo._get_sink()
2585
 
        fmt = repository.format_registry.get_default()
 
2377
        fmt = repository.RepositoryFormat.get_default_format()
2586
2378
        resume_tokens, missing_keys = sink.insert_stream([], fmt, [])
2587
2379
        self.assertEqual([], resume_tokens)
2588
2380
        self.assertEqual(set(), missing_keys)
2688
2480
                return True
2689
2481
        repo._real_repository = FakeRealRepository()
2690
2482
        sink = repo._get_sink()
2691
 
        fmt = repository.format_registry.get_default()
 
2483
        fmt = repository.RepositoryFormat.get_default_format()
2692
2484
        stream = self.make_stream_with_inv_deltas(fmt)
2693
2485
        resume_tokens, missing_keys = sink.insert_stream(stream, fmt, [])
2694
2486
        # Every record from the first inventory delta should have been sent to
2829
2621
    """RemoteRepository.copy_content_into optimizations"""
2830
2622
 
2831
2623
    def test_copy_content_remote_to_local(self):
2832
 
        self.transport_server = test_server.SmartTCPServer_for_testing
 
2624
        self.transport_server = server.SmartTCPServer_for_testing
2833
2625
        src_repo = self.make_repository('repo1')
2834
2626
        src_repo = repository.Repository.open(self.get_url('repo1'))
2835
2627
        # At the moment the tarball-based copy_content_into can't write back
2914
2706
             ('pack collection autopack',)],
2915
2707
            client._calls)
2916
2708
 
2917
 
    def test_oom_error_reporting(self):
2918
 
        """An out-of-memory condition on the server is reported clearly"""
2919
 
        transport_path = 'quack'
2920
 
        repo, client = self.setup_fake_client_and_repository(transport_path)
2921
 
        client.add_expected_call(
2922
 
            'PackRepository.autopack', ('quack/',),
2923
 
            'error', ('MemoryError',))
2924
 
        err = self.assertRaises(errors.BzrError, repo.autopack)
2925
 
        self.assertContainsRe(str(err), "^remote server out of mem")
2926
 
 
2927
2709
 
2928
2710
class TestErrorTranslationBase(tests.TestCaseWithMemoryTransport):
2929
2711
    """Base class for unit tests for bzrlib.remote._translate_error."""
2993
2775
        expected_error = errors.NotBranchError(path=bzrdir.root_transport.base)
2994
2776
        self.assertEqual(expected_error, translated_error)
2995
2777
 
2996
 
    def test_nobranch_one_arg(self):
2997
 
        bzrdir = self.make_bzrdir('')
2998
 
        translated_error = self.translateTuple(
2999
 
            ('nobranch', 'extra detail'), bzrdir=bzrdir)
3000
 
        expected_error = errors.NotBranchError(
3001
 
            path=bzrdir.root_transport.base,
3002
 
            detail='extra detail')
3003
 
        self.assertEqual(expected_error, translated_error)
3004
 
 
3005
 
    def test_norepository(self):
3006
 
        bzrdir = self.make_bzrdir('')
3007
 
        translated_error = self.translateTuple(('norepository',),
3008
 
            bzrdir=bzrdir)
3009
 
        expected_error = errors.NoRepositoryPresent(bzrdir)
3010
 
        self.assertEqual(expected_error, translated_error)
3011
 
 
3012
2778
    def test_LockContention(self):
3013
2779
        translated_error = self.translateTuple(('LockContention',))
3014
2780
        expected_error = errors.LockContention('(remote lock)')
3042
2808
        expected_error = errors.DivergedBranches(branch, other_branch)
3043
2809
        self.assertEqual(expected_error, translated_error)
3044
2810
 
3045
 
    def test_NotStacked(self):
3046
 
        branch = self.make_branch('')
3047
 
        translated_error = self.translateTuple(('NotStacked',), branch=branch)
3048
 
        expected_error = errors.NotStacked(branch)
3049
 
        self.assertEqual(expected_error, translated_error)
3050
 
 
3051
2811
    def test_ReadError_no_args(self):
3052
2812
        path = 'a path'
3053
2813
        translated_error = self.translateTuple(('ReadError',), path=path)
3069
2829
 
3070
2830
    def test_PermissionDenied_no_args(self):
3071
2831
        path = 'a path'
3072
 
        translated_error = self.translateTuple(('PermissionDenied',),
3073
 
            path=path)
 
2832
        translated_error = self.translateTuple(('PermissionDenied',), path=path)
3074
2833
        expected_error = errors.PermissionDenied(path)
3075
2834
        self.assertEqual(expected_error, translated_error)
3076
2835
 
3099
2858
        expected_error = errors.PermissionDenied(path, extra)
3100
2859
        self.assertEqual(expected_error, translated_error)
3101
2860
 
3102
 
    # GZ 2011-03-02: TODO test for PermissionDenied with non-ascii 'extra'
3103
 
 
3104
 
    def test_NoSuchFile_context_path(self):
3105
 
        local_path = "local path"
3106
 
        translated_error = self.translateTuple(('ReadError', "remote path"),
3107
 
            path=local_path)
3108
 
        expected_error = errors.ReadError(local_path)
3109
 
        self.assertEqual(expected_error, translated_error)
3110
 
 
3111
 
    def test_NoSuchFile_without_context(self):
3112
 
        remote_path = "remote path"
3113
 
        translated_error = self.translateTuple(('ReadError', remote_path))
3114
 
        expected_error = errors.ReadError(remote_path)
3115
 
        self.assertEqual(expected_error, translated_error)
3116
 
 
3117
 
    def test_ReadOnlyError(self):
3118
 
        translated_error = self.translateTuple(('ReadOnlyError',))
3119
 
        expected_error = errors.TransportNotPossible("readonly transport")
3120
 
        self.assertEqual(expected_error, translated_error)
3121
 
 
3122
 
    def test_MemoryError(self):
3123
 
        translated_error = self.translateTuple(('MemoryError',))
3124
 
        self.assertStartsWith(str(translated_error),
3125
 
            "remote server out of memory")
3126
 
 
3127
 
    def test_generic_IndexError_no_classname(self):
3128
 
        err = errors.ErrorFromSmartServer(('error', "list index out of range"))
3129
 
        translated_error = self.translateErrorFromSmartServer(err)
3130
 
        expected_error = errors.UnknownErrorFromSmartServer(err)
3131
 
        self.assertEqual(expected_error, translated_error)
3132
 
 
3133
 
    # GZ 2011-03-02: TODO test generic non-ascii error string
3134
 
 
3135
 
    def test_generic_KeyError(self):
3136
 
        err = errors.ErrorFromSmartServer(('error', 'KeyError', "1"))
3137
 
        translated_error = self.translateErrorFromSmartServer(err)
3138
 
        expected_error = errors.UnknownErrorFromSmartServer(err)
3139
 
        self.assertEqual(expected_error, translated_error)
3140
 
 
3141
2861
 
3142
2862
class TestErrorTranslationRobustness(TestErrorTranslationBase):
3143
2863
    """Unit tests for bzrlib.remote._translate_error's robustness.
3173
2893
        # In addition to re-raising ErrorFromSmartServer, some debug info has
3174
2894
        # been muttered to the log file for developer to look at.
3175
2895
        self.assertContainsRe(
3176
 
            self.get_log(),
 
2896
            self._get_log(keep_log_file=True),
3177
2897
            "Missing key 'branch' in context")
3178
2898
 
3179
2899
    def test_path_missing(self):
3187
2907
        self.assertEqual(server_error, translated_error)
3188
2908
        # In addition to re-raising ErrorFromSmartServer, some debug info has
3189
2909
        # been muttered to the log file for developer to look at.
3190
 
        self.assertContainsRe(self.get_log(), "Missing key 'path' in context")
 
2910
        self.assertContainsRe(
 
2911
            self._get_log(keep_log_file=True), "Missing key 'path' in context")
3191
2912
 
3192
2913
 
3193
2914
class TestStacking(tests.TestCaseWithTransport):
3211
2932
        stacked_branch = self.make_branch('stacked', format='1.9')
3212
2933
        stacked_branch.set_stacked_on_url('../base')
3213
2934
        # start a server looking at this
3214
 
        smart_server = test_server.SmartTCPServer_for_testing()
 
2935
        smart_server = server.SmartTCPServer_for_testing()
3215
2936
        self.start_server(smart_server)
3216
2937
        remote_bzrdir = BzrDir.open(smart_server.get_url() + '/stacked')
3217
2938
        # can get its branch and repository
3288
3009
        _, stacked = branch_factory()
3289
3010
        source = stacked.repository._get_source(target_repository_format)
3290
3011
        tip = stacked.last_revision()
3291
 
        stacked.repository._ensure_real()
3292
 
        graph = stacked.repository.get_graph()
3293
 
        revs = [r for (r,ps) in graph.iter_ancestry([tip])
3294
 
                if r != NULL_REVISION]
3295
 
        revs.reverse()
3296
 
        search = _mod_graph.PendingAncestryResult([tip], stacked.repository)
 
3012
        revs = stacked.repository.get_ancestry(tip)
 
3013
        search = graph.PendingAncestryResult([tip], stacked.repository)
3297
3014
        self.reset_smart_call_log()
3298
3015
        stream = source.get_stream(search)
 
3016
        if None in revs:
 
3017
            revs.remove(None)
3299
3018
        # We trust that if a revision is in the stream the rest of the new
3300
3019
        # content for it is too, as per our main fetch tests; here we are
3301
3020
        # checking that the revisions are actually included at all, and their
3323
3042
            local_tree.commit('more local changes are better')
3324
3043
            branch = Branch.open(self.get_url('tree3'))
3325
3044
            branch.lock_read()
3326
 
            self.addCleanup(branch.unlock)
3327
3045
            return None, branch
3328
3046
        rev_ord, expected_revs = self.get_ordered_revs('1.9', 'unordered',
3329
3047
            branch_factory=make_stacked_stacked)
3340
3058
        self.assertEqual(expected_revs, rev_ord)
3341
3059
        # Getting topological sort requires VFS calls still - one of which is
3342
3060
        # pushing up from the bound branch.
3343
 
        self.assertLength(14, self.hpss_calls)
 
3061
        self.assertLength(13, self.hpss_calls)
3344
3062
 
3345
3063
    def test_stacked_get_stream_groupcompress(self):
3346
3064
        # Repository._get_source.get_stream() from a stacked repository with
3375
3093
        super(TestRemoteBranchEffort, self).setUp()
3376
3094
        # Create a smart server that publishes whatever the backing VFS server
3377
3095
        # does.
3378
 
        self.smart_server = test_server.SmartTCPServer_for_testing()
 
3096
        self.smart_server = server.SmartTCPServer_for_testing()
3379
3097
        self.start_server(self.smart_server, self.get_server())
3380
3098
        # Log all HPSS calls into self.hpss_calls.
3381
3099
        _SmartClient.hooks.install_named_hook(
3387
3105
 
3388
3106
    def test_copy_content_into_avoids_revision_history(self):
3389
3107
        local = self.make_branch('local')
3390
 
        builder = self.make_branch_builder('remote')
3391
 
        builder.build_commit(message="Commit.")
 
3108
        remote_backing_tree = self.make_branch_and_tree('remote')
 
3109
        remote_backing_tree.commit("Commit.")
3392
3110
        remote_branch_url = self.smart_server.get_url() + 'remote'
3393
3111
        remote_branch = bzrdir.BzrDir.open(remote_branch_url).open_branch()
3394
3112
        local.repository.fetch(remote_branch.repository)
3395
3113
        self.hpss_calls = []
3396
3114
        remote_branch.copy_content_into(local)
3397
3115
        self.assertFalse('Branch.revision_history' in self.hpss_calls)
3398
 
 
3399
 
    def test_fetch_everything_needs_just_one_call(self):
3400
 
        local = self.make_branch('local')
3401
 
        builder = self.make_branch_builder('remote')
3402
 
        builder.build_commit(message="Commit.")
3403
 
        remote_branch_url = self.smart_server.get_url() + 'remote'
3404
 
        remote_branch = bzrdir.BzrDir.open(remote_branch_url).open_branch()
3405
 
        self.hpss_calls = []
3406
 
        local.repository.fetch(
3407
 
            remote_branch.repository,
3408
 
            fetch_spec=_mod_graph.EverythingResult(remote_branch.repository))
3409
 
        self.assertEqual(['Repository.get_stream_1.19'], self.hpss_calls)
3410
 
 
3411
 
    def override_verb(self, verb_name, verb):
3412
 
        request_handlers = request.request_handlers
3413
 
        orig_verb = request_handlers.get(verb_name)
3414
 
        request_handlers.register(verb_name, verb, override_existing=True)
3415
 
        self.addCleanup(request_handlers.register, verb_name, orig_verb,
3416
 
                override_existing=True)
3417
 
 
3418
 
    def test_fetch_everything_backwards_compat(self):
3419
 
        """Can fetch with EverythingResult even with pre 2.4 servers.
3420
 
        
3421
 
        Pre-2.4 do not support 'everything' searches with the
3422
 
        Repository.get_stream_1.19 verb.
3423
 
        """
3424
 
        verb_log = []
3425
 
        class OldGetStreamVerb(SmartServerRepositoryGetStream_1_19):
3426
 
            """A version of the Repository.get_stream_1.19 verb patched to
3427
 
            reject 'everything' searches the way 2.3 and earlier do.
3428
 
            """
3429
 
            def recreate_search(self, repository, search_bytes,
3430
 
                                discard_excess=False):
3431
 
                verb_log.append(search_bytes.split('\n', 1)[0])
3432
 
                if search_bytes == 'everything':
3433
 
                    return (None,
3434
 
                            request.FailedSmartServerResponse(('BadSearch',)))
3435
 
                return super(OldGetStreamVerb,
3436
 
                        self).recreate_search(repository, search_bytes,
3437
 
                            discard_excess=discard_excess)
3438
 
        self.override_verb('Repository.get_stream_1.19', OldGetStreamVerb)
3439
 
        local = self.make_branch('local')
3440
 
        builder = self.make_branch_builder('remote')
3441
 
        builder.build_commit(message="Commit.")
3442
 
        remote_branch_url = self.smart_server.get_url() + 'remote'
3443
 
        remote_branch = bzrdir.BzrDir.open(remote_branch_url).open_branch()
3444
 
        self.hpss_calls = []
3445
 
        local.repository.fetch(
3446
 
            remote_branch.repository,
3447
 
            fetch_spec=_mod_graph.EverythingResult(remote_branch.repository))
3448
 
        # make sure the overridden verb was used
3449
 
        self.assertLength(1, verb_log)
3450
 
        # more than one HPSS call is needed, but because it's a VFS callback
3451
 
        # its hard to predict exactly how many.
3452
 
        self.assertTrue(len(self.hpss_calls) > 1)
3453
 
 
3454
 
 
3455
 
class TestUpdateBoundBranch(tests.TestCaseWithTransport):
3456
 
 
3457
 
    def test_bug_786980(self):
3458
 
        self.transport_server = test_server.SmartTCPServer_for_testing
3459
 
        wt = self.make_branch_and_tree('master')
3460
 
        checkout = wt.branch.create_checkout('checkout')
3461
 
        wt.commit('add stuff')
3462
 
        last_revid = wt.commit('even more stuff')
3463
 
        bound_location = checkout.branch.get_bound_location()
3464
 
        # For unclear reasons some users have a bound_location without a final
3465
 
        # '/', simulate that by forcing such a value
3466
 
        self.assertEndsWith(bound_location, '/')
3467
 
        new_location = bound_location.rstrip('/')
3468
 
        checkout.branch.set_bound_location(new_location)
3469
 
        # bug 786980 was raising ReadOnlyError: A write attempt was made in a
3470
 
        # read only transaction during the update()
3471
 
        checkout.update()
3472
 
        self.assertEquals(last_revid, checkout.last_revision())