Rev 3916: Make the text for key4 slightly longer, rather than include key3. in http://bzr.arbash-meinel.com/branches/bzr/brisbane/disk_format

[John Arbash Meinel]

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

------------------------------------------------------------
revno: 3916
revision-id: john at arbash-meinel.com-20090327161003-snhpx5qx7bcw7v1i
parent: john at arbash-meinel.com-20090327160744-anntc1oyh859s9rm
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: disk_format
timestamp: Fri 2009-03-27 11:10:03 -0500
message:
  Make the text for key4 slightly longer, rather than include key3.
  We were running into the 'rebuild because not enough bytes used' check,
  so we just needed a few more bytes on the wire to be used.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_groupcompress.py'
--- a/bzrlib/tests/test_groupcompress.py	2009-03-27 16:07:44 +0000
+++ b/bzrlib/tests/test_groupcompress.py	2009-03-27 16:10:03 +0000
@@ -595,7 +595,7 @@
         ('key3',): "yet another text which won't be extracted\n"
                    "with a reasonable amount of compressible bytes\n",
         ('key4',): "this will be extracted\n"
-                   "but references bytes from\n"
+                   "but references most of its bytes from\n"
                    "yet another text which won't be extracted\n"
                    "with a reasonable amount of compressible bytes\n",
     }
@@ -661,7 +661,6 @@
         entries, block = self.make_block(self._texts)
         manager = groupcompress._LazyGroupContentManager(block)
         self.add_key_to_manager(('key1',), entries, block, manager)
-        self.add_key_to_manager(('key3',), entries, block, manager)
         self.add_key_to_manager(('key4',), entries, block, manager)
         block_bytes = block.to_bytes()
         wire_bytes = manager._wire_bytes()
@@ -671,29 +670,23 @@
         header_len = int(header_len)
         block_len = int(block_len)
         self.assertEqual('groupcompress-block', storage_kind)
-        self.assertEqual(41, z_header_len)
-        self.assertEqual(39, header_len)
+        self.assertEqual(33, z_header_len)
+        self.assertEqual(25, header_len)
         self.assertEqual(len(block_bytes), block_len)
         z_header = rest[:z_header_len]
         header = zlib.decompress(z_header)
         self.assertEqual(header_len, len(header))
         entry1 = entries[('key1',)]
-        entry3 = entries[('key3',)]
         entry4 = entries[('key4',)]
         self.assertEqualDiff('key1\n'
                              '\n'  # no parents
                              '%d\n' # start offset
-                             '%d\n' # end byte
-                             'key3\n'
-                             '\n'
-                             '%d\n'
-                             '%d\n'
+                             '%d\n' # end offset
                              'key4\n'
                              '\n'
                              '%d\n'
                              '%d\n'
                              % (entry1.start, entry1.end,
-                                entry3.start, entry3.end,
                                 entry4.start, entry4.end),
                             header)
         z_block = rest[z_header_len:]
@@ -703,20 +696,19 @@
         entries, block = self.make_block(self._texts)
         manager = groupcompress._LazyGroupContentManager(block)
         self.add_key_to_manager(('key1',), entries, block, manager)
-        self.add_key_to_manager(('key3',), entries, block, manager)
         self.add_key_to_manager(('key4',), entries, block, manager)
         wire_bytes = manager._wire_bytes()
         self.assertStartsWith(wire_bytes, 'groupcompress-block\n')
         manager = groupcompress._LazyGroupContentManager.from_bytes(wire_bytes)
         self.assertIsInstance(manager, groupcompress._LazyGroupContentManager)
-        self.assertEqual(3, len(manager._factories))
+        self.assertEqual(2, len(manager._factories))
         self.assertEqual(block._z_content, manager._block._z_content)
         result_order = []
         for record in manager.get_record_stream():
             result_order.append(record.key)
             text = self._texts[record.key]
             self.assertEqual(text, record.get_bytes_as('fulltext'))
-        self.assertEqual([('key1',), ('key3',), ('key4',)], result_order)
+        self.assertEqual([('key1',), ('key4',)], result_order)
 
     def test__check_rebuild_no_changes(self):
         entries, block = self.make_block(self._texts)