/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_read_bundle.py

  • Committer: Jelmer Vernooij
  • Date: 2020-02-07 02:14:30 UTC
  • mto: This revision was merged to the branch mainline in revision 7492.
  • Revision ID: jelmer@jelmer.uk-20200207021430-m49iq3x4x8xlib6x
Drop python2 support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_read_bundle.py
16
16
 
17
17
"""Test read_bundle works properly across various transports."""
18
18
 
 
19
from io import BytesIO
 
20
 
19
21
import breezy.mergeable
20
22
from ..bzr.bundle.serializer import write_bundle
21
23
import breezy.bzr.bzrdir
22
24
from .. import errors
23
 
from ..sixish import (
24
 
    BytesIO,
25
 
    text_type,
26
 
    )
27
25
from .. import tests
28
26
from .test_transport import TestTransportImplementation
29
27
from .per_transport import transport_test_permutations
88
86
 
89
87
    def test_read_mergeable_from_url(self):
90
88
        info = self.read_mergeable_from_url(
91
 
            text_type(self.get_url(self.bundle_name)))
 
89
            str(self.get_url(self.bundle_name)))
92
90
        revision = info.real_revisions[-1]
93
91
        self.assertEqual(b'commit-1', revision.revision_id)
94
92
 
107
105
            # transports (the test will fail even).
108
106
            raise tests.TestSkipped(
109
107
                'Need a ConnectedTransport to test transport reuse')
110
 
        url = text_type(self.get_url(self.bundle_name))
 
108
        url = str(self.get_url(self.bundle_name))
111
109
        self.read_mergeable_from_url(url)
112
110
        self.assertEqual(1, len(self.possible_transports))