subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pbu...@apache.org
Subject svn commit: r1066859 - /subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py
Date Thu, 03 Feb 2011 16:40:07 GMT
Author: pburba
Date: Thu Feb  3 16:40:06 2011
New Revision: 1066859

URL: http://svn.apache.org/viewvc?rev=1066859&view=rev
Log:
Fix an incorrect mergeinfo test expectation and remove an XFail.

* subversion/tests/cmdline/mergeinfo_tests.py\

  (mergeinfo_non_source): The 'svn mergeinfo' subcommand defaults to showing
   the revisions merged from SOURCE to TARGET if the --show-revs option is
   not used.  In this test we don't use it and ask if anything has been
   merged from a branch back to its parent.  Nothing has been merged back
   and that is the answer we get, but for some reason this test was
   expecting 'r2'.  Not anymore.

  (test_list): Remove XFail from mergeinfo_non_source.  Add SkipUnless,
   which went missing in r871947.

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

Modified: subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py?rev=1066859&r1=1066858&r2=1066859&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py Thu Feb  3 16:40:06 2011
@@ -130,7 +130,7 @@ def mergeinfo_non_source(sbox):
 
   # Check on a source we haven't "merged" from.
   svntest.actions.run_and_verify_mergeinfo(adjust_error_for_server_version(""),
-                                           ['2'], H2_url, H_path)
+                                           [], H2_url, H_path)
 
 #----------------------------------------------------------------------
 # Issue #3138
@@ -488,7 +488,7 @@ test_list = [ None,
               no_mergeinfo,
               mergeinfo,
               SkipUnless(explicit_mergeinfo_source, server_has_mergeinfo),
-              XFail(mergeinfo_non_source, server_has_mergeinfo),
+              SkipUnless(mergeinfo_non_source, server_has_mergeinfo),
               mergeinfo_on_unknown_url,
               non_inheritable_mergeinfo,
               SkipUnless(recursive_mergeinfo, server_has_mergeinfo),



Mime
View raw message