/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-11-12 17:53:47 UTC
  • mfrom: (6813 trunk)
  • mto: This revision was merged to the branch mainline in revision 6819.
  • Revision ID: jelmer@jelmer.uk-20171112175347-wovgaqmkbyo8fo7f
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
122
122
    def test_repeated_substreams_same_kind_are_one_stream(self):
123
123
        # Make a stream - an iterable of bytestrings.
124
124
        stream = [('text', [versionedfile.FulltextContentFactory(('k1',), None,
125
 
            None, 'foo')]),('text', [
 
125
            None, 'foo')]), ('text', [
126
126
            versionedfile.FulltextContentFactory(('k2',), None, None, 'bar')])]
127
127
        fmt = controldir.format_registry.get('pack-0.92')().repository_format
128
128
        bytes = smart_repo._stream_to_byte_stream(stream, fmt)
652
652
        backing = self.get_transport()
653
653
        request = smart_dir.SmartServerRequestOpenBranch(backing)
654
654
        branch = self.make_branch('branch')
655
 
        checkout = branch.create_checkout('reference',lightweight=True)
 
655
        checkout = branch.create_checkout('reference', lightweight=True)
656
656
        reference_url = _mod_bzrbranch.BranchReferenceFormat().get_reference(
657
657
            checkout.controldir)
658
658
        self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
693
693
        backing = self.get_transport()
694
694
        request = smart_dir.SmartServerRequestOpenBranchV2(backing)
695
695
        branch = self.make_branch('branch')
696
 
        checkout = branch.create_checkout('reference',lightweight=True)
 
696
        checkout = branch.create_checkout('reference', lightweight=True)
697
697
        reference_url = _mod_bzrbranch.BranchReferenceFormat().get_reference(
698
698
            checkout.controldir)
699
699
        self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
756
756
        backing = self.get_transport()
757
757
        request = smart_dir.SmartServerRequestOpenBranchV3(backing)
758
758
        branch = self.make_branch('branch')
759
 
        checkout = branch.create_checkout('reference',lightweight=True)
 
759
        checkout = branch.create_checkout('reference', lightweight=True)
760
760
        reference_url = _mod_bzrbranch.BranchReferenceFormat().get_reference(
761
761
            checkout.controldir)
762
762
        self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
835
835
        backing = self.get_transport()
836
836
        request = smart_branch.SmartServerBranchRequest(backing)
837
837
        branch = self.make_branch('branch')
838
 
        checkout = branch.create_checkout('reference',lightweight=True)
 
838
        checkout = branch.create_checkout('reference', lightweight=True)
839
839
        self.assertRaises(errors.NotBranchError,
840
840
            request.execute, 'checkout')
841
841