/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-02-18 01:57:45 UTC
  • mto: This revision was merged to the branch mainline in revision 7493.
  • Revision ID: jelmer@jelmer.uk-20200218015745-q2ss9tsk74h4nh61
drop use of future.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_read_bundle.py
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
16
16
 
17
17
"""Test read_bundle works properly across various transports."""
18
18
 
19
 
import cStringIO
20
 
import os
21
 
 
22
 
import bzrlib.bundle
23
 
from bzrlib.bundle.serializer import write_bundle
24
 
import bzrlib.bzrdir
25
 
import bzrlib.errors as errors
26
 
from bzrlib.symbol_versioning import deprecated_in
27
 
from bzrlib import tests
28
 
from bzrlib.tests.test_transport import TestTransportImplementation
29
 
from bzrlib.tests.per_transport import transport_test_permutations
30
 
import bzrlib.transport
31
 
from bzrlib.transport.memory import MemoryTransport
32
 
import bzrlib.urlutils
33
 
 
34
 
 
35
 
def load_tests(standard_tests, module, loader):
36
 
    """Multiply tests for tranport implementations."""
37
 
    transport_tests, remaining_tests = tests.split_suite_by_condition(
38
 
        standard_tests, tests.condition_isinstance(TestReadBundleFromURL))
39
 
    return tests.multiply_tests(transport_tests, transport_test_permutations(),
40
 
        remaining_tests)
 
19
from io import BytesIO
 
20
 
 
21
import breezy.mergeable
 
22
from ..bzr.bundle.serializer import write_bundle
 
23
import breezy.bzr.bzrdir
 
24
from .. import errors
 
25
from .. import tests
 
26
from .test_transport import TestTransportImplementation
 
27
from .per_transport import transport_test_permutations
 
28
import breezy.transport
 
29
import breezy.urlutils
 
30
from .scenarios import load_tests_apply_scenarios
 
31
 
 
32
 
 
33
load_tests = load_tests_apply_scenarios
41
34
 
42
35
 
43
36
def create_bundle_file(test_case):
44
37
    test_case.build_tree(['tree/', 'tree/a', 'tree/subdir/'])
45
38
 
46
 
    format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
 
39
    format = breezy.bzr.bzrdir.BzrDirFormat.get_default_format()
47
40
 
48
41
    bzrdir = format.initialize('tree')
49
42
    repo = bzrdir.create_repository()
50
 
    branch = repo.bzrdir.create_branch()
51
 
    wt = branch.bzrdir.create_workingtree()
 
43
    branch = repo.controldir.create_branch()
 
44
    wt = branch.controldir.create_workingtree()
52
45
 
53
46
    wt.add(['a', 'subdir/'])
54
 
    wt.commit('new project', rev_id='commit-1')
 
47
    wt.commit('new project', rev_id=b'commit-1')
55
48
 
56
 
    out = cStringIO.StringIO()
57
 
    rev_ids = write_bundle(wt.branch.repository,
58
 
                           wt.get_parent_ids()[0], 'null:', out)
 
49
    out = BytesIO()
 
50
    write_bundle(wt.branch.repository, wt.get_parent_ids()[0], b'null:', out)
59
51
    out.seek(0)
60
52
    return out, wt
61
53
 
62
54
 
63
 
class TestDeprecations(tests.TestCaseInTempDir):
64
 
 
65
 
    def create_test_bundle(self):
66
 
        out, wt = create_bundle_file(self)
67
 
        f = open('test_bundle', 'wb')
68
 
        try:
69
 
            f.write(out.getvalue())
70
 
        finally:
71
 
            f.close()
72
 
        return wt
73
 
 
74
 
    def test_read_bundle_from_url_deprecated(self):
75
 
        wt = self.create_test_bundle()
76
 
        t = bzrlib.transport.get_transport(self.test_dir)
77
 
        url = t.abspath('test_bundle')
78
 
        self.callDeprecated([deprecated_in((1, 12, 0))
79
 
                             % 'bzrlib.bundle.read_bundle_from_url'],
80
 
                            bzrlib.bundle.read_bundle_from_url,
81
 
                            url)
82
 
 
83
 
 
84
 
class TestReadBundleFromURL(TestTransportImplementation):
 
55
class TestReadMergeableBundleFromURL(TestTransportImplementation):
85
56
    """Test that read_bundle works properly across multiple transports"""
86
57
 
 
58
    scenarios = transport_test_permutations()
 
59
 
87
60
    def setUp(self):
88
 
        super(TestReadBundleFromURL, self).setUp()
 
61
        super(TestReadMergeableBundleFromURL, self).setUp()
89
62
        self.bundle_name = 'test_bundle'
90
63
        # read_mergeable_from_url will invoke get_transport which may *not*
91
64
        # respect self._transport (i.e. returns a transport that is different
92
65
        # from the one we want to test, so we must inject a correct transport
93
66
        # into possible_transports first).
94
67
        self.possible_transports = [self.get_transport(self.bundle_name)]
95
 
        self._captureVar('BZR_NO_SMART_VFS', None)
96
 
        wt = self.create_test_bundle()
 
68
        self.overrideEnv('BRZ_NO_SMART_VFS', None)
 
69
        self.create_test_bundle()
97
70
 
98
71
    def read_mergeable_from_url(self, url):
99
 
        return bzrlib.bundle.read_mergeable_from_url(
 
72
        return breezy.mergeable.read_mergeable_from_url(
100
73
            url, possible_transports=self.possible_transports)
101
74
 
102
75
    def get_url(self, relpath=''):
103
 
        return bzrlib.urlutils.join(self._server.get_url(), relpath)
 
76
        return breezy.urlutils.join(self._server.get_url(), relpath)
104
77
 
105
78
    def create_test_bundle(self):
106
79
        out, wt = create_bundle_file(self)
113
86
 
114
87
    def test_read_mergeable_from_url(self):
115
88
        info = self.read_mergeable_from_url(
116
 
            unicode(self.get_url(self.bundle_name)))
 
89
            str(self.get_url(self.bundle_name)))
117
90
        revision = info.real_revisions[-1]
118
 
        self.assertEqual('commit-1', revision.revision_id)
 
91
        self.assertEqual(b'commit-1', revision.revision_id)
119
92
 
120
93
    def test_read_fail(self):
121
94
        # Trying to read from a directory, or non-bundle file
127
100
 
128
101
    def test_read_mergeable_respects_possible_transports(self):
129
102
        if not isinstance(self.get_transport(self.bundle_name),
130
 
                          bzrlib.transport.ConnectedTransport):
 
103
                          breezy.transport.ConnectedTransport):
131
104
            # There is no point testing transport reuse for not connected
132
105
            # transports (the test will fail even).
133
106
            raise tests.TestSkipped(
134
107
                'Need a ConnectedTransport to test transport reuse')
135
 
        url = unicode(self.get_url(self.bundle_name))
136
 
        info = self.read_mergeable_from_url(url)
 
108
        url = str(self.get_url(self.bundle_name))
 
109
        self.read_mergeable_from_url(url)
137
110
        self.assertEqual(1, len(self.possible_transports))