/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-03-22 01:35:14 UTC
  • mfrom: (7490.7.6 work)
  • mto: This revision was merged to the branch mainline in revision 7499.
  • Revision ID: jelmer@jelmer.uk-20200322013514-7vw1ntwho04rcuj3
merge lp:brz/3.1.

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
 
import breezy.bundle
20
 
from ..bundle.serializer import write_bundle
 
19
from io import BytesIO
 
20
 
 
21
import breezy.mergeable
 
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
 
    )
26
25
from .. import tests
27
26
from .test_transport import TestTransportImplementation
28
27
from .per_transport import transport_test_permutations
45
44
    wt = branch.controldir.create_workingtree()
46
45
 
47
46
    wt.add(['a', 'subdir/'])
48
 
    wt.commit('new project', rev_id='commit-1')
 
47
    wt.commit('new project', rev_id=b'commit-1')
49
48
 
50
49
    out = BytesIO()
51
 
    rev_ids = write_bundle(wt.branch.repository,
52
 
                           wt.get_parent_ids()[0], 'null:', out)
 
50
    write_bundle(wt.branch.repository, wt.get_parent_ids()[0], b'null:', out)
53
51
    out.seek(0)
54
52
    return out, wt
55
53
 
68
66
        # into possible_transports first).
69
67
        self.possible_transports = [self.get_transport(self.bundle_name)]
70
68
        self.overrideEnv('BRZ_NO_SMART_VFS', None)
71
 
        wt = self.create_test_bundle()
 
69
        self.create_test_bundle()
72
70
 
73
71
    def read_mergeable_from_url(self, url):
74
 
        return breezy.bundle.read_mergeable_from_url(
 
72
        return breezy.mergeable.read_mergeable_from_url(
75
73
            url, possible_transports=self.possible_transports)
76
74
 
77
75
    def get_url(self, relpath=''):
88
86
 
89
87
    def test_read_mergeable_from_url(self):
90
88
        info = self.read_mergeable_from_url(
91
 
            unicode(self.get_url(self.bundle_name)))
 
89
            str(self.get_url(self.bundle_name)))
92
90
        revision = info.real_revisions[-1]
93
 
        self.assertEqual('commit-1', revision.revision_id)
 
91
        self.assertEqual(b'commit-1', revision.revision_id)
94
92
 
95
93
    def test_read_fail(self):
96
94
        # Trying to read from a directory, or non-bundle file
107
105
            # transports (the test will fail even).
108
106
            raise tests.TestSkipped(
109
107
                'Need a ConnectedTransport to test transport reuse')
110
 
        url = unicode(self.get_url(self.bundle_name))
111
 
        info = self.read_mergeable_from_url(url)
 
108
        url = str(self.get_url(self.bundle_name))
 
109
        self.read_mergeable_from_url(url)
112
110
        self.assertEqual(1, len(self.possible_transports))