Rev 3821: Fix the other k1_k22_k23 test in http://bzr.arbash-meinel.com/branches/bzr/brisbane/prefix

John Arbash Meinel john at arbash-meinel.com
Wed Jan 7 19:56:37 GMT 2009


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

------------------------------------------------------------
revno: 3821
revision-id: john at arbash-meinel.com-20090107195619-5vsl7mn6k2ssy8nd
parent: john at arbash-meinel.com-20090107195340-h5oy5268lgnay3qy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: prefix
timestamp: Wed 2009-01-07 13:56:19 -0600
message:
  Fix the other k1_k22_k23 test
-------------- next part --------------
=== modified file 'bzrlib/tests/test_chk_map.py'
--- a/bzrlib/tests/test_chk_map.py	2009-01-07 19:53:40 +0000
+++ b/bzrlib/tests/test_chk_map.py	2009-01-07 19:56:19 +0000
@@ -1269,9 +1269,11 @@
         self.assertEqualDiff("'' InternalNode\n"
                              "  'k1' LeafNode\n"
                              "      ('k1',) 'foo'\n"
-                             "  'k2' LeafNode\n"
+                             "  'k2' InternalNode\n"
+                             "    'k22' LeafNode\n"
                              "      ('k22',) 'bar'\n"
-                             "      ('k23',) 'bar'\n"
+                             "    'k23' LeafNode\n"
+                             "      ('k23',) 'quux'\n"
                              , chkmap._dump_tree())
         chkmap = CHKMap(chkmap._store, chkmap._root_node)
         chkmap._ensure_root()
@@ -1293,7 +1295,13 @@
         # serialising should only serialise the new data - the root node.
         keys = list(node.serialise(chkmap._store))
         self.assertEqual([keys[-1]], keys)
-        self.assertEqual(('sha1:d3f06fc03d8f50845894d8d04cc5a3f47e62948d',), keys[-1])
+        chkmap = CHKMap(chkmap._store, keys[-1])
+        self.assertEqualDiff("'' InternalNode\n"
+                             "  'k1' LeafNode\n"
+                             "      ('k1',) 'foo'\n"
+                             "  'k2' LeafNode\n"
+                             "      ('k22',) 'bar'\n"
+                             , chkmap._dump_tree())
 
     def test_unmap_k1_from_k1_k22_k23_gives_k22_k23_tree_new(self):
         chkmap = self._get_map(



More information about the bazaar-commits mailing list