← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_selftest.py

  • Committer: Martin Pool
  • Date: 2008-06-25 10:06:48 UTC
  • mfrom: (3509 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3510.
  • Revision ID: mbp@sourcefrog.net-20080625100648-ac20jxcm3ojucuby
merge trunk; remove RemoteToOtherFetcher

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_selftest.py
241
241
        """The vfs_transport_factory can be set optionally."""
242
242
        from bzrlib.tests.repository_implementations import formats_to_scenarios
243
243
        scenarios = formats_to_scenarios(
244
 
            [("a", "b"), ("c", "d")],
 
244
            [("(one)", "a", "b"), ("(two)", "c", "d")],
245
245
            None,
246
246
            None,
247
247
            vfs_transport_factory="vfs")
248
248
        self.assertEqual([
249
 
            ('str',
 
249
            ('str(one)',
250
250
             {'bzrdir_format': 'b',
251
251
              'repository_format': 'a',
252
252
              'transport_readonly_server': None,
253
253
              'transport_server': None,
254
254
              'vfs_transport_factory': 'vfs'}),
255
 
            ('str',
 
255
            ('str(two)',
256
256
             {'bzrdir_format': 'd',
257
257
              'repository_format': 'c',
258
258
              'transport_readonly_server': None,
263
263
    def test_formats_to_scenarios(self):
264
264
        """The adapter can generate all the scenarios needed."""
265
265
        from bzrlib.tests.repository_implementations import formats_to_scenarios
266
 
        formats = [("c", "C"), (1, "D")]
 
266
        formats = [("(c)", "c", "C"), ("(d)", 1, "D")]
267
267
        no_vfs_scenarios = formats_to_scenarios(formats, "server", "readonly",
268
268
            None)
269
269
        vfs_scenarios = formats_to_scenarios(formats, "server", "readonly",
270
270
            vfs_transport_factory="vfs")
271
271
        # no_vfs generate scenarios without vfs_transport_factor
272
272
        self.assertEqual([
273
 
            ('str',
 
273
            ('str(c)',
274
274
             {'bzrdir_format': 'C',
275
275
              'repository_format': 'c',
276
276
              'transport_readonly_server': 'readonly',
277
277
              'transport_server': 'server'}),
278
 
            ('int',
 
278
            ('int(d)',
279
279
             {'bzrdir_format': 'D',
280
280
              'repository_format': 1,
281
281
              'transport_readonly_server': 'readonly',
282
282
              'transport_server': 'server'})],
283
283
            no_vfs_scenarios)
284
284
        self.assertEqual([
285
 
            ('str',
 
285
            ('str(c)',
286
286
             {'bzrdir_format': 'C',
287
287
              'repository_format': 'c',
288
288
              'transport_readonly_server': 'readonly',
289
289
              'transport_server': 'server',
290
290
              'vfs_transport_factory': 'vfs'}),
291
 
            ('int',
 
291
            ('int(d)',
292
292
             {'bzrdir_format': 'D',
293
293
              'repository_format': 1,
294
294
              'transport_readonly_server': 'readonly',