Rev 4607: Fix some tests that were failing because we checked against RepositoryFormatCHK1 in http://bazaar.launchpad.net/~jameinel/bzr/1.19-bug-402778

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/1.19-bug-402778

------------------------------------------------------------
revno: 4607
revision-id: john at arbash-meinel.com-20090812210825-u7t6ofcd0x3erygm
parent: john at arbash-meinel.com-20090812190948-nc5igycxkfbpwogm
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.19-bug-402778
timestamp: Wed 2009-08-12 16:08:25 -0500
message:
  Fix some tests that were failing because we checked against RepositoryFormatCHK1
  rather than the new RepositoryFormat2a.
-------------- next part --------------
=== modified file 'bzrlib/tests/per_pack_repository.py'
--- a/bzrlib/tests/per_pack_repository.py	2009-08-12 18:49:22 +0000
+++ b/bzrlib/tests/per_pack_repository.py	2009-08-12 21:08:25 +0000
@@ -42,7 +42,7 @@
     pack_repo,
     groupcompress_repo,
     )
-from bzrlib.repofmt.groupcompress_repo import RepositoryFormatCHK1
+from bzrlib.repofmt.groupcompress_repo import RepositoryFormat2a
 from bzrlib.smart import (
     client,
     server,
@@ -84,7 +84,7 @@
         """Packs reuse deltas."""
         format = self.get_format()
         repo = self.make_repository('.', format=format)
-        if isinstance(format.repository_format, RepositoryFormatCHK1):
+        if isinstance(format.repository_format, RepositoryFormat2a):
             # TODO: This is currently a workaround. CHK format repositories
             #       ignore the 'deltas' flag, but during conversions, we can't
             #       do unordered delta fetches. Remove this clause once we
@@ -346,7 +346,7 @@
         # revision access tends to be tip->ancestor, so ordering that way on
         # disk is a good idea.
         for _1, key, val, refs in pack.revision_index.iter_all_entries():
-            if type(format.repository_format) is RepositoryFormatCHK1:
+            if type(format.repository_format) is RepositoryFormat2a:
                 # group_start, group_len, internal_start, internal_len
                 pos = map(int, val.split())
             else:
@@ -624,7 +624,7 @@
 
     def make_write_ready_repo(self):
         format = self.get_format()
-        if isinstance(format.repository_format, RepositoryFormatCHK1):
+        if isinstance(format.repository_format, RepositoryFormat2a):
             raise TestNotApplicable("No missing compression parents")
         repo = self.make_repository('.', format=format)
         repo.lock_write()