/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: 2019-03-05 07:32:38 UTC
  • mto: (7290.1.21 work)
  • mto: This revision was merged to the branch mainline in revision 7311.
  • Revision ID: jelmer@jelmer.uk-20190305073238-zlqn981opwnqsmzi
Add appveyor configuration.

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
 
import breezy.mergeable
 
19
import breezy.bundle
22
20
from ..bundle.serializer import write_bundle
23
21
import breezy.bzr.bzrdir
24
 
from ... import errors
25
 
from ... import tests
26
 
from ...tests.test_transport import TestTransportImplementation
27
 
from ...tests.per_transport import transport_test_permutations
 
22
from .. import errors
 
23
from ..sixish import (
 
24
    BytesIO,
 
25
    text_type,
 
26
    )
 
27
from .. import tests
 
28
from .test_transport import TestTransportImplementation
 
29
from .per_transport import transport_test_permutations
28
30
import breezy.transport
29
31
import breezy.urlutils
30
 
from ...tests.scenarios import load_tests_apply_scenarios
 
32
from .scenarios import load_tests_apply_scenarios
31
33
 
32
34
 
33
35
load_tests = load_tests_apply_scenarios
69
71
        self.create_test_bundle()
70
72
 
71
73
    def read_mergeable_from_url(self, url):
72
 
        return breezy.mergeable.read_mergeable_from_url(
 
74
        return breezy.bundle.read_mergeable_from_url(
73
75
            url, possible_transports=self.possible_transports)
74
76
 
75
77
    def get_url(self, relpath=''):
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))