/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: 2017-06-08 23:30:31 UTC
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170608233031-3qavls2o7a1pqllj
Update imports.

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
    )
 
26
from .. import tests
 
27
from .test_transport import TestTransportImplementation
 
28
from .per_transport import transport_test_permutations
28
29
import breezy.transport
29
30
import breezy.urlutils
30
 
from ...tests.scenarios import load_tests_apply_scenarios
 
31
from .scenarios import load_tests_apply_scenarios
31
32
 
32
33
 
33
34
load_tests = load_tests_apply_scenarios
40
41
 
41
42
    bzrdir = format.initialize('tree')
42
43
    repo = bzrdir.create_repository()
43
 
    branch = repo.controldir.create_branch()
44
 
    wt = branch.controldir.create_workingtree()
 
44
    branch = repo.bzrdir.create_branch()
 
45
    wt = branch.bzrdir.create_workingtree()
45
46
 
46
47
    wt.add(['a', 'subdir/'])
47
 
    wt.commit('new project', rev_id=b'commit-1')
 
48
    wt.commit('new project', rev_id='commit-1')
48
49
 
49
50
    out = BytesIO()
50
 
    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)
51
53
    out.seek(0)
52
54
    return out, wt
53
55
 
66
68
        # into possible_transports first).
67
69
        self.possible_transports = [self.get_transport(self.bundle_name)]
68
70
        self.overrideEnv('BRZ_NO_SMART_VFS', None)
69
 
        self.create_test_bundle()
 
71
        wt = 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
            unicode(self.get_url(self.bundle_name)))
90
92
        revision = info.real_revisions[-1]
91
 
        self.assertEqual(b'commit-1', revision.revision_id)
 
93
        self.assertEqual('commit-1', revision.revision_id)
92
94
 
93
95
    def test_read_fail(self):
94
96
        # Trying to read from a directory, or non-bundle file
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))
109
 
        self.read_mergeable_from_url(url)
 
110
        url = unicode(self.get_url(self.bundle_name))
 
111
        info = self.read_mergeable_from_url(url)
110
112
        self.assertEqual(1, len(self.possible_transports))