Rev 3800: Switch _dump_tree to returning trailing '\n' for nicer results in http://bzr.arbash-meinel.com/branches/bzr/brisbane/chk_map

[John Arbash Meinel]

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

------------------------------------------------------------
revno: 3800
revision-id: john at arbash-meinel.com-20081202205054-ajsix3e8w8jgnnod
parent: john at arbash-meinel.com-20081202204350-i7r9uithhqv1aieq
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: chk_map
timestamp: Tue 2008-12-02 14:50:54 -0600
message:
  Switch _dump_tree to returning trailing '\n' for nicer results
-------------- next part --------------
=== modified file 'bzrlib/chk_map.py'
--- a/bzrlib/chk_map.py	2008-12-02 20:43:50 +0000
+++ b/bzrlib/chk_map.py	2008-12-02 20:50:54 +0000
@@ -108,6 +108,7 @@
         """Return the tree in a string representation."""
         self._ensure_root()
         res = self._dump_tree_node(self._root_node, prefix='', indent='')
+        res.append('') # Give a trailing '\n'
         return '\n'.join(res)
 
     def _dump_tree_node(self, node, prefix, indent):

=== modified file 'bzrlib/tests/test_chk_map.py'
--- a/bzrlib/tests/test_chk_map.py	2008-12-02 19:00:56 +0000
+++ b/bzrlib/tests/test_chk_map.py	2008-12-02 20:50:54 +0000
@@ -206,12 +206,12 @@
         chkmap._root_node.set_maximum_size(30)
         chkmap.map(('aaa',), 'v')
         self.assertEqualDiff("'' LeafNode None\n"
-                             "      ('aaa',) 'v'",
+                             "      ('aaa',) 'v'\n",
                              chkmap._dump_tree())
         chkmap.map(('aab',), 'v')
         self.assertEqualDiff("'' LeafNode None\n"
                              "      ('aaa',) 'v'\n"
-                             "      ('aab',) 'v'",
+                             "      ('aab',) 'v'\n",
                              chkmap._dump_tree())
         self.assertCanonicalForm(chkmap)
 
@@ -223,7 +223,7 @@
                              "  'aab' LeafNode None\n"
                              "      ('aab',) 'v'\n"
                              "  'aac' LeafNode None\n"
-                             "      ('aac',) 'v'",
+                             "      ('aac',) 'v'\n",
                              chkmap._dump_tree())
         self.assertCanonicalForm(chkmap)
 
@@ -238,7 +238,7 @@
                              "    'aac' LeafNode None\n"
                              "      ('aac',) 'v'\n"
                              "  'b' LeafNode None\n"
-                             "      ('bbb',) 'v'",
+                             "      ('bbb',) 'v'\n",
                              chkmap._dump_tree())
         self.assertCanonicalForm(chkmap)
 
@@ -261,7 +261,7 @@
         chkmap.map(('aaaaabaa',), 'v')
         self.assertEqualDiff("'' LeafNode None\n"
                              "      ('aaaaaaaa',) 'v'\n"
-                             "      ('aaaaabaa',) 'v'",
+                             "      ('aaaaabaa',) 'v'\n",
                              chkmap._dump_tree())
         chkmap.map(('aaabaaaa',), 'v')
         chkmap.map(('aaababaa',), 'v')
@@ -271,7 +271,7 @@
                              "      ('aaaaabaa',) 'v'\n"
                              "  'aaab' LeafNode None\n"
                              "      ('aaabaaaa',) 'v'\n"
-                             "      ('aaababaa',) 'v'",
+                             "      ('aaababaa',) 'v'\n",
                              chkmap._dump_tree())
         chkmap.map(('aaabacaa',), 'v')
         chkmap.map(('aaabadaa',), 'v')
@@ -287,7 +287,7 @@
                              "    'aaabac' LeafNode None\n"
                              "      ('aaabacaa',) 'v'\n"
                              "    'aaabad' LeafNode None\n"
