Rev 3685: Fixed as per jam's review. in lp:~vila/bzr/233817-missing

[Vincent Ladeuil]

At lp:~vila/bzr/233817-missing

------------------------------------------------------------
revno: 3685
revision-id: v.ladeuil+lp at free.fr-20080912084407-wepmepg1fvbpqzly
parent: v.ladeuil+lp at free.fr-20080911193904-7qb81wbo10l4nbfs
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 233817-missing
timestamp: Fri 2008-09-12 10:44:07 +0200
message:
  Fixed as per jam's review.
  
  * tests/test_missing.py:
  (TestMissing.assertUnmerged): Add the 'backward' parameter.
  (TestMissing.test_find_unmerged): Test 'backward' for mainline
  revisions.
  (TestFindUnmerged): Add the 'backward' parameter.
  (TestFindUnmerged.test_include_merges): Test 'backward' for merged
  revisions.
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-11 19:35:41 +0000
+++ b/bzrlib/tests/test_missing.py	2008-09-12 08:44:07 +0000
@@ -30,8 +30,10 @@
 
 class TestMissing(TestCaseWithTransport):
 
-    def assertUnmerged(self, expected, source, target, restrict='all'):
-        unmerged = missing.find_unmerged(source, target, restrict=restrict)
+    def assertUnmerged(self, expected, source, target, restrict='all',
+                       backward=False):
+        unmerged = missing.find_unmerged(source, target, restrict=restrict,
+                                         backward=backward)
         self.assertEqual(expected, unmerged)
 
     def test_find_unmerged(self):
@@ -51,6 +53,8 @@
         original_tree.commit('c', rev_id='c')
         self.assertUnmerged(([('2', 'b'), ('3', 'c')], []),
                             original, puller)
+        self.assertUnmerged(([('3', 'c'), ('2', 'b')], []),
+                            original, puller, backward=True)
 
         puller_tree.pull(original)
         self.assertUnmerged(([], []), original, puller)
@@ -134,11 +138,13 @@
 class TestFindUnmerged(tests.TestCaseWithTransport):
 
     def assertUnmerged(self, local, remote, local_branch, remote_branch,
-                       restrict, include_merges=False):
+                       restrict, include_merges=False,
+                       backward=False):
         """Check the output of find_unmerged_mainline_revisions"""
         local_extra, remote_extra = missing.find_unmerged(
                                         local_branch, remote_branch, restrict,
-                                        include_merges=include_merges)
+                                        include_merges=include_merges,
+                                        backward=backward)
         self.assertEqual(local, local_extra)
         self.assertEqual(remote, remote_extra)
 
@@ -200,4 +206,10 @@
                             tree.branch, tree2.branch, 'all',
                             include_merges=True)
 
-    # TODO: test_dont_include_already_merged_merges ?
+        self.assertUnmerged([], [('4', 'rev6', 0),
+                                 ('3.1.2', 'rev5', 1), ('3.1.1', 'rev4', 1),
+                                 ('3', 'rev3',0 ), ('2', 'rev2', 0),
+                                 ],
+                            tree.branch, tree2.branch, 'all',
+                            include_merges=True,
+                            backward=True)