← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_read_bundle.py

  • Committer: Martin Pool
  • Date: 2009-03-24 05:21:02 UTC
  • mfrom: (4192 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4202.
  • Revision ID: mbp@sourcefrog.net-20090324052102-8kk087b32tep3d9h
merge trunk

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
 
from bzrlib.tests.test_transport_implementations import TransportTestProviderAdapter
 
29
from bzrlib.tests.test_transport_implementations import transport_test_permutations
29
30
import bzrlib.transport
30
31
from bzrlib.transport.memory import MemoryTransport
31
32
import bzrlib.urlutils
33
34
 
34
35
def load_tests(standard_tests, module, loader):
35
36
    """Multiply tests for tranport implementations."""
36
 
    result = loader.suiteClass()
37
 
    adapter = TransportTestProviderAdapter()
38
 
    for test in tests.iter_suite_tests(standard_tests):
39
 
        result.addTests(adapter.adapt(test))
40
 
    return result
 
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)
41
41
 
42
42
 
43
43
def create_bundle_file(test_case):
60
60
    return out, wt
61
61
 
62
62
 
 
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
 
63
84
class TestReadBundleFromURL(TestTransportImplementation):
64
85
    """Test that read_bundle works properly across multiple transports"""
65
86
 
70
91
        out, wt = create_bundle_file(self)
71
92
        if self.get_transport().is_readonly():
72
93
            f = open('test_bundle', 'wb')
73
 
            f.write(out.getvalue())
74
 
            f.close()
 
94
            try:
 
95
                f.write(out.getvalue())
 
96
            finally:
 
97
                f.close()
75
98
        else:
76
99
            self.get_transport().put_file('test_bundle', out)
77
100
            self.log('Put to: %s', self.get_url('test_bundle'))
78
101
        return wt
79
102
 
80
 
    def test_read_bundle_from_url(self):
 
103
    def test_read_mergeable_from_url(self):
81
104
        self._captureVar('BZR_NO_SMART_VFS', None)
82
105
        wt = self.create_test_bundle()
83
106
        if wt is None:
84
107
            return
85
 
        info = bzrlib.bundle.read_bundle_from_url(
86
 
                    unicode(self.get_url('test_bundle')))
 
108
        # read_mergeable_from_url will invoke get_transport which may *not*
 
109
        # respect self._transport (i.e. returns a transport that is different
 
110
        # from the one we want to test, so we must inject a correct transport
 
111
        # into possible_transports first.
 
112
        t = self.get_transport('test_bundle')
 
113
        possible_transports = [t]
 
114
        info = bzrlib.bundle.read_mergeable_from_url(
 
115
                    unicode(self.get_url('test_bundle')),
 
116
                    possible_transports=possible_transports)
87
117
        revision = info.real_revisions[-1]
88
118
        self.assertEqual('commit-1', revision.revision_id)
89
119
 
95
125
        if wt is None:
96
126
            return
97
127
 
98
 
        self.assertRaises(errors.NotABundle, 
99
 
            bzrlib.bundle.read_bundle_from_url, 
 
128
        self.assertRaises(errors.NotABundle,
 
129
            bzrlib.bundle.read_mergeable_from_url,
100
130
            self.get_url('tree'))
101
 
        self.assertRaises(errors.NotABundle, 
102
 
            bzrlib.bundle.read_bundle_from_url, 
 
131
        self.assertRaises(errors.NotABundle,
 
132
            bzrlib.bundle.read_mergeable_from_url,
103
133
            self.get_url('tree/a'))
104
134
 
105
 
    def test_read_mergeable_populates_possible_transports(self):
 
135
    def test_read_mergeable_respects_possible_transports(self):
 
136
        t = self.get_transport('test_bundle')
 
137
        if not isinstance(t, bzrlib.transport.ConnectedTransport):
 
138
            # There is no point testing transport reuse for not connected
 
139
            # transports (the test will fail even).
 
140
            return
106
141
        self._captureVar('BZR_NO_SMART_VFS', None)
107
142
        wt = self.create_test_bundle()
108
143
        if wt is None:
109
144
            return
110
 
        possible_transports = []
 
145
        # read_mergeable_from_url will invoke get_transport which may *not*
 
146
        # respect self._transport (i.e. returns a transport that is different
 
147
        # from the one we want to test, so we must inject a correct transport
 
148
        # into possible_transports first.
 
149
        possible_transports = [t]
111
150
        url = unicode(self.get_url('test_bundle'))
112
151
        info = bzrlib.bundle.read_mergeable_from_url(url,
113
152
            possible_transports=possible_transports)