Rev 3679: Fix tests broken by previous commit. in lp:~vila/bzr/233817-missing

[Vincent Ladeuil]

At lp:~vila/bzr/233817-missing

------------------------------------------------------------
revno: 3679
revision-id: v.ladeuil+lp at free.fr-20080909160741-h6i2u5l3ntfq2ntr
parent: v.ladeuil+lp at free.fr-20080903163327-hpgcpvx2ziit96og
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 233817-missing
timestamp: Tue 2008-09-09 18:07:41 +0200
message:
  Fix tests broken by previous commit.
  
  * tests/test_missing.py:
  (TestMissing.test_iter_log_revisions, TestMissing.assertUnmerged):
  Oops, we need 'reverse=True' when calling missing.find_unmerged
  since the previous commit made it False by default.
modified:
  bzrlib/tests/test_missing.py   test_missing.py-20051212000028-694fa4f658a81f48
-------------- next part --------------
=== modified file 'bzrlib/tests/test_missing.py'
--- a/bzrlib/tests/test_missing.py	2008-09-03 16:33:27 +0000
+++ b/bzrlib/tests/test_missing.py	2008-09-09 16:07:41 +0000
@@ -31,7 +31,8 @@
 class TestMissing(TestCaseWithTransport):
 
     def assertUnmerged(self, expected, source, target, restrict='all'):
-        unmerged = missing.find_unmerged(source, target, restrict=restrict)
+        unmerged = missing.find_unmerged(source, target, restrict=restrict,
+                                         reverse=True)
         self.assertEqual(expected, unmerged)
 
     def test_find_unmerged(self):
@@ -84,7 +85,8 @@
         child_tree.commit('rename b=>c', rev_id='c-5')
 
         base_extra, child_extra = missing.find_unmerged(base_tree.branch,
-                                                        child_tree.branch)
+                                                        child_tree.branch,
+                                                        reverse=True)
         results = list(iter_log_revisions(base_extra,
                             base_tree.branch.repository,
                             verbose=True))
@@ -97,10 +99,9 @@
 
         r0,r1,r2,r3 = results
 
-        self.assertEqual(('2', 'c-2'), (r0.revno, r0.rev.revision_id))
-        self.assertEqual(('3', 'c-3'), (r1.revno, r1.rev.revision_id))
-        self.assertEqual(('4', 'c-4'), (r2.revno, r2.rev.revision_id))
-        self.assertEqual(('5', 'c-5'), (r3.revno, r3.rev.revision_id))
+        self.assertEqual([('2', 'c-2'), ('3', 'c-3'),
+                          ('4', 'c-4'), ('5', 'c-5'),],
+                         [(r.revno, r.rev.revision_id) for r in results])
 
         delta0 = r0.delta
         self.assertNotEqual(None, delta0)
@@ -194,7 +195,6 @@
         tree2.merge_from_branch(tree3.branch)
         rev6 = tree2.commit('six', rev_id='rev6')
 
-        import pdb; pdb.set_trace()
         self.assertUnmerged([], [('4', 'rev6'),
                                  ('3.1.2', 'rev5'), ('3.1.1', 'rev4'),
                                  ('3', 'rev3'), ('2', 'rev2'),