/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

Merge test-run support.

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 (
49
49
    wt.commit('new project', rev_id=b'commit-1')
50
50
 
51
51
    out = BytesIO()
52
 
    write_bundle(wt.branch.repository, wt.get_parent_ids()[0], b'null:', out)
 
52
    rev_ids = write_bundle(wt.branch.repository,
 
53
                           wt.get_parent_ids()[0], 'null:', out)
53
54
    out.seek(0)
54
55
    return out, wt
55
56
 
68
69
        # into possible_transports first).
69
70
        self.possible_transports = [self.get_transport(self.bundle_name)]
70
71
        self.overrideEnv('BRZ_NO_SMART_VFS', None)
71
 
        self.create_test_bundle()
 
72
        wt = self.create_test_bundle()
72
73
 
73
74
    def read_mergeable_from_url(self, url):
74
 
        return breezy.mergeable.read_mergeable_from_url(
 
75
        return breezy.bundle.read_mergeable_from_url(
75
76
            url, possible_transports=self.possible_transports)
76
77
 
77
78
    def get_url(self, relpath=''):
90
91
        info = self.read_mergeable_from_url(
91
92
            text_type(self.get_url(self.bundle_name)))
92
93
        revision = info.real_revisions[-1]
93
 
        self.assertEqual(b'commit-1', revision.revision_id)
 
94
        self.assertEqual('commit-1', revision.revision_id)
94
95
 
95
96
    def test_read_fail(self):
96
97
        # Trying to read from a directory, or non-bundle file
108
109
            raise tests.TestSkipped(
109
110
                'Need a ConnectedTransport to test transport reuse')
110
111
        url = text_type(self.get_url(self.bundle_name))
111
 
        self.read_mergeable_from_url(url)
 
112
        info = self.read_mergeable_from_url(url)
112
113
        self.assertEqual(1, len(self.possible_transports))