[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r939302 - /subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py

From: Neels J Hofmeyr <neels_at_elego.de>
Date: Thu, 29 Apr 2010 23:44:41 +0200

Hyrum K. Wright wrote:
> Would this be better served as a WIMP'd test?

It's back to normal :)
~Neels

>
> -Hyrum
>
> On Thu, Apr 29, 2010 at 8:33 AM, <neels_at_apache.org> wrote:
>
>> Author: neels
>> Date: Thu Apr 29 13:33:49 2010
>> New Revision: 939302
>>
>> URL: http://svn.apache.org/viewvc?rev=939302&view=rev
>> Log:
>> * subversion/tests/cmdline/merge_authz_tests.py
>> (mergeinfo_and_skipped_paths):
>> Mark this test XFAIL. Will hopefully fix this tonight / this week.
>> This is related to r939150.
>>
>> Modified:
>> subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py
>>
>> Modified: subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py
>> URL:
>> http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py?rev=939302&r1=939301&r2=939302&view=diff
>>
>> ==============================================================================
>> --- subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py
>> (original)
>> +++ subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py Thu Apr
>> 29 13:33:49 2010
>> @@ -583,7 +583,9 @@ def merge_fails_if_subtree_is_deleted_on
>>
>> # list all tests here, starting with None:
>> test_list = [ None,
>> - SkipUnless(Skip(mergeinfo_and_skipped_paths,
>> + # Marked XFAIL because svn fails to emit a 'skipped' notice
>> + # on the file 'psi'.
>> + SkipUnless(Skip(XFail(mergeinfo_and_skipped_paths),
>> svntest.main.is_ra_type_file),
>> svntest.main.server_has_mergeinfo),
>> SkipUnless(merge_fails_if_subtree_is_deleted_on_src,
>>
>>
>>
>

Received on 2010-04-29 23:45:17 CEST

This is an archived mail posted to the Subversion Dev mailing list.