/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

Support user.signingkey configuration variable in .git/config.

Merged from https://code.launchpad.net/~jelmer/brz/local-git-key/+merge/381000

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
 
 
21
19
import breezy.mergeable
22
20
from ..bzr.bundle.serializer import write_bundle
23
21
import breezy.bzr.bzrdir
24
22
from .. import errors
 
23
from ..sixish import (
 
24
    BytesIO,
 
25
    text_type,
 
26
    )
25
27
from .. import tests
26
28
from .test_transport import TestTransportImplementation
27
29
from .per_transport import transport_test_permutations
86
88
 
87
89
    def test_read_mergeable_from_url(self):
88
90
        info = self.read_mergeable_from_url(
89
 
            str(self.get_url(self.bundle_name)))
 
91
            text_type(self.get_url(self.bundle_name)))
90
92
        revision = info.real_revisions[-1]
91
93
        self.assertEqual(b'commit-1', revision.revision_id)
92
94
 
105
107
            # transports (the test will fail even).
106
108
            raise tests.TestSkipped(
107
109
                'Need a ConnectedTransport to test transport reuse')
108
 
        url = str(self.get_url(self.bundle_name))
 
110
        url = text_type(self.get_url(self.bundle_name))
109
111
        self.read_mergeable_from_url(url)
110
112
        self.assertEqual(1, len(self.possible_transports))