Rev 4542: Fix 3 tests that assumed it would use 'unordered' in the fallback, in http://bzr.arbash-meinel.com/branches/bzr/lp/1.18-stack-and-annotate-393366

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/lp/1.18-stack-and-annotate-393366

------------------------------------------------------------
revno: 4542
revision-id: john at arbash-meinel.com-20090724192225-uk2jubcygmtgq05e
parent: john at arbash-meinel.com-20090724182621-68s2jhoqf3pn72n7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.18-stack-and-annotate-393366
timestamp: Fri 2009-07-24 14:22:25 -0500
message:
  Fix 3 tests that assumed it would use 'unordered' in the fallback,
  when the original request was for topological.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_knit.py'
--- a/bzrlib/tests/test_knit.py	2009-07-06 19:37:07 +0000
+++ b/bzrlib/tests/test_knit.py	2009-07-24 19:22:25 +0000
@@ -2230,7 +2230,7 @@
         # self.assertEqual([("annotate", key_basis)], basis.calls)
         self.assertEqual([('get_parent_map', set([key_basis])),
             ('get_parent_map', set([key_basis])),
-            ('get_record_stream', [key_basis], 'unordered', True)],
+            ('get_record_stream', [key_basis], 'topological', True)],
             basis.calls)
 
     def test_check(self):
@@ -2342,9 +2342,9 @@
         # ask which fallbacks have which parents.
         self.assertEqual([
             ("get_parent_map", set([key_basis, key_basis_2, key_missing])),
-            # unordered is asked for by the underlying worker as it still
-            # buffers everything while answering - which is a problem!
-            ("get_record_stream", [key_basis_2, key_basis], 'unordered', True)],
+            # topological is requested from the fallback, because that is what
+            # was requested at the top level.
+            ("get_record_stream", [key_basis_2, key_basis], 'topological', True)],
             calls)
 
     def test_get_record_stream_unordered_deltas(self):
@@ -2571,7 +2571,7 @@
         last_call = basis.calls[-1]
         self.assertEqual('get_record_stream', last_call[0])
         self.assertEqual(set([key_left, key_right]), set(last_call[1]))
-        self.assertEqual('unordered', last_call[2])
+        self.assertEqual('topological', last_call[2])
         self.assertEqual(True, last_call[3])