← 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: 2010-01-11 05:58:22 UTC
  • mto: This revision was merged to the branch mainline in revision 4965.
  • Revision ID: andrew.bennetts@canonical.com-20100111055822-npdkf88i86i1g54h
Fix HPSS tests; pass 'location is a repository' message via smart server when possible (adds BzrDir.open_branchV3 verb).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_remote.py
440
440
            'BzrDir.cloning_metadir', ('quack/', 'False'),
441
441
            'error', ('BranchReference',)),
442
442
        client.add_expected_call(
443
 
            'BzrDir.open_branchV2', ('quack/',),
 
443
            'BzrDir.open_branchV3', ('quack/',),
444
444
            'success', ('ref', self.get_url('referenced'))),
445
445
        a_bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
446
446
            _client=client)
531
531
        self.make_branch('.')
532
532
        a_dir = BzrDir.open(self.get_url('.'))
533
533
        self.reset_smart_call_log()
534
 
        verb = 'BzrDir.open_branchV2'
 
534
        verb = 'BzrDir.open_branchV3'
535
535
        self.disable_verb(verb)
536
536
        format = a_dir.open_branch()
537
537
        call_count = len([call for call in self.hpss_calls if
547
547
        transport = transport.clone('quack')
548
548
        client = FakeClient(transport.base)
549
549
        client.add_expected_call(
550
 
            'BzrDir.open_branchV2', ('quack/',),
 
550
            'BzrDir.open_branchV3', ('quack/',),
551
551
            'success', ('branch', branch_network_name))
552
552
        client.add_expected_call(
553
553
            'BzrDir.find_repositoryV3', ('quack/',),
572
572
            _client=client)
573
573
        self.assertRaises(errors.NotBranchError, bzrdir.open_branch)
574
574
        self.assertEqual(
575
 
            [('call', 'BzrDir.open_branchV2', ('quack/',))],
 
575
            [('call', 'BzrDir.open_branchV3', ('quack/',))],
576
576
            client._calls)
577
577
 
578
578
    def test__get_tree_branch(self):
602
602
        network_name = reference_format.network_name()
603
603
        branch_network_name = self.get_branch_format().network_name()
604
604
        client.add_expected_call(
605
 
            'BzrDir.open_branchV2', ('~hello/',),
 
605
            'BzrDir.open_branchV3', ('~hello/',),
606
606
            'success', ('branch', branch_network_name))
607
607
        client.add_expected_call(
608
608
            'BzrDir.find_repositoryV3', ('~hello/',),
1190
1190
        client = FakeClient(self.get_url())
1191
1191
        branch_network_name = self.get_branch_format().network_name()
1192
1192
        client.add_expected_call(
1193
 
            'BzrDir.open_branchV2', ('stacked/',),
 
1193
            'BzrDir.open_branchV3', ('stacked/',),
1194
1194
            'success', ('branch', branch_network_name))
1195
1195
        client.add_expected_call(
1196
1196
            'BzrDir.find_repositoryV3', ('stacked/',),
1226
1226
        client = FakeClient(self.get_url())
1227
1227
        branch_network_name = self.get_branch_format().network_name()
1228
1228
        client.add_expected_call(
1229
 
            'BzrDir.open_branchV2', ('stacked/',),
 
1229
            'BzrDir.open_branchV3', ('stacked/',),
1230
1230
            'success', ('branch', branch_network_name))
1231
1231
        client.add_expected_call(
1232
1232
            'BzrDir.find_repositoryV3', ('stacked/',),
2775
2775
        expected_error = errors.NotBranchError(path=bzrdir.root_transport.base)
2776
2776
        self.assertEqual(expected_error, translated_error)
2777
2777
 
 
2778
    def test_nobranch_one_arg(self):
 
2779
        bzrdir = self.make_bzrdir('')
 
2780
        translated_error = self.translateTuple(
 
2781
            ('nobranch', 'extra detail'), bzrdir=bzrdir)
 
2782
        expected_error = errors.NotBranchError(
 
2783
            path=bzrdir.root_transport.base,
 
2784
            detail='extra detail')
 
2785
        self.assertEqual(expected_error, translated_error)
 
2786
 
2778
2787
    def test_LockContention(self):
2779
2788
        translated_error = self.translateTuple(('LockContention',))
2780
2789
        expected_error = errors.LockContention('(remote lock)')