Rev 3822: Most direct tests are now passing. in http://bzr.arbash-meinel.com/branches/bzr/brisbane/inv_as_lines

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/brisbane/inv_as_lines

------------------------------------------------------------
revno: 3822
revision-id: john at arbash-meinel.com-20090213204041-nl3f1sjoy398kckl
parent: john at arbash-meinel.com-20090213202820-7qfe4d8kdu5thlq2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: inv_as_lines
timestamp: Fri 2009-02-13 14:40:41 -0600
message:
  Most direct tests are now passing.
  
  We have a problem with 'differing serializers' and another issue with PackRepository.autopack
  not getting called. I think those were problems before.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_inv.py'
--- a/bzrlib/tests/test_inv.py	2009-02-13 20:04:19 +0000
+++ b/bzrlib/tests/test_inv.py	2009-02-13 20:40:41 +0000
@@ -221,7 +221,7 @@
             'chkinventory:\n',
             'revision_id: foo\n',
             'root_id: TREE_ROOT\n',
-            'id_to_entry: sha1:c9d15ff2621b8774506f702ff4ffd5f4af885a51\n',
+            'id_to_entry: sha1:f9734d8d315fda54c056bbbc814c192a22719480\n',
             ], lines)
         chk_inv = CHKInventory.deserialise(chk_bytes, ''.join(lines), ('foo',))
         self.assertEqual('plain', chk_inv._search_key_name)
@@ -238,8 +238,8 @@
             'chkinventory:\n',
             'revision_id: foo\n',
             'root_id: TREE_ROOT\n',
-            'parent_id_basename_to_file_id: sha1:46f33678d1c8cfd9b6d00dc658b6c8a9ac7bb0f0\n',
-            'id_to_entry: sha1:c9d15ff2621b8774506f702ff4ffd5f4af885a51\n',
+            'parent_id_basename_to_file_id: sha1:eb23f0ad4b07f48e88c76d4c94292be57fb2785f\n',
+            'id_to_entry: sha1:f9734d8d315fda54c056bbbc814c192a22719480\n',
             ], lines)
         chk_inv = CHKInventory.deserialise(chk_bytes, ''.join(lines), ('foo',))
         self.assertEqual('plain', chk_inv._search_key_name)
@@ -258,8 +258,8 @@
             'revision_id: foo\n',
             'root_id: TREE_ROOT\n',
             'search_key_name: hash-16-way\n',
-            'parent_id_basename_to_file_id: sha1:46f33678d1c8cfd9b6d00dc658b6c8a9ac7bb0f0\n',
-            'id_to_entry: sha1:c9d15ff2621b8774506f702ff4ffd5f4af885a51\n',
+            'parent_id_basename_to_file_id: sha1:eb23f0ad4b07f48e88c76d4c94292be57fb2785f\n',
+            'id_to_entry: sha1:f9734d8d315fda54c056bbbc814c192a22719480\n',
             ], lines)
         chk_inv = CHKInventory.deserialise(chk_bytes, ''.join(lines), ('foo',))
         self.assertEqual('hash-16-way', chk_inv._search_key_name)

=== modified file 'bzrlib/tests/test_pack_repository.py'
--- a/bzrlib/tests/test_pack_repository.py	2009-02-13 20:04:19 +0000
+++ b/bzrlib/tests/test_pack_repository.py	2009-02-13 20:40:41 +0000
@@ -212,7 +212,7 @@
         obsolete_files = list(trans.list_dir('obsolete_packs'))
         self.assertFalse('foo' in obsolete_files)
         self.assertFalse('bar' in obsolete_files)
-        if tree.branch.repository.supports_chks:
+        if tree.branch.repository._format.supports_chks:
             self.assertEqual(60, len(obsolete_files))
         else:
             self.assertEqual(50, len(obsolete_files))
@@ -694,10 +694,14 @@
         check_result = tree.branch.repository.check(
             [tree.branch.last_revision()])
         # We should have 50 (10x5) files in the obsolete_packs directory.
+        # If supports_chks, then we have 60
         obsolete_files = list(trans.list_dir('obsolete_packs'))
         self.assertFalse('foo' in obsolete_files)
         self.assertFalse('bar' in obsolete_files)
-        self.assertEqual(50, len(obsolete_files))
+        if tree.branch.repository._format.supports_chks:
+            self.assertEqual(60, len(obsolete_files))
+        else:
+            self.assertEqual(50, len(obsolete_files))
         # XXX: Todo check packs obsoleted correctly - old packs and indices
         # in the obsolete_packs directory.
         large_pack_name = list(index.iter_all_entries())[0][1][0]