-                             "      ('aaabadaa',) 'v'",
+                             "      ('aaabadaa',) 'v'\n",
                              chkmap._dump_tree())
         chkmap.map(('aaababba',), 'v')
         chkmap.map(('aaababca',), 'v')
@@ -308,7 +308,7 @@
                              "    'aaabac' LeafNode None\n"
                              "      ('aaabacaa',) 'v'\n"
                              "    'aaabad' LeafNode None\n"
-                             "      ('aaabadaa',) 'v'",
+                             "      ('aaabadaa',) 'v'\n",
                              chkmap._dump_tree())
         # Now we add a node that should fit around an existing InternalNode,
         # but has a slightly different key prefix, which causes a new
@@ -334,7 +334,7 @@
                              "      'aaabac' LeafNode None\n"
                              "      ('aaabacaa',) 'v'\n"
                              "      'aaabad' LeafNode None\n"
-                             "      ('aaabadaa',) 'v'",
+                             "      ('aaabadaa',) 'v'\n",
                              chkmap._dump_tree())
 
     def test_stable_unmap(self):
@@ -346,7 +346,7 @@
         chkmap.map(('aab',), 'v')
         self.assertEqualDiff("'' LeafNode None\n"
                              "      ('aaa',) 'v'\n"
-                             "      ('aab',) 'v'",
+                             "      ('aab',) 'v'\n",
                              chkmap._dump_tree())
         # Creates a new internal node, and splits the others into leaves
         chkmap.map(('aac',), 'v')
@@ -356,7 +356,7 @@
                              "  'aab' LeafNode None\n"
                              "      ('aab',) 'v'\n"
                              "  'aac' LeafNode None\n"
-                             "      ('aac',) 'v'",
+                             "      ('aac',) 'v'\n",
                              chkmap._dump_tree())
         self.assertCanonicalForm(chkmap)
         # Now lets unmap one of the keys, and assert that we collapse the
@@ -364,7 +364,7 @@
         chkmap.unmap(('aac',))
         self.assertEqualDiff("'' LeafNode None\n"
                              "      ('aaa',) 'v'\n"
-                             "      ('aab',) 'v'",
+                             "      ('aab',) 'v'\n",
                              chkmap._dump_tree())
         self.assertCanonicalForm(chkmap)
 
@@ -385,7 +385,7 @@
                              "    'aab' LeafNode None\n"
                              "      ('aab',) 'very long value'\n"
                              "  'ab' LeafNode None\n"
-                             "      ('abc',) 'v'",
+                             "      ('abc',) 'v'\n",
                              chkmap._dump_tree())
         # Removing the 'aab' key should cause everything to collapse back to a
         # single node
@@ -393,7 +393,7 @@
         self.assertEqualDiff("'' LeafNode None\n"
                              "      ('aaa',) 'v'\n"
                              "      ('aaab',) 'v'\n"
-                             "      ('abc',) 'v'",
+                             "      ('abc',) 'v'\n",
                              chkmap._dump_tree())
 
     def test_unmap_double_deep_non_empty_leaf(self):
@@ -413,7 +413,7 @@
                              "      ('aab',) 'long value'\n"
                              "      ('aabb',) 'v'\n"
                              "  'ab' LeafNode None\n"
-                             "      ('abc',) 'v'",
+                             "      ('abc',) 'v'\n",
                              chkmap._dump_tree())
         # Removing the 'aab' key should cause everything to collapse back to a
         # single node
@@ -421,7 +421,7 @@
         self.assertEqualDiff("'' LeafNode None\n"
                              "      ('aaa',) 'v'\n"
                              "      ('aabb',) 'v'\n"
-                             "      ('abc',) 'v'",
+                             "      ('abc',) 'v'\n",
                              chkmap._dump_tree())
 
     def test_iter_changes_empty_ab(self):