← 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-18 23:27:40 UTC
  • mfrom: (4599.4.45 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090818232740-8q7ms2nntw9ckyvq
(robertc) Change the default format to 2a. (Robert Collins)

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