Rev 4615: Update test_selftest for the 2a default format change. in http://bazaar.launchpad.net/~lifeless/bzr/bug-398668

[Robert Collins]

At http://bazaar.launchpad.net/~lifeless/bzr/bug-398668

------------------------------------------------------------
revno: 4615
revision-id: robertc at robertcollins.net-20090814032922-pjv5yy1hmwpd2wjd
parent: robertc at robertcollins.net-20090814031257-l62b9c8oqu2slvap
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bug-398668
timestamp: Fri 2009-08-14 13:29:22 +1000
message:
  Update test_selftest for the 2a default format change.
=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py	2009-08-04 02:09:19 +0000
+++ b/bzrlib/tests/test_selftest.py	2009-08-14 03:29:22 +0000
@@ -40,6 +40,7 @@
     workingtree,
     )
 from bzrlib.repofmt import (
+    groupcompress_repo,
     pack_repo,
     weaverepo,
     )
@@ -215,24 +216,24 @@
         from bzrlib.tests.per_repository import formats_to_scenarios
         formats = [("(c)", remote.RemoteRepositoryFormat()),
                    ("(d)", repository.format_registry.get(
-                        'Bazaar pack repository format 1 (needs bzr 0.92)\n'))]
+                    'Bazaar repository format 2a (needs bzr 1.16 or later)\n'))]
         no_vfs_scenarios = formats_to_scenarios(formats, "server", "readonly",
             None)
         vfs_scenarios = formats_to_scenarios(formats, "server", "readonly",
             vfs_transport_factory="vfs")
         # no_vfs generate scenarios without vfs_transport_factory
-        self.assertEqual([
+        expected = [
             ('RemoteRepositoryFormat(c)',
              {'bzrdir_format': remote.RemoteBzrDirFormat(),
               'repository_format': remote.RemoteRepositoryFormat(),
               'transport_readonly_server': 'readonly',
               'transport_server': 'server'}),
-            ('RepositoryFormatKnitPack1(d)',
+            ('RepositoryFormat2a(d)',
              {'bzrdir_format': bzrdir.BzrDirMetaFormat1(),
-              'repository_format': pack_repo.RepositoryFormatKnitPack1(),
+              'repository_format': groupcompress_repo.RepositoryFormat2a(),
               'transport_readonly_server': 'readonly',
-              'transport_server': 'server'})],
-            no_vfs_scenarios)
+              'transport_server': 'server'})]
+        self.assertEqual(expected, no_vfs_scenarios)
         self.assertEqual([
             ('RemoteRepositoryFormat(c)',
              {'bzrdir_format': remote.RemoteBzrDirFormat(),
@@ -240,9 +241,9 @@
               'transport_readonly_server': 'readonly',
               'transport_server': 'server',
               'vfs_transport_factory': 'vfs'}),
-            ('RepositoryFormatKnitPack1(d)',
+            ('RepositoryFormat2a(d)',
              {'bzrdir_format': bzrdir.BzrDirMetaFormat1(),
-              'repository_format': pack_repo.RepositoryFormatKnitPack1(),
+              'repository_format': groupcompress_repo.RepositoryFormat2a(),
               'transport_readonly_server': 'readonly',
               'transport_server': 'server',
               'vfs_transport_factory': 'vfs'})],