Rev 5969: (vila) Rewrite the eager in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5969 [merge]
revision-id: pqm at pqm.ubuntu.com-20110613171813-m9y5n1n7vph64fsh
parent: pqm at pqm.ubuntu.com-20110613162508-yyvo3qc06t9d2wwf
parent: v.ladeuil+lp at free.fr-20110613163211-bu4yyhqoim1l8nvy
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2011-06-13 17:18:13 +0000
message:
  (vila) Rewrite the eager
   bb.test_merge.TestMerge.test_merge_reversed_revision_range test (Vincent
   Ladeuil)
modified:
  bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
  doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
=== modified file 'bzrlib/tests/blackbox/test_merge.py'
--- a/bzrlib/tests/blackbox/test_merge.py	2011-06-09 18:56:55 +0000
+++ b/bzrlib/tests/blackbox/test_merge.py	2011-06-13 14:32:13 +0000
@@ -34,7 +34,13 @@
     urlutils,
     workingtree,
     )
-from bzrlib.tests import script
+from bzrlib.tests import (
+    scenarios,
+    script,
+    )
+
+
+load_tests = scenarios.load_tests_apply_scenarios
 
 
 class TestMerge(tests.TestCaseWithTransport):
@@ -662,19 +668,6 @@
         this.lock_write()
         this.unlock()
 
-    def test_merge_reversed_revision_range(self):
-        tree = self.make_branch_and_tree(".")
-        for f in ("a", "b"):
-            self.build_tree([f])
-            tree.add(f)
-            tree.commit("added "+f)
-        for context in (".", "", 'a'):
-            retcode = 1 if context == '.' or context == '' else 0
-            self.run_bzr("merge -r 1..0 " + context, retcode=retcode)
-            self.assertPathDoesNotExist("a")
-            tree.revert()
-            self.assertPathExists("a")
-
     def test_merge_fetches_tags(self):
         """Tags are updated by merge, and revisions named in those tags are
         fetched.
@@ -696,6 +689,27 @@
         self.assertEqual('rev-2a', target.tags.lookup_tag('tag-a'))
         target.repository.get_revision('rev-2a')
 
+
+class TestMergeRevisionRange(tests.TestCaseWithTransport):
+
+    scenarios = (('whole-tree', dict(context='.')),
+                 ('file-only', dict(context='a')))
+
+    def setUp(self):
+        super(TestMergeRevisionRange, self).setUp()
+        self.tree = self.make_branch_and_tree(".")
+        self.tree.commit('initial commit')
+        for f in ("a", "b"):
+            self.build_tree([f])
+            self.tree.add(f)
+            self.tree.commit("added " + f)
+
+    def test_merge_reversed_revision_range(self):
+        self.run_bzr("merge -r 2..1 " + self.context)
+        self.assertPathDoesNotExist("a")
+        self.assertPathExists("b")
+
+
 class TestMergeScript(script.TestCaseWithTransportAndScript):
     def test_merge_empty_branch(self):
         source = self.make_branch_and_tree('source')

=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2011-06-13 16:25:08 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2011-06-13 17:18:13 +0000
@@ -118,6 +118,10 @@
 * Fix spurious test failure on OSX for WorkingTreeFormat2.
   (Vincent Ladeuil, #787942)
 
+* Re-target ``bb.test_merge.TestMerge.test_merge_reversed_revision_range``
+  and rewrite it as a parameterized test to avoid unrelated failures.
+  (Vincent Ladeuil, #795456)
+
 * Show log file contents from subprocesses started by
   `start_bzr_subprocess` in test failure details.  This may help diagnose
   strange hangs and failures involving subprocesses.  (Andrew Bennetts)