← 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: Canonical.com Patch Queue Manager
  • Date: 2010-09-01 08:02:42 UTC
  • mfrom: (5390.3.3 faster-revert-593560)
  • Revision ID: pqm@pqm.ubuntu.com-20100901080242-esg62ody4frwmy66
(spiv) Avoid repeatedly calling self.target.all_file_ids() in
 InterTree.iter_changes. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_read_bundle.py
26
26
from bzrlib.symbol_versioning import deprecated_in
27
27
from bzrlib import tests
28
28
from bzrlib.tests.test_transport import TestTransportImplementation
29
 
from bzrlib.tests.test_transport_implementations import transport_test_permutations
 
29
from bzrlib.tests.per_transport import transport_test_permutations
30
30
import bzrlib.transport
31
31
from bzrlib.transport.memory import MemoryTransport
32
32
import bzrlib.urlutils
35
35
def load_tests(standard_tests, module, loader):
36
36
    """Multiply tests for tranport implementations."""
37
37
    transport_tests, remaining_tests = tests.split_suite_by_condition(
38
 
        standard_tests, tests.condition_isinstance(TestReadBundleFromURL))
 
38
        standard_tests,
 
39
        tests.condition_isinstance(TestReadMergeableBundleFromURL))
39
40
    return tests.multiply_tests(transport_tests, transport_test_permutations(),
40
41
        remaining_tests)
41
42
 
60
61
    return out, wt
61
62
 
62
63
 
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):
 
64
class TestReadMergeableBundleFromURL(TestTransportImplementation):
85
65
    """Test that read_bundle works properly across multiple transports"""
86
66
 
 
67
    def setUp(self):
 
68
        super(TestReadMergeableBundleFromURL, self).setUp()
 
69
        self.bundle_name = 'test_bundle'
 
70
        # read_mergeable_from_url will invoke get_transport which may *not*
 
71
        # respect self._transport (i.e. returns a transport that is different
 
72
        # from the one we want to test, so we must inject a correct transport
 
73
        # into possible_transports first).
 
74
        self.possible_transports = [self.get_transport(self.bundle_name)]
 
75
        self._captureVar('BZR_NO_SMART_VFS', None)
 
76
        wt = self.create_test_bundle()
 
77
 
 
78
    def read_mergeable_from_url(self, url):
 
79
        return bzrlib.bundle.read_mergeable_from_url(
 
80
            url, possible_transports=self.possible_transports)
 
81
 
87
82
    def get_url(self, relpath=''):
88
83
        return bzrlib.urlutils.join(self._server.get_url(), relpath)
89
84
 
90
85
    def create_test_bundle(self):
91
86
        out, wt = create_bundle_file(self)
92
87
        if self.get_transport().is_readonly():
93
 
            f = open('test_bundle', 'wb')
94
 
            try:
95
 
                f.write(out.getvalue())
96
 
            finally:
97
 
                f.close()
 
88
            self.build_tree_contents([(self.bundle_name, out.getvalue())])
98
89
        else:
99
 
            self.get_transport().put_file('test_bundle', out)
100
 
            self.log('Put to: %s', self.get_url('test_bundle'))
 
90
            self.get_transport().put_file(self.bundle_name, out)
 
91
            self.log('Put to: %s', self.get_url(self.bundle_name))
101
92
        return wt
102
93
 
103
94
    def test_read_mergeable_from_url(self):
104
 
        self._captureVar('BZR_NO_SMART_VFS', None)
105
 
        wt = self.create_test_bundle()
106
 
        if wt is None:
107
 
            return
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)
 
95
        info = self.read_mergeable_from_url(
 
96
            unicode(self.get_url(self.bundle_name)))
117
97
        revision = info.real_revisions[-1]
118
98
        self.assertEqual('commit-1', revision.revision_id)
119
99
 
120
100
    def test_read_fail(self):
121
101
        # Trying to read from a directory, or non-bundle file
122
102
        # should fail with NotABundle
123
 
        self._captureVar('BZR_NO_SMART_VFS', None)
124
 
        wt = self.create_test_bundle()
125
 
        if wt is None:
126
 
            return
127
 
 
128
 
        self.assertRaises(errors.NotABundle,
129
 
            bzrlib.bundle.read_mergeable_from_url,
130
 
            self.get_url('tree'))
131
 
        self.assertRaises(errors.NotABundle,
132
 
            bzrlib.bundle.read_mergeable_from_url,
133
 
            self.get_url('tree/a'))
 
103
        self.assertRaises(errors.NotABundle,
 
104
                          self.read_mergeable_from_url, self.get_url('tree'))
 
105
        self.assertRaises(errors.NotABundle,
 
106
                          self.read_mergeable_from_url, self.get_url('tree/a'))
134
107
 
135
108
    def test_read_mergeable_respects_possible_transports(self):
136
 
        t = self.get_transport('test_bundle')
137
 
        if not isinstance(t, bzrlib.transport.ConnectedTransport):
 
109
        if not isinstance(self.get_transport(self.bundle_name),
 
110
                          bzrlib.transport.ConnectedTransport):
138
111
            # There is no point testing transport reuse for not connected
139
112
            # transports (the test will fail even).
140
 
            return
141
 
        self._captureVar('BZR_NO_SMART_VFS', None)
142
 
        wt = self.create_test_bundle()
143
 
        if wt is None:
144
 
            return
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]
150
 
        url = unicode(self.get_url('test_bundle'))
151
 
        info = bzrlib.bundle.read_mergeable_from_url(url,
152
 
            possible_transports=possible_transports)
153
 
        self.assertEqual(1, len(possible_transports))
 
113
            raise tests.TestSkipped(
 
114
                'Need a ConnectedTransport to test transport reuse')
 
115
        url = unicode(self.get_url(self.bundle_name))
 
116
        info = self.read_mergeable_from_url(url)
 
117
        self.assertEqual(1, len(self.possible_transports))