svn commit: r1302591 - /subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py

[da...@apache.org]

Author: danielsh
Date: Mon Mar 19 18:40:19 2012
New Revision: 1302591

URL: http://svn.apache.org/viewvc?rev=1302591&view=rev
Log:
* subversion/tests/cmdline/svnadmin_tests.py
  (mergeinfo_race): Fix parsing bug, and eexpect it to pass over BDB.

Found by: philip

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

Modified: subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py?rev=1302591&r1=1302590&r2=1302591&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Mon Mar 19 18:40:19 2012
@@ -1783,7 +1783,7 @@ def locking(sbox):
 
 @SkipUnless(svntest.main.is_threaded_python)
 @Issue(4129)
-@XFail()
+@XFail(svntest.main.is_fs_type_fsfs)
 def mergeinfo_race(sbox):
   "concurrent mergeinfo commits invalidate pred-count"
   sbox.build()
@@ -1817,7 +1817,7 @@ def mergeinfo_race(sbox):
 
   # Crude attempt to make sure everything worked.
   # TODO: better way to catch exceptions in the thread
-  if svntest.actions.run_and_parse_info(sbox.repo_url)[0]['Revision'] != 3:
+  if svntest.actions.run_and_parse_info(sbox.repo_url)[0]['Revision'] != '3':
     raise svntest.Failure("one or both commits failed")