/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 bzrlib/tests/test_read_bundle.py

merge with bzr.dev and put the NEWS entry in the IN DEVELOPMENT section

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_read_bundle.py
23
23
from bzrlib.bundle.serializer import write_bundle
24
24
import bzrlib.bzrdir
25
25
import bzrlib.errors as errors
 
26
from bzrlib.symbol_versioning import deprecated_in
26
27
from bzrlib import tests
27
28
from bzrlib.tests.test_transport import TestTransportImplementation
28
29
from bzrlib.tests.test_transport_implementations import TransportTestProviderAdapter
34
35
def load_tests(standard_tests, module, loader):
35
36
    """Multiply tests for tranport implementations."""
36
37
    result = loader.suiteClass()
 
38
    transport_tests, remaining_tests = tests.split_suite_by_condition(
 
39
        standard_tests, tests.condition_isinstance((TestReadBundleFromURL)))
 
40
 
37
41
    adapter = TransportTestProviderAdapter()
38
 
    for test in tests.iter_suite_tests(standard_tests):
39
 
        result.addTests(adapter.adapt(test))
 
42
    tests.adapt_tests(transport_tests, adapter, result)
 
43
 
 
44
    # No parametrization for the remaining tests
 
45
    result.addTests(remaining_tests)
 
46
 
40
47
    return result
41
48
 
42
49
 
60
67
    return out, wt
61
68
 
62
69
 
 
70
class TestDeprecations(tests.TestCaseInTempDir):
 
71
 
 
72
    def create_test_bundle(self):
 
73
        out, wt = create_bundle_file(self)
 
74
        f = open('test_bundle', 'wb')
 
75
        f.write(out.getvalue())
 
76
        f.close()
 
77
        return wt
 
78
 
 
79
    def test_read_bundle_from_url_deprecated(self):
 
80
        wt = self.create_test_bundle()
 
81
        t = bzrlib.transport.get_transport(self.test_dir)
 
82
        url = t.abspath('test_bundle')
 
83
        self.callDeprecated([deprecated_in((1, 12, 0))
 
84
                             % 'bzrlib.bundle.read_bundle_from_url'],
 
85
                            bzrlib.bundle.read_bundle_from_url,
 
86
                            url)
 
87
 
 
88
 
63
89
class TestReadBundleFromURL(TestTransportImplementation):
64
90
    """Test that read_bundle works properly across multiple transports"""
65
91
 
77
103
            self.log('Put to: %s', self.get_url('test_bundle'))
78
104
        return wt
79
105
 
80
 
    def test_read_bundle_from_url(self):
 
106
    def test_read_mergeable_from_url(self):
81
107
        self._captureVar('BZR_NO_SMART_VFS', None)
82
108
        wt = self.create_test_bundle()
83
109
        if wt is None:
84
110
            return
85
 
        info = bzrlib.bundle.read_bundle_from_url(
86
 
                    unicode(self.get_url('test_bundle')))
 
111
        # read_mergeable_from_url will invoke get_transport which may *not*
 
112
        # respect self._transport (i.e. returns a transport that is different
 
113
        # from the one we want to test, so we must inject a correct transport
 
114
        # into possible_transports first.
 
115
        t = self.get_transport('test_bundle')
 
116
        possible_transports = [t]
 
117
        info = bzrlib.bundle.read_mergeable_from_url(
 
118
                    unicode(self.get_url('test_bundle')),
 
119
                    possible_transports=possible_transports)
87
120
        revision = info.real_revisions[-1]
88
121
        self.assertEqual('commit-1', revision.revision_id)
89
122
 
95
128
        if wt is None:
96
129
            return
97
130
 
98
 
        self.assertRaises(errors.NotABundle, 
99
 
            bzrlib.bundle.read_bundle_from_url, 
 
131
        self.assertRaises(errors.NotABundle,
 
132
            bzrlib.bundle.read_mergeable_from_url,
100
133
            self.get_url('tree'))
101
 
        self.assertRaises(errors.NotABundle, 
102
 
            bzrlib.bundle.read_bundle_from_url, 
 
134
        self.assertRaises(errors.NotABundle,
 
135
            bzrlib.bundle.read_mergeable_from_url,
103
136
            self.get_url('tree/a'))
104
137
 
105
 
    def test_read_mergeable_populates_possible_transports(self):
 
138
    def test_read_mergeable_respects_possible_transports(self):
 
139
        t = self.get_transport('test_bundle')
 
140
        if not isinstance(t, bzrlib.transport.ConnectedTransport):
 
141
            # There is no point testing transport reuse for not connected
 
142
            # transports (the test will fail even).
 
143
            return
106
144
        self._captureVar('BZR_NO_SMART_VFS', None)
107
145
        wt = self.create_test_bundle()
108
146
        if wt is None:
109
147
            return
110
 
        possible_transports = []
 
148
        # read_mergeable_from_url will invoke get_transport which may *not*
 
149
        # respect self._transport (i.e. returns a transport that is different
 
150
        # from the one we want to test, so we must inject a correct transport
 
151
        # into possible_transports first.
 
152
        possible_transports = [t]
111
153
        url = unicode(self.get_url('test_bundle'))
112
154
        info = bzrlib.bundle.read_mergeable_from_url(url,
113
155
            possible_transports=possible_transports)