/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: 2018-06-29 20:24:31 UTC
  • mfrom: (6999 work)
  • mto: This revision was merged to the branch mainline in revision 7008.
  • Revision ID: jelmer@jelmer.uk-20180629202431-2td8kihrsthzuvau
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_read_bundle.py
22
22
from .. import errors
23
23
from ..sixish import (
24
24
    BytesIO,
 
25
    text_type,
25
26
    )
26
27
from .. import tests
27
28
from .test_transport import TestTransportImplementation
88
89
 
89
90
    def test_read_mergeable_from_url(self):
90
91
        info = self.read_mergeable_from_url(
91
 
            unicode(self.get_url(self.bundle_name)))
 
92
            text_type(self.get_url(self.bundle_name)))
92
93
        revision = info.real_revisions[-1]
93
94
        self.assertEqual('commit-1', revision.revision_id)
94
95
 
107
108
            # transports (the test will fail even).
108
109
            raise tests.TestSkipped(
109
110
                'Need a ConnectedTransport to test transport reuse')
110
 
        url = unicode(self.get_url(self.bundle_name))
 
111
        url = text_type(self.get_url(self.bundle_name))
111
112
        info = self.read_mergeable_from_url(url)
112
113
        self.assertEqual(1, len(self.possible_transports))