Rev 3520: check when there are 3 other trees, rather than just 2 in http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/multi_walker

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/multi_walker

------------------------------------------------------------
revno: 3520
revision-id: john at arbash-meinel.com-20080630220745-59npdpq6s44ue8in
parent: john at arbash-meinel.com-20080630220425-vyug6b2sb2yqzz86
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: multi_walker
timestamp: Mon 2008-06-30 17:07:45 -0500
message:
  check when there are 3 other trees, rather than just 2
-------------- next part --------------
=== modified file 'bzrlib/tests/test_tree.py'
--- a/bzrlib/tests/test_tree.py	2008-06-30 22:04:25 +0000
+++ b/bzrlib/tests/test_tree.py	2008-06-30 22:07:45 +0000
@@ -335,20 +335,26 @@
 
     def test_others_extra_at_end(self):
         tree = self.make_branch_and_tree('tree')
-        self.build_tree(['tree/a', 'tree/b', 'tree/c', 'tree/d'])
-        tree.add(['a', 'b', 'c', 'd'], ['a-id', 'b-id', 'c-id', 'd-id'])
+        self.build_tree(['tree/a', 'tree/b', 'tree/c', 'tree/d', 'tree/e'])
+        tree.add(['a', 'b', 'c', 'd', 'e'],
+                 ['a-id', 'b-id', 'c-id', 'd-id', 'e-id'])
         tree.commit('first', rev_id='first-rev-id')
-        tree.remove(['d'])
+        tree.remove(['e'])
         tree.commit('second', rev_id='second-rev-id')
+        tree.remove(['d'])
+        tree.commit('third', rev_id='third-rev-id')
         tree.remove(['c'])
 
         basis_tree, root_id = self.lock_and_get_basis_and_root_id(tree)
         first_tree = tree.branch.repository.revision_tree('first-rev-id')
-        walker = _mod_tree.MultiWalker(tree, [basis_tree, first_tree])
+        second_tree = tree.branch.repository.revision_tree('second-rev-id')
+        walker = _mod_tree.MultiWalker(tree, [basis_tree, first_tree,
+                                              second_tree])
         iterator = walker.iter_all()
-        self.assertWalkerNext(u'', root_id, True, [u'', u''], iterator)
-        self.assertWalkerNext(u'a', 'a-id', True, [u'a', u'a'], iterator)
-        self.assertWalkerNext(u'b', 'b-id', True, [u'b', u'b'], iterator)
-        self.assertWalkerNext(u'c', 'c-id', False, [u'c', u'c'], iterator)
-        self.assertWalkerNext(u'd', 'd-id', False, [None, u'd'], iterator)
+        self.assertWalkerNext(u'', root_id, True, [u'', u'', u''], iterator)
+        self.assertWalkerNext(u'a', 'a-id', True, [u'a', u'a', u'a'], iterator)
+        self.assertWalkerNext(u'b', 'b-id', True, [u'b', u'b', u'b'], iterator)
+        self.assertWalkerNext(u'c', 'c-id', False, [u'c', u'c', u'c'], iterator)
+        self.assertWalkerNext(u'd', 'd-id', False, [None, u'd', u'd'], iterator)
+        self.assertWalkerNext(u'e', 'e-id', False, [None, u'e', None], iterator)
         self.assertRaises(StopIteration, iterator.next)