svn commit: r1068068 - /subversion/branches/ignore-mergeinfo-log/subversion/tests/cmdline/log_tests.py

[hw...@apache.org]

Author: hwright
Date: Mon Feb  7 19:26:59 2011
New Revision: 1068068

URL: http://svn.apache.org/viewvc?rev=1068068&view=rev
Log:
On the ignore-mergeinfo-log branch:
Followup to r1068059 by using the python decorators on newly introduced tests.

* subversion/tests/cmdline/log_tests.py
  (ignore_mergeinfo): Use new XFail and Skip syntax.

Modified:
    subversion/branches/ignore-mergeinfo-log/subversion/tests/cmdline/log_tests.py

Modified: subversion/branches/ignore-mergeinfo-log/subversion/tests/cmdline/log_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo-log/subversion/tests/cmdline/log_tests.py?rev=1068068&r1=1068067&r2=1068068&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/subversion/tests/cmdline/log_tests.py (original)
+++ subversion/branches/ignore-mergeinfo-log/subversion/tests/cmdline/log_tests.py Mon Feb  7 19:26:59 2011
@@ -1764,6 +1764,8 @@ def log_of_local_copy(sbox):
                           % (psi_moved_path, psi_path))
 
 
+@XFail()
+@SkipUnless(server_has_mergeinfo)
 def ignore_mergeinfo_log(sbox):
   "'svn log --ignore-mergeinfo' scenarios"
 
@@ -1844,7 +1846,7 @@ test_list = [ None,
               merge_sensitive_log_added_mergeinfo_replaces_inherited,
               merge_sensitive_log_propmod_merge_inheriting_path,
               log_of_local_copy,
-              SkipUnless(XFail(ignore_mergeinfo_log), server_has_mergeinfo),
+              ignore_mergeinfo_log,
              ]
 
 if __name__ == '__main__':