Rev 6026: Test multiple heads, and test when a head is inside the search of another head. in http://bazaar.launchpad.net/~jameinel/bzr/2.4-too-much-walking-388269

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.4-too-much-walking-388269

------------------------------------------------------------
revno: 6026
revision-id: john at arbash-meinel.com-20110811150126-enmjwt8zig66jau3
parent: john at arbash-meinel.com-20110811134907-6ii5l1skpu3deawm
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.4-too-much-walking-388269
timestamp: Thu 2011-08-11 17:01:26 +0200
message:
  Test multiple heads, and test when a head is inside the search of another head.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_graph.py'
--- a/bzrlib/tests/test_graph.py	2011-08-11 13:49:07 +0000
+++ b/bzrlib/tests/test_graph.py	2011-08-11 15:01:26 +0000
@@ -1802,5 +1802,13 @@
         self.assertSearchResult(['rev2a', 'rev2b'], ['rev1'], 2,
                                 ancestry_1, (), ['rev1'], 1)
 
-    # TODO: Test heads that go nowhere
-    # TODO: Test heads that converge
+
+    def test_multiple_heads(self):
+        self.assertSearchResult(['e', 'f'], ['a'], 5,
+                                extended_history_shortcut, (), ['a'], 10)
+        # Note that even though we only take 1 step back, we find 'f', which
+        # means the described search will still find d and c.
+        self.assertSearchResult(['b', 'f'], ['a'], 4,
+                                extended_history_shortcut, (), ['a'], 1)
+        self.assertSearchResult(['c', 'f'], ['a'], 4,
+                                extended_history_shortcut, (), ['a'], 2)