/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-05-06 11:48:54 UTC
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@jelmer.uk-20180506114854-h4qd9ojaqy8wxjsd
Move .mailmap to root.

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