← 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: Canonical.com Patch Queue Manager
  • Date: 2009-08-17 18:18:18 UTC
  • mfrom: (4618.2.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090817181818-6ks7pxgiwpqvsd3l
(vila) Make selftest --parallel=fork work again

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_selftest.py
40
40
    workingtree,
41
41
    )
42
42
from bzrlib.repofmt import (
43
 
    groupcompress_repo,
44
43
    pack_repo,
45
44
    weaverepo,
46
45
    )
216
215
        from bzrlib.tests.per_repository import formats_to_scenarios
217
216
        formats = [("(c)", remote.RemoteRepositoryFormat()),
218
217
                   ("(d)", repository.format_registry.get(
219
 
                    'Bazaar repository format 2a (needs bzr 1.16 or later)\n'))]
 
218
                        'Bazaar pack repository format 1 (needs bzr 0.92)\n'))]
220
219
        no_vfs_scenarios = formats_to_scenarios(formats, "server", "readonly",
221
220
            None)
222
221
        vfs_scenarios = formats_to_scenarios(formats, "server", "readonly",
223
222
            vfs_transport_factory="vfs")
224
223
        # no_vfs generate scenarios without vfs_transport_factory
225
 
        expected = [
 
224
        self.assertEqual([
226
225
            ('RemoteRepositoryFormat(c)',
227
226
             {'bzrdir_format': remote.RemoteBzrDirFormat(),
228
227
              'repository_format': remote.RemoteRepositoryFormat(),
229
228
              'transport_readonly_server': 'readonly',
230
229
              'transport_server': 'server'}),
231
 
            ('RepositoryFormat2a(d)',
 
230
            ('RepositoryFormatKnitPack1(d)',
232
231
             {'bzrdir_format': bzrdir.BzrDirMetaFormat1(),
233
 
              'repository_format': groupcompress_repo.RepositoryFormat2a(),
 
232
              'repository_format': pack_repo.RepositoryFormatKnitPack1(),
234
233
              'transport_readonly_server': 'readonly',
235
 
              'transport_server': 'server'})]
236
 
        self.assertEqual(expected, no_vfs_scenarios)
 
234
              'transport_server': 'server'})],
 
235
            no_vfs_scenarios)
237
236
        self.assertEqual([
238
237
            ('RemoteRepositoryFormat(c)',
239
238
             {'bzrdir_format': remote.RemoteBzrDirFormat(),
241
240
              'transport_readonly_server': 'readonly',
242
241
              'transport_server': 'server',
243
242
              'vfs_transport_factory': 'vfs'}),
244
 
            ('RepositoryFormat2a(d)',
 
243
            ('RepositoryFormatKnitPack1(d)',
245
244
             {'bzrdir_format': bzrdir.BzrDirMetaFormat1(),
246
 
              'repository_format': groupcompress_repo.RepositoryFormat2a(),
 
245
              'repository_format': pack_repo.RepositoryFormatKnitPack1(),
247
246
              'transport_readonly_server': 'readonly',
248
247
              'transport_server': 'server',
249
248
              'vfs_transport_factory': 'vfs'})],