← 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: John Arbash Meinel
  • Date: 2009-08-18 14:49:52 UTC
  • mfrom: (4624 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4629.
  • Revision ID: john@arbash-meinel.com-20090818144952-mk2cy45ax9twl3lm
Merge bzr.dev 4624 in preparation for NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_smart.py
202
202
        self.make_bzrdir('.')
203
203
        request_class = bzrlib.smart.bzrdir.SmartServerRequestCreateRepository
204
204
        request = request_class(backing)
205
 
        reference_bzrdir_format = bzrdir.format_registry.get('default')()
 
205
        reference_bzrdir_format = bzrdir.format_registry.get('pack-0.92')()
206
206
        reference_format = reference_bzrdir_format.repository_format
207
207
        network_name = reference_format.network_name()
208
208
        expected = SuccessfulSmartServerResponse(
247
247
            subtrees = 'yes'
248
248
        else:
249
249
            subtrees = 'no'
 
250
        if repo._format.supports_external_lookups:
 
251
            external = 'yes'
 
252
        else:
 
253
            external = 'no'
250
254
        if (smart.bzrdir.SmartServerRequestFindRepositoryV3 ==
251
255
            self._request_class):
252
256
            return SuccessfulSmartServerResponse(
253
 
                ('ok', '', rich_root, subtrees, 'no',
 
257
                ('ok', '', rich_root, subtrees, external,
254
258
                 repo._format.network_name()))
255
259
        elif (smart.bzrdir.SmartServerRequestFindRepositoryV2 ==
256
260
            self._request_class):
257
261
            # All tests so far are on formats, and for non-external
258
262
            # repositories.
259
263
            return SuccessfulSmartServerResponse(
260
 
                ('ok', '', rich_root, subtrees, 'no'))
 
264
                ('ok', '', rich_root, subtrees, external))
261
265
        else:
262
266
            return SuccessfulSmartServerResponse(('ok', '', rich_root, subtrees))
263
267