/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_smart.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 00:06:46 UTC
  • mfrom: (6673 work)
  • mto: This revision was merged to the branch mainline in revision 6675.
  • Revision ID: jelmer@jelmer.uk-20170610000646-xj6jh277lo4xuo10
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_smart.py
30
30
from breezy import (
31
31
    bencode,
32
32
    branch as _mod_branch,
 
33
    bzrbranch as _mod_bzrbranch,
33
34
    controldir,
34
35
    errors,
35
36
    gpg,
214
215
        referenced_branch = self.make_branch('referenced')
215
216
        dir = self.make_bzrdir('.')
216
217
        local_result = dir.cloning_metadir()
217
 
        reference = _mod_branch.BranchReferenceFormat().initialize(
 
218
        reference = _mod_bzrbranch.BranchReferenceFormat().initialize(
218
219
            dir, target_branch=referenced_branch)
219
 
        reference_url = _mod_branch.BranchReferenceFormat().get_reference(dir)
 
220
        reference_url = _mod_bzrbranch.BranchReferenceFormat().get_reference(dir)
220
221
        # The server shouldn't try to follow the branch reference, so it's fine
221
222
        # if the referenced branch isn't reachable.
222
223
        backing.rename('referenced', 'moved')
650
651
        request = smart_dir.SmartServerRequestOpenBranch(backing)
651
652
        branch = self.make_branch('branch')
652
653
        checkout = branch.create_checkout('reference',lightweight=True)
653
 
        reference_url = _mod_branch.BranchReferenceFormat().get_reference(
 
654
        reference_url = _mod_bzrbranch.BranchReferenceFormat().get_reference(
654
655
            checkout.bzrdir)
655
656
        self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
656
657
        self.assertEqual(smart_req.SmartServerResponse(('ok', reference_url)),
691
692
        request = smart_dir.SmartServerRequestOpenBranchV2(backing)
692
693
        branch = self.make_branch('branch')
693
694
        checkout = branch.create_checkout('reference',lightweight=True)
694
 
        reference_url = _mod_branch.BranchReferenceFormat().get_reference(
 
695
        reference_url = _mod_bzrbranch.BranchReferenceFormat().get_reference(
695
696
            checkout.bzrdir)
696
697
        self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
697
698
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(
754
755
        request = smart_dir.SmartServerRequestOpenBranchV3(backing)
755
756
        branch = self.make_branch('branch')
756
757
        checkout = branch.create_checkout('reference',lightweight=True)
757
 
        reference_url = _mod_branch.BranchReferenceFormat().get_reference(
 
758
        reference_url = _mod_bzrbranch.BranchReferenceFormat().get_reference(
758
759
            checkout.bzrdir)
759
760
        self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
760
761
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(