← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart.py

  • Committer: Joe Julian
  • Date: 2010-01-10 02:25:31 UTC
  • mto: (4634.119.7 2.0)
  • mto: This revision was merged to the branch mainline in revision 4959.
  • Revision ID: joe@julianfamily.org-20100110022531-wqk61rsagz8xsiga
https://launchpad.net/bugs/175839
Added MANIFEST.in to allow bdist_rpm to have all the required include files and tools. bdist_rpm will still fail to build correctly on some distributions due to a disttools bug http://bugs.python.org/issue644744

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_smart.py
36
36
    smart,
37
37
    tests,
38
38
    urlutils,
 
39
    versionedfile,
39
40
    )
40
41
from bzrlib.branch import Branch, BranchReferenceFormat
41
42
import bzrlib.smart.branch
113
114
        return self.get_transport().get_smart_medium()
114
115
 
115
116
 
 
117
class TestByteStreamToStream(tests.TestCase):
 
118
 
 
119
    def test_repeated_substreams_same_kind_are_one_stream(self):
 
120
        # Make a stream - an iterable of bytestrings.
 
121
        stream = [('text', [versionedfile.FulltextContentFactory(('k1',), None,
 
122
            None, 'foo')]),('text', [
 
123
            versionedfile.FulltextContentFactory(('k2',), None, None, 'bar')])]
 
124
        fmt = bzrdir.format_registry.get('pack-0.92')().repository_format
 
125
        bytes = smart.repository._stream_to_byte_stream(stream, fmt)
 
126
        streams = []
 
127
        # Iterate the resulting iterable; checking that we get only one stream
 
128
        # out.
 
129
        fmt, stream = smart.repository._byte_stream_to_stream(bytes)
 
130
        for kind, substream in stream:
 
131
            streams.append((kind, list(substream)))
 
132
        self.assertLength(1, streams)
 
133
        self.assertLength(2, streams[0][1])
 
134
 
 
135
 
116
136
class TestSmartServerResponse(tests.TestCase):
117
137
 
118
138
    def test__eq__(self):
202
222
        self.make_bzrdir('.')
203
223
        request_class = bzrlib.smart.bzrdir.SmartServerRequestCreateRepository
204
224
        request = request_class(backing)
205
 
        reference_bzrdir_format = bzrdir.format_registry.get('default')()
 
225
        reference_bzrdir_format = bzrdir.format_registry.get('pack-0.92')()
206
226
        reference_format = reference_bzrdir_format.repository_format
207
227
        network_name = reference_format.network_name()
208
228
        expected = SuccessfulSmartServerResponse(
247
267
            subtrees = 'yes'
248
268
        else:
249
269
            subtrees = 'no'
 
270
        if repo._format.supports_external_lookups:
 
271
            external = 'yes'
 
272
        else:
 
273
            external = 'no'
250
274
        if (smart.bzrdir.SmartServerRequestFindRepositoryV3 ==
251
275
            self._request_class):
252
276
            return SuccessfulSmartServerResponse(
253
 
                ('ok', '', rich_root, subtrees, 'no',
 
277
                ('ok', '', rich_root, subtrees, external,
254
278
                 repo._format.network_name()))
255
279
        elif (smart.bzrdir.SmartServerRequestFindRepositoryV2 ==
256
280
            self._request_class):
257
281
            # All tests so far are on formats, and for non-external
258
282
            # repositories.
259
283
            return SuccessfulSmartServerResponse(
260
 
                ('ok', '', rich_root, subtrees, 'no'))
 
284
                ('ok', '', rich_root, subtrees, external))
261
285
        else:
262
286
            return SuccessfulSmartServerResponse(('ok', '', rich_root, subtrees))
263
287
 
452
476
    def test_stacked_branch(self):
453
477
        """Opening a stacked branch does not open the stacked-on branch."""
454
478
        trunk = self.make_branch('trunk')
455
 
        feature = self.make_branch('feature', format='1.9')
 
479
        feature = self.make_branch('feature')
456
480
        feature.set_stacked_on_url(trunk.base)
457
481
        opened_branches = []
458
482
        Branch.hooks.install_named_hook('open', opened_branches.append, None)
1242
1266
            SmartServerResponse(('history-incomplete', 2, r2)),
1243
1267
            request.execute('stacked', 1, (3, r3)))
1244
1268
 
 
1269
 
1245
1270
class TestSmartServerRepositoryGetStream(tests.TestCaseWithMemoryTransport):
1246
1271
 
1247
1272
    def make_two_commit_repo(self):