Rev 3818: Properly fix up the dump_tree tests, we now suppress the keys by default. in http://bzr.arbash-meinel.com/branches/bzr/brisbane/prefix

[John Arbash Meinel]

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

------------------------------------------------------------
revno: 3818
revision-id: john at arbash-meinel.com-20090107194435-hq09wmppmkssxsok
parent: john at arbash-meinel.com-20090107193803-prc4a4jairkgjczp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: prefix
timestamp: Wed 2009-01-07 13:44:35 -0600
message:
  Properly fix up the dump_tree tests, we now suppress the keys by default.
-------------- next part --------------
=== modified file 'bzrlib/chk_map.py'
--- a/bzrlib/chk_map.py	2009-01-07 19:38:03 +0000
+++ b/bzrlib/chk_map.py	2009-01-07 19:44:35 +0000
@@ -113,7 +113,7 @@
         stream = self._store.get_record_stream([key], 'unordered', True)
         return stream.next().get_bytes_as('fulltext')
 
-    def _dump_tree(self, include_keys=True):
+    def _dump_tree(self, include_keys=False):
         """Return the tree in a string representation."""
         self._ensure_root()
         res = self._dump_tree_node(self._root_node, prefix='', indent='',

=== modified file 'bzrlib/tests/test_chk_map.py'
--- a/bzrlib/tests/test_chk_map.py	2009-01-07 19:38:03 +0000
+++ b/bzrlib/tests/test_chk_map.py	2009-01-07 19:44:35 +0000
@@ -830,33 +830,60 @@
         chkmap = self._get_map({("aaa",): "value1", ("aab",): "value2",
                                 ("bbb",): "value3",},
                                maximum_size=10)
-        self.assertEqualDiff('\n'.join([
-            "'' InternalNode sha1:cd9b68f18c9754a79065b06379fba543f9031742",
-            "  'a' InternalNode sha1:ed0ceb5aeb87c56df007a17997134328ff4d0b8d",
-            "    'aaa' LeafNode sha1:16fa5a38b80d29b529afc45f7a4f894650fc067f",
-            "      ('aaa',) 'value1'",
-            "    'aab' LeafNode sha1:8fca5400dc99ef1b464e60ca25da53b57406ed38",
-            "      ('aab',) 'value2'",
-            "  'b' LeafNode sha1:67f15d1dfa451d388ed08ff17b4f9578ba010d01",
-            "      ('bbb',) 'value3'",
-            ""]), chkmap._dump_tree())
+        self.assertEqualDiff("'' InternalNode\n"
+                             "  'a' InternalNode\n"
+                             "    'aaa' LeafNode\n"
+                             "      ('aaa',) 'value1'\n"
+                             "    'aab' LeafNode\n"
+                             "      ('aab',) 'value2'\n"
+                             "  'b' LeafNode\n"
+                             "      ('bbb',) 'value3'\n",
+                             chkmap._dump_tree(include_keys=False))
+        self.assertEqualDiff("'' InternalNode\n"
+                             "  'a' InternalNode\n"
+                             "    'aaa' LeafNode\n"
+                             "      ('aaa',) 'value1'\n"
+                             "    'aab' LeafNode\n"
+                             "      ('aab',) 'value2'\n"
+                             "  'b' LeafNode\n"
+                             "      ('bbb',) 'value3'\n",
+                             chkmap._dump_tree())
+        self.assertEqualDiff(
+            "'' InternalNode sha1:9c0e7f6cca48983d33e03897b847710c27fd78ad\n"
+            "  'a' InternalNode sha1:771cd596632557845720770a0e4829d8065d53da\n"
+            "    'aaa' LeafNode sha1:6cabbca9713908aff819d79b3688e181c6eab8b2\n"
+            "      ('aaa',) 'value1'\n"
+            "    'aab' LeafNode sha1:c11b2aa06649e62846acbdff810fca5718c23ba6\n"
+            "      ('aab',) 'value2'\n"
+            "  'b' LeafNode sha1:5036c643a1c6491ae76d6bb0fd927f3a40d63ee8\n"
+            "      ('bbb',) 'value3'\n",
+            chkmap._dump_tree(include_keys=True))
 
     def test__dump_tree_in_progress(self):
         chkmap = self._get_map({("aaa",): "value1", ("aab",): "value2"},
                                maximum_size=10)
         chkmap.map(('bbb',), 'value3')
-        # XXX: Note that this representation is different than the one for
-        #      test__dump_tree, even though they have the same values
-        self.assertEqualDiff('\n'.join([
-            "'' InternalNode None",
-            "  'a' InternalNode sha1:ed0ceb5aeb87c56df007a17997134328ff4d0b8d",
-            "    'aaa' LeafNode sha1:16fa5a38b80d29b529afc45f7a4f894650fc067f",
-            "      ('aaa',) 'value1'",
-            "    'aab' LeafNode sha1:8fca5400dc99ef1b464e60ca25da53b57406ed38",
-            "      ('aab',) 'value2'",
-            "  'b' LeafNode None",
-            "      ('bbb',) 'value3'",
-            ""]), chkmap._dump_tree())
+        self.assertEqualDiff("'' InternalNode\n"
+                             "  'a' InternalNode\n"
+                             "    'aaa' LeafNode\n"
+                             "      ('aaa',) 'value1'\n"
+                             "    'aab' LeafNode\n"
+                             "      ('aab',) 'value2'\n"
+                             "  'b' LeafNode\n"
+                             "      ('bbb',) 'value3'\n",
+                             chkmap._dump_tree())
+        # For things that are updated by adding 'bbb', we don't have a sha key
+        # for them yet, so they are listed as None
+        self.assertEqualDiff(
+            "'' InternalNode None\n"
+            "  'a' InternalNode sha1:771cd596632557845720770a0e4829d8065d53da\n"
+            "    'aaa' LeafNode sha1:6cabbca9713908aff819d79b3688e181c6eab8b2\n"
+            "      ('aaa',) 'value1'\n"
+            "    'aab' LeafNode sha1:c11b2aa06649e62846acbdff810fca5718c23ba6\n"
+            "      ('aab',) 'value2'\n"
+            "  'b' LeafNode None\n"
+            "      ('bbb',) 'value3'\n",
+            chkmap._dump_tree(include_keys=True))
 
 
 class TestLeafNode(TestCaseWithStore):