svn commit: r1128055 - /subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py

[cm...@apache.org]

Author: cmpilato
Date: Thu May 26 19:33:13 2011
New Revision: 1128055

URL: http://svn.apache.org/viewvc?rev=1128055&view=rev
Log:
More work on issue #3890 ("'svnrdump load' does not map revisions like
'svnadmin load' does").

Unlike svnadmin_tests.reflect_dropped_renumbered_revs() -- the test on
which it is modeled -- svnrdump_tests.reflect_dropped_renumbered_revs() 
creates its "toplevel" subdirectory *after* the initial load, not
before.  As such, the expected mergeinfo is a bit different in this
case (off by a single revision).

* subversion/tests/cmdline/svnrdump_tests.py
  (reflect_dropped_renumbered_revs): Correct expected output, and
    remove @XFail() decorator.

Modified:
    subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py?rev=1128055&r1=1128054&r2=1128055&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py Thu May 26 19:33:13 2011
@@ -359,7 +359,6 @@ def multi_prop_edit_load(sbox):
 # This test replicates svnadmin_tests.py 16 'reflect dropped renumbered
 # revs in svn:mergeinfo' but uses 'svnrdump load' in place of
 # 'svnadmin load'.
-@XFail()
 @Issue(3890)
 def reflect_dropped_renumbered_revs(sbox):
   "svnrdump renumbers dropped revs in mergeinfo"
@@ -397,7 +396,7 @@ def reflect_dropped_renumbered_revs(sbox
   # Verify the svn:mergeinfo properties
   url = sbox.repo_url
   expected_output = svntest.verify.UnorderedOutput([
-    url + "/trunk - /branch1:5-9\n",
+    url + "/trunk - /branch1:4-8\n",
     url + "/toplevel/trunk - /toplevel/branch1:14-18\n",
     ])
   svntest.actions.run_and_verify_svn(None, expected_output, [